diff --git a/lerna.json b/lerna.json
index 4f3b50a665..dafd4e43cf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -6,7 +6,7 @@
     "plugins/*"
   ],
   "useWorkspaces": true,
-  "version": "0.17.52",
+  "version": "0.17.58",
   "ignoreChanges": [
     "**/*.md",
     "**/*.spec.tsx?",
diff --git a/packages/superset-ui-chart-controls/package.json b/packages/superset-ui-chart-controls/package.json
index b2e03ac676..e67b693b1f 100644
--- a/packages/superset-ui-chart-controls/package.json
+++ b/packages/superset-ui-chart-controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/chart-controls",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset UI control-utils",
   "sideEffects": false,
   "main": "lib/index.js",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/core": "0.17.58",
     "lodash": "^4.17.15",
     "prop-types": "^15.7.2"
   },
diff --git a/packages/superset-ui-chart-controls/src/shared-controls/index.tsx b/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
index c301600c55..3afc660283 100644
--- a/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
+++ b/packages/superset-ui-chart-controls/src/shared-controls/index.tsx
@@ -149,8 +149,9 @@ const datasourceControl: SharedControlConfig<'DatasourceControl'> = {
   label: t('Datasource'),
   default: null,
   description: null,
-  mapStateToProps: ({ datasource }) => ({
+  mapStateToProps: ({ datasource, form_data }) => ({
     datasource,
+    form_data,
   }),
 };
 
diff --git a/packages/superset-ui-core/package.json b/packages/superset-ui-core/package.json
index fb85fcec39..10ee52c6d8 100644
--- a/packages/superset-ui-core/package.json
+++ b/packages/superset-ui-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/core",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset UI core",
   "sideEffects": false,
   "main": "lib/index.js",
diff --git a/packages/superset-ui-core/src/chart/components/SuperChart.tsx b/packages/superset-ui-core/src/chart/components/SuperChart.tsx
index 4cccc5ec58..acad386202 100644
--- a/packages/superset-ui-core/src/chart/components/SuperChart.tsx
+++ b/packages/superset-ui-core/src/chart/components/SuperChart.tsx
@@ -185,8 +185,6 @@ export default class SuperChart extends React.PureComponent<Props, {}> {
         <BoundingBox>
           <ParentSize debounceTime={debounceTime}>
             {({ width, height }) =>
-              width > 0 &&
-              height > 0 &&
               this.renderChart(
                 widthInfo.isDynamic ? Math.floor(width) : widthInfo.value,
                 heightInfo.isDynamic ? Math.floor(height) : heightInfo.value,
diff --git a/packages/superset-ui-core/src/chart/models/ChartMetadata.ts b/packages/superset-ui-core/src/chart/models/ChartMetadata.ts
index 736139850c..1aab8863ab 100644
--- a/packages/superset-ui-core/src/chart/models/ChartMetadata.ts
+++ b/packages/superset-ui-core/src/chart/models/ChartMetadata.ts
@@ -4,6 +4,11 @@ interface LookupTable {
   [key: string]: boolean;
 }
 
+export interface ExampleImage {
+  url: string;
+  caption?: string;
+}
+
 export interface ChartMetadataConfig {
   name: string;
   canBeAnnotationTypes?: string[];
@@ -16,6 +21,10 @@ export interface ChartMetadataConfig {
   thumbnail: string;
   useLegacyApi?: boolean;
   behaviors?: Behavior[];
+  deprecated?: boolean;
+  exampleGallery?: ExampleImage[];
+  tags?: string[];
+  category?: string | null;
 }
 
 export default class ChartMetadata {
@@ -43,6 +52,14 @@ export default class ChartMetadata {
 
   enableNoResults: boolean;
 
+  deprecated: boolean;
+
+  exampleGallery: ExampleImage[];
+
+  tags: string[];
+
+  category: string | null;
+
   constructor(config: ChartMetadataConfig) {
     const {
       name,
@@ -56,6 +73,10 @@ export default class ChartMetadata {
       behaviors = [],
       datasourceCount = 1,
       enableNoResults = true,
+      deprecated = false,
+      exampleGallery = [],
+      tags = [],
+      category = null,
     } = config;
 
     this.name = name;
@@ -78,6 +99,10 @@ export default class ChartMetadata {
     this.behaviors = behaviors;
     this.datasourceCount = datasourceCount;
     this.enableNoResults = enableNoResults;
+    this.deprecated = deprecated;
+    this.exampleGallery = exampleGallery;
+    this.tags = tags;
+    this.category = category;
   }
 
   canBeAnnotationType(type: string): boolean {
@@ -85,18 +110,6 @@ export default class ChartMetadata {
   }
 
   clone() {
-    return new ChartMetadata({
-      canBeAnnotationTypes: this.canBeAnnotationTypes,
-      credits: this.credits,
-      description: this.description,
-      name: this.name,
-      show: this.show,
-      supportedAnnotationTypes: this.supportedAnnotationTypes,
-      thumbnail: this.thumbnail,
-      useLegacyApi: this.useLegacyApi,
-      behaviors: this.behaviors,
-      datasourceCount: this.datasourceCount,
-      enableNoResults: this.enableNoResults,
-    });
+    return new ChartMetadata(this);
   }
 }
diff --git a/packages/superset-ui-core/src/utils/featureFlags.ts b/packages/superset-ui-core/src/utils/featureFlags.ts
index 44de88107a..ef9d03ce35 100644
--- a/packages/superset-ui-core/src/utils/featureFlags.ts
+++ b/packages/superset-ui-core/src/utils/featureFlags.ts
@@ -42,12 +42,12 @@ export enum FeatureFlag {
   GLOBAL_ASYNC_QUERIES = 'GLOBAL_ASYNC_QUERIES',
   ENABLE_TEMPLATE_PROCESSING = 'ENABLE_TEMPLATE_PROCESSING',
   ENABLE_EXPLORE_DRAG_AND_DROP = 'ENABLE_EXPLORE_DRAG_AND_DROP',
-  // FORCE_DATABASE_CONNECTIONS_SSL is a depreciated flag
   FORCE_DATABASE_CONNECTIONS_SSL = 'FORCE_DATABASE_CONNECTIONS_SSL',
   ENFORCE_DB_ENCRYPTION_UI = 'ENFORCE_DB_ENCRYPTION_UI',
   ENABLE_TEMPLATE_REMOVE_FILTERS = 'ENABLE_TEMPLATE_REMOVE_FILTERS',
   DASHBOARD_RBAC = 'DASHBOARD_RBAC',
   ALERTS_ATTACH_REPORTS = 'ALERTS_ATTACH_REPORTS',
+  ALLOW_FULL_CSV_EXPORT = 'ALLOW_FULL_CSV_EXPORT',
 }
 export type ScheduleQueriesProps = {
   JSONSCHEMA: {
diff --git a/packages/superset-ui-demo/package.json b/packages/superset-ui-demo/package.json
index 27ed60f718..8cab959ddb 100644
--- a/packages/superset-ui-demo/package.json
+++ b/packages/superset-ui-demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/demo",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Storybook for Superset UI ✨",
   "private": true,
   "main": "index.js",
@@ -39,31 +39,31 @@
     "@storybook/preset-typescript": "^3.0.0",
     "@storybook/react": "^5.3.18",
     "@superset-ui/core": "file:../superset-ui-core/src",
-    "@superset-ui/legacy-plugin-chart-calendar": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-chord": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-country-map": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-event-flow": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-force-directed": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-heatmap": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-histogram": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-horizon": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-map-box": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-partition": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-rose": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-sankey": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-sunburst": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-time-table": "0.17.52",
-    "@superset-ui/legacy-plugin-chart-treemap": "0.17.52",
+    "@superset-ui/legacy-plugin-chart-calendar": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-chord": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-country-map": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-event-flow": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-force-directed": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-heatmap": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-histogram": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-horizon": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-map-box": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-partition": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-rose": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-sankey": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-sunburst": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-time-table": "0.17.58",
+    "@superset-ui/legacy-plugin-chart-treemap": "0.17.58",
     "@superset-ui/legacy-plugin-chart-word-cloud": "^0.11.15",
-    "@superset-ui/legacy-plugin-chart-world-map": "0.17.52",
-    "@superset-ui/legacy-preset-chart-big-number": "0.17.52",
-    "@superset-ui/plugin-chart-echarts": "0.17.52",
-    "@superset-ui/plugin-chart-table": "0.17.52",
-    "@superset-ui/plugin-chart-word-cloud": "0.17.52",
+    "@superset-ui/legacy-plugin-chart-world-map": "0.17.58",
+    "@superset-ui/legacy-preset-chart-big-number": "0.17.58",
+    "@superset-ui/plugin-chart-echarts": "0.17.58",
+    "@superset-ui/plugin-chart-table": "0.17.58",
+    "@superset-ui/plugin-chart-word-cloud": "0.17.58",
     "@types/react-loadable": "^5.5.3",
     "@types/react-resizable": "^1.7.2",
     "@types/storybook__react": "5.2.1",
diff --git a/plugins/legacy-plugin-chart-calendar/package.json b/plugins/legacy-plugin-chart-calendar/package.json
index c54c693403..a9003dfaf5 100644
--- a/plugins/legacy-plugin-chart-calendar/package.json
+++ b/plugins/legacy-plugin-chart-calendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-calendar",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Calendar Heatmap",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3-array": "^2.0.3",
     "d3-selection": "^1.4.0",
     "d3-tip": "^0.9.1",
diff --git a/plugins/legacy-plugin-chart-chord/package.json b/plugins/legacy-plugin-chart-chord/package.json
index ccdac2e010..3d9707f6e3 100644
--- a/plugins/legacy-plugin-chart-chord/package.json
+++ b/plugins/legacy-plugin-chart-chord/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-chord",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Chord Diagram",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "prop-types": "^15.6.2",
     "react": "^16.13.1"
diff --git a/plugins/legacy-plugin-chart-country-map/package.json b/plugins/legacy-plugin-chart-country-map/package.json
index 66ac41a7a0..1ec354c165 100644
--- a/plugins/legacy-plugin-chart-country-map/package.json
+++ b/plugins/legacy-plugin-chart-country-map/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-country-map",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Country Map",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "d3-array": "^2.0.3",
     "prop-types": "^15.6.2"
diff --git a/plugins/legacy-plugin-chart-event-flow/package.json b/plugins/legacy-plugin-chart-event-flow/package.json
index e277f616f3..75d3ccf2f3 100644
--- a/plugins/legacy-plugin-chart-event-flow/package.json
+++ b/plugins/legacy-plugin-chart-event-flow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-event-flow",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Event Flow",
   "sideEffects": [
     "*.css"
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@data-ui/event-flow": "^0.0.84",
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "prop-types": "^15.6.2"
   },
   "peerDependencies": {
diff --git a/plugins/legacy-plugin-chart-force-directed/package.json b/plugins/legacy-plugin-chart-force-directed/package.json
index d2f41874bb..fb9cc15703 100644
--- a/plugins/legacy-plugin-chart-force-directed/package.json
+++ b/plugins/legacy-plugin-chart-force-directed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-force-directed",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Force-directed Graph",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "prop-types": "^15.7.2"
   },
diff --git a/plugins/legacy-plugin-chart-heatmap/package.json b/plugins/legacy-plugin-chart-heatmap/package.json
index d740f8363d..54e8c9b7f6 100644
--- a/plugins/legacy-plugin-chart-heatmap/package.json
+++ b/plugins/legacy-plugin-chart-heatmap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-heatmap",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Heatmap",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "d3-svg-legend": "^1.x",
     "d3-tip": "^0.9.1",
diff --git a/plugins/legacy-plugin-chart-histogram/package.json b/plugins/legacy-plugin-chart-histogram/package.json
index 0379536c10..2d33ce295d 100644
--- a/plugins/legacy-plugin-chart-histogram/package.json
+++ b/plugins/legacy-plugin-chart-histogram/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-histogram",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Histogram",
   "sideEffects": [
     "*.css"
@@ -30,8 +30,8 @@
   "dependencies": {
     "@data-ui/histogram": "^0.0.84",
     "@data-ui/theme": "^0.0.84",
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "@vx/legend": "^0.0.198",
     "@vx/responsive": "^0.0.199",
     "@vx/scale": "^0.0.197",
diff --git a/plugins/legacy-plugin-chart-horizon/package.json b/plugins/legacy-plugin-chart-horizon/package.json
index 47755a977c..b654c8da60 100644
--- a/plugins/legacy-plugin-chart-horizon/package.json
+++ b/plugins/legacy-plugin-chart-horizon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-horizon",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Horizon",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3-array": "^2.0.3",
     "d3-scale": "^3.0.1",
     "prop-types": "^15.6.2"
diff --git a/plugins/legacy-plugin-chart-map-box/package.json b/plugins/legacy-plugin-chart-map-box/package.json
index b45688b473..3863e7a1c2 100644
--- a/plugins/legacy-plugin-chart-map-box/package.json
+++ b/plugins/legacy-plugin-chart-map-box/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-map-box",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - MapBox",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "immutable": "^3.8.2",
     "mapbox-gl": "^0.53.0",
     "prop-types": "^15.6.2",
diff --git a/plugins/legacy-plugin-chart-paired-t-test/package.json b/plugins/legacy-plugin-chart-paired-t-test/package.json
index 9ad76a2bc3..4285538c1e 100644
--- a/plugins/legacy-plugin-chart-paired-t-test/package.json
+++ b/plugins/legacy-plugin-chart-paired-t-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-paired-t-test",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Paired T Test",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "distributions": "^1.0.0",
     "prop-types": "^15.6.2",
     "reactable": "^1.1.0"
diff --git a/plugins/legacy-plugin-chart-parallel-coordinates/package.json b/plugins/legacy-plugin-chart-parallel-coordinates/package.json
index 1a57ea462c..fe956ec47c 100644
--- a/plugins/legacy-plugin-chart-parallel-coordinates/package.json
+++ b/plugins/legacy-plugin-chart-parallel-coordinates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-parallel-coordinates",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Parallel Coordinates",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "prop-types": "^15.7.2"
   },
diff --git a/plugins/legacy-plugin-chart-partition/package.json b/plugins/legacy-plugin-chart-partition/package.json
index 361eb19bab..d002677ccc 100644
--- a/plugins/legacy-plugin-chart-partition/package.json
+++ b/plugins/legacy-plugin-chart-partition/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-partition",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Partition",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "d3-hierarchy": "^1.1.8",
     "prop-types": "^15.6.2"
diff --git a/plugins/legacy-plugin-chart-pivot-table/package.json b/plugins/legacy-plugin-chart-pivot-table/package.json
index e8e4255296..d915c65972 100644
--- a/plugins/legacy-plugin-chart-pivot-table/package.json
+++ b/plugins/legacy-plugin-chart-pivot-table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-pivot-table",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Pivot Table",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "datatables.net-bs": "^1.10.15",
     "prop-types": "^15.6.2"
diff --git a/plugins/legacy-plugin-chart-rose/package.json b/plugins/legacy-plugin-chart-rose/package.json
index c8d8962531..de5b97209d 100644
--- a/plugins/legacy-plugin-chart-rose/package.json
+++ b/plugins/legacy-plugin-chart-rose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-rose",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Nightingale Rose Diagram",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "nvd3": "1.8.6",
     "prop-types": "^15.6.2"
diff --git a/plugins/legacy-plugin-chart-sankey-loop/package.json b/plugins/legacy-plugin-chart-sankey-loop/package.json
index 4b9c076e20..fdd72ef013 100644
--- a/plugins/legacy-plugin-chart-sankey-loop/package.json
+++ b/plugins/legacy-plugin-chart-sankey-loop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-sankey-loop",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Sankey Diagram with Loops",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3-sankey-diagram": "^0.7.3",
     "d3-selection": "^1.4.0",
     "prop-types": "^15.6.2"
diff --git a/plugins/legacy-plugin-chart-sankey/package.json b/plugins/legacy-plugin-chart-sankey/package.json
index 583854796b..fc5e419bd9 100644
--- a/plugins/legacy-plugin-chart-sankey/package.json
+++ b/plugins/legacy-plugin-chart-sankey/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-sankey",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Sankey Diagram",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "d3-sankey": "^0.4.2",
     "prop-types": "^15.6.2"
diff --git a/plugins/legacy-plugin-chart-sunburst/package.json b/plugins/legacy-plugin-chart-sunburst/package.json
index 012d2bafaa..96ee70adca 100644
--- a/plugins/legacy-plugin-chart-sunburst/package.json
+++ b/plugins/legacy-plugin-chart-sunburst/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-sunburst",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Sunburst",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "prop-types": "^15.6.2"
   }
diff --git a/plugins/legacy-plugin-chart-time-table/package.json b/plugins/legacy-plugin-chart-time-table/package.json
index 6bab64df8f..d3135a2dac 100644
--- a/plugins/legacy-plugin-chart-time-table/package.json
+++ b/plugins/legacy-plugin-chart-time-table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-time-table",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Chart Plugin - Time Table",
   "sideEffects": [
     "*.css"
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@data-ui/sparkline": "^0.0.84",
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "@types/d3-scale": "^2.0.2",
     "d3-scale": "^3.2.1",
     "moment": "^2.26.0",
diff --git a/plugins/legacy-plugin-chart-treemap/package.json b/plugins/legacy-plugin-chart-treemap/package.json
index a0bae63bae..82305aa1bd 100644
--- a/plugins/legacy-plugin-chart-treemap/package.json
+++ b/plugins/legacy-plugin-chart-treemap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-treemap",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Treemap",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3-hierarchy": "^1.1.8",
     "d3-selection": "^1.4.0",
     "prop-types": "^15.6.2"
diff --git a/plugins/legacy-plugin-chart-world-map/package.json b/plugins/legacy-plugin-chart-world-map/package.json
index 6bd41fcdd4..301a962ff8 100644
--- a/plugins/legacy-plugin-chart-world-map/package.json
+++ b/plugins/legacy-plugin-chart-world-map/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-world-map",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - World Map",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "d3-array": "^2.4.0",
     "d3-color": "^1.4.1",
diff --git a/plugins/legacy-preset-chart-big-number/package.json b/plugins/legacy-preset-chart-big-number/package.json
index 713cf9130b..1adff47944 100644
--- a/plugins/legacy-preset-chart-big-number/package.json
+++ b/plugins/legacy-preset-chart-big-number/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-preset-chart-big-number",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - Big Number",
   "sideEffects": [
     "*.css"
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@data-ui/xy-chart": "^0.0.84",
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "@types/d3-color": "^1.2.2",
     "@types/shortid": "^0.0.29",
     "d3-color": "^1.2.3",
diff --git a/plugins/legacy-preset-chart-nvd3/package.json b/plugins/legacy-preset-chart-nvd3/package.json
index c22ff5a2e1..c8f14c6922 100644
--- a/plugins/legacy-preset-chart-nvd3/package.json
+++ b/plugins/legacy-preset-chart-nvd3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-preset-chart-nvd3",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Legacy Chart - NVD3",
   "sideEffects": [
     "*.css"
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@data-ui/xy-chart": "^0.0.84",
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "d3": "^3.5.17",
     "d3-tip": "^0.9.1",
     "dompurify": "^2.0.6",
diff --git a/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js b/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js
index cba128868d..4f5e2b7970 100644
--- a/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js
+++ b/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js
@@ -126,6 +126,8 @@ const TIMESERIES_VIZ_TYPES = [
   'time_pivot',
 ];
 
+const CHART_ID_PREFIX = 'chart-id-';
+
 const propTypes = {
   data: PropTypes.oneOfType([
     PropTypes.arrayOf(
@@ -309,10 +311,18 @@ function nvd3Vis(element, props) {
   const container = element;
   container.innerHTML = '';
   const activeAnnotationLayers = annotationLayers.filter(layer => layer.show);
-  const chartId =
-    container.parentElement && container.parentElement.id !== ''
-      ? container.parentElement.id
-      : null;
+
+  // Search for the chart id in a parent div from the nvd3 chart
+  let chartContainer = container;
+  let chartId = null;
+  while (chartContainer.parentElement) {
+    if (chartContainer.parentElement.id.startsWith(CHART_ID_PREFIX)) {
+      chartId = chartContainer.parentElement.id;
+      break;
+    }
+
+    chartContainer = chartContainer.parentElement;
+  }
 
   let chart;
   let width = maxWidth;
diff --git a/plugins/plugin-chart-echarts/package.json b/plugins/plugin-chart-echarts/package.json
index 8cf71b273d..eba590ef5d 100644
--- a/plugins/plugin-chart-echarts/package.json
+++ b/plugins/plugin-chart-echarts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/plugin-chart-echarts",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Chart - Echarts",
   "sideEffects": false,
   "main": "lib/index.js",
@@ -26,11 +26,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "@types/mathjs": "^6.0.7",
     "d3-array": "^1.2.0",
-    "echarts": "^5.1.1",
+    "echarts": "^5.1.2",
     "lodash": "^4.17.15",
     "mathjs": "^8.0.1"
   },
diff --git a/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts b/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts
index 406a73e48f..6f423975be 100644
--- a/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts
+++ b/plugins/plugin-chart-echarts/src/MixedTimeseries/buildQuery.ts
@@ -60,6 +60,7 @@ export default function buildQuery(formData: QueryFormData) {
       {
         ...baseQueryObject,
         is_timeseries: true,
+        orderby: timeseries_limit_metric ? [[timeseries_limit_metric, !order_desc]] : [],
         post_processing: [
           {
             operation: 'pivot',
@@ -82,6 +83,7 @@ export default function buildQuery(formData: QueryFormData) {
       {
         ...baseQueryObject,
         is_timeseries: true,
+        orderby: timeseries_limit_metric_b ? [[timeseries_limit_metric_b, !order_desc_b]] : [],
         post_processing: [
           {
             operation: 'pivot',
diff --git a/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts b/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
index 5ffe2df879..bd4bbe5ac8 100644
--- a/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
+++ b/plugins/plugin-chart-echarts/src/Timeseries/buildQuery.ts
@@ -21,11 +21,17 @@ import { buildQueryContext, getMetricLabel, QueryFormData } from '@superset-ui/c
 export default function buildQuery(formData: QueryFormData) {
   return buildQueryContext(formData, baseQueryObject => {
     const metricLabels = (baseQueryObject.metrics || []).map(getMetricLabel);
+    const { timeseries_limit_metric, order_desc, orderby } = baseQueryObject;
     return [
       {
         ...baseQueryObject,
         groupby: formData.groupby || [],
         is_timeseries: true,
+        orderby: orderby?.length
+          ? orderby
+          : timeseries_limit_metric
+          ? [[timeseries_limit_metric, !order_desc]]
+          : [],
         post_processing: [
           {
             operation: 'pivot',
diff --git a/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx b/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
index b85d1a32e1..e6b65107cd 100644
--- a/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
+++ b/plugins/plugin-chart-echarts/src/Tree/controlPanel.tsx
@@ -70,10 +70,10 @@ const controlPanel: ControlPanelConfig = {
         ],
         [
           {
-            // TODO: Set renderTrigger to true without getting intermittent errors in echart
             name: 'root_node_id',
             config: {
               ...optionalEntity,
+              renderTrigger: true,
               type: 'TextControl',
               label: t('Root node id'),
               description: t('Id of root node of the tree.'),
diff --git a/plugins/plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx b/plugins/plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx
index 9c8d466ef9..2932dc327d 100644
--- a/plugins/plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx
+++ b/plugins/plugin-chart-echarts/src/Treemap/EchartsTreemap.tsx
@@ -93,7 +93,6 @@ export default function EchartsTreemap({
       echartOptions={echartOptions}
       eventHandlers={eventHandlers}
       selectedValues={selectedValues}
-      forceClear
     />
   );
 }
diff --git a/plugins/plugin-chart-echarts/src/Treemap/constants.ts b/plugins/plugin-chart-echarts/src/Treemap/constants.ts
index b31e9da792..9fe5f1a163 100644
--- a/plugins/plugin-chart-echarts/src/Treemap/constants.ts
+++ b/plugins/plugin-chart-echarts/src/Treemap/constants.ts
@@ -19,7 +19,7 @@
 
 import { TreePathInfo } from './types';
 
-export const COLOR_SATURATION = [0.4, 0.7];
+export const COLOR_SATURATION = [0.7, 0.4];
 export const LABEL_FONTSIZE = 11;
 export const BORDER_WIDTH = 2;
 export const GAP_WIDTH = 2;
diff --git a/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts b/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
index bbec3216f8..b0a5995bc3 100644
--- a/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
+++ b/plugins/plugin-chart-echarts/src/Treemap/transformProps.ts
@@ -251,7 +251,7 @@ export default function transformProps(
       animation: false,
       width: '100%',
       height: '100%',
-      nodeClick: dashboardId ? undefined : 'zoomToNode',
+      nodeClick: undefined,
       roam: !dashboardId,
       breadcrumb: {
         show: false,
diff --git a/plugins/plugin-chart-echarts/src/components/Echart.tsx b/plugins/plugin-chart-echarts/src/components/Echart.tsx
index 5502af3f3f..5ab0011120 100644
--- a/plugins/plugin-chart-echarts/src/components/Echart.tsx
+++ b/plugins/plugin-chart-echarts/src/components/Echart.tsx
@@ -32,7 +32,6 @@ export default function Echart({
   echartOptions,
   eventHandlers,
   selectedValues = {},
-  forceClear = false,
 }: EchartsProps) {
   const divRef = useRef<HTMLDivElement>(null);
   const chartRef = useRef<ECharts>();
@@ -50,10 +49,6 @@ export default function Echart({
       chartRef.current?.on(name, handler);
     });
 
-    if (forceClear) {
-      chartRef.current.clear();
-    }
-
     chartRef.current.setOption(echartOptions, true);
 
     chartRef.current.dispatchAction({
diff --git a/plugins/plugin-chart-echarts/test/Timeseries/buildQuery.test.ts b/plugins/plugin-chart-echarts/test/Timeseries/buildQuery.test.ts
index c333ad7f03..1969b27924 100644
--- a/plugins/plugin-chart-echarts/test/Timeseries/buildQuery.test.ts
+++ b/plugins/plugin-chart-echarts/test/Timeseries/buildQuery.test.ts
@@ -33,4 +33,33 @@ describe('Timeseries buildQuery', () => {
     expect(query.groupby).toEqual(['foo']);
     expect(query.metrics).toEqual(['bar', 'baz']);
   });
+
+  it('should order by timeseries limit if orderby unspecified', () => {
+    const queryContext = buildQuery({
+      ...formData,
+      timeseries_limit_metric: 'bar',
+      order_desc: true,
+    });
+    const [query] = queryContext.queries;
+    expect(query.groupby).toEqual(['foo']);
+    expect(query.metrics).toEqual(['bar', 'baz']);
+    expect(query.timeseries_limit_metric).toEqual('bar');
+    expect(query.order_desc).toEqual(true);
+    expect(query.orderby).toEqual([['bar', false]]);
+  });
+
+  it('should not order by timeseries limit if orderby provided', () => {
+    const queryContext = buildQuery({
+      ...formData,
+      timeseries_limit_metric: 'bar',
+      order_desc: true,
+      orderby: [['foo', true]],
+    });
+    const [query] = queryContext.queries;
+    expect(query.groupby).toEqual(['foo']);
+    expect(query.metrics).toEqual(['bar', 'baz']);
+    expect(query.timeseries_limit_metric).toEqual('bar');
+    expect(query.order_desc).toEqual(true);
+    expect(query.orderby).toEqual([['foo', true]]);
+  });
 });
diff --git a/plugins/plugin-chart-pivot-table/package.json b/plugins/plugin-chart-pivot-table/package.json
index 0c3772277d..d099cd7c6f 100644
--- a/plugins/plugin-chart-pivot-table/package.json
+++ b/plugins/plugin-chart-pivot-table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/plugin-chart-pivot-table",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Chart - Pivot Table",
   "sideEffects": false,
   "main": "lib/index.js",
@@ -26,8 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "@superset-ui/react-pivottable": "^0.12.8"
   },
   "peerDependencies": {
diff --git a/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx b/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
index f81ad2e09b..f63cc8d8a3 100644
--- a/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
+++ b/plugins/plugin-chart-pivot-table/src/PivotTableChart.tsx
@@ -23,7 +23,13 @@ import PivotTable from '@superset-ui/react-pivottable/PivotTable';
 // @ts-ignore
 import { sortAs, aggregatorTemplates } from '@superset-ui/react-pivottable/Utilities';
 import '@superset-ui/react-pivottable/pivottable.css';
-import { FilterType, PivotTableProps, PivotTableStylesProps, SelectedFiltersType } from './types';
+import {
+  FilterType,
+  MetricsLayoutEnum,
+  PivotTableProps,
+  PivotTableStylesProps,
+  SelectedFiltersType,
+} from './types';
 
 const Styles = styled.div<PivotTableStylesProps>`
   padding: ${({ theme }) => theme.gridUnit * 4}px;
@@ -57,6 +63,7 @@ export default function PivotTableChart(props: PivotTableProps) {
     setDataMask,
     selectedFilters,
     verboseMap,
+    metricsLayout,
   } = props;
 
   const adaptiveFormatter = getNumberFormatter(valueFormat);
@@ -98,9 +105,13 @@ export default function PivotTableChart(props: PivotTableProps) {
     [],
   );
 
-  const [rows, cols] = transposePivot
-    ? [groupbyColumns, [METRIC_KEY, ...groupbyRows]]
-    : [groupbyRows, [METRIC_KEY, ...groupbyColumns]];
+  let [rows, cols] = transposePivot ? [groupbyColumns, groupbyRows] : [groupbyRows, groupbyColumns];
+
+  if (metricsLayout === MetricsLayoutEnum.ROWS) {
+    rows = [METRIC_KEY, ...rows];
+  } else {
+    cols = [METRIC_KEY, ...cols];
+  }
 
   const handleChange = useCallback(
     (filters: SelectedFiltersType) => {
diff --git a/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts b/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts
index 70566a6744..54d3f52cc0 100644
--- a/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts
+++ b/plugins/plugin-chart-pivot-table/src/plugin/controlPanel.ts
@@ -23,6 +23,7 @@ import {
   sections,
   sharedControls,
 } from '@superset-ui/chart-controls';
+import { MetricsLayoutEnum } from '../types';
 
 const config: ControlPanelConfig = {
   controlPanelSections: [
@@ -60,6 +61,22 @@ const config: ControlPanelConfig = {
             },
           },
         ],
+        [
+          {
+            name: 'metricsLayout',
+            config: {
+              type: 'RadioButtonControl',
+              renderTrigger: true,
+              label: t('Apply metrics on'),
+              default: MetricsLayoutEnum.COLUMNS,
+              options: [
+                [MetricsLayoutEnum.COLUMNS, t('Columns')],
+                [MetricsLayoutEnum.ROWS, t('Rows')],
+              ],
+              description: t('Use metrics as a top level group for columns or for rows'),
+            },
+          },
+        ],
         ['adhoc_filters'],
         [
           {
diff --git a/plugins/plugin-chart-pivot-table/src/plugin/transformProps.ts b/plugins/plugin-chart-pivot-table/src/plugin/transformProps.ts
index 85fd3e9016..84be1b5897 100644
--- a/plugins/plugin-chart-pivot-table/src/plugin/transformProps.ts
+++ b/plugins/plugin-chart-pivot-table/src/plugin/transformProps.ts
@@ -73,6 +73,7 @@ export default function transformProps(chartProps: ChartProps) {
     rowTotals,
     valueFormat,
     emitFilter,
+    metricsLayout,
   } = formData;
   const { selectedFilters } = filterState;
 
@@ -97,5 +98,6 @@ export default function transformProps(chartProps: ChartProps) {
     setDataMask,
     selectedFilters,
     verboseMap,
+    metricsLayout,
   };
 }
diff --git a/plugins/plugin-chart-pivot-table/src/types.ts b/plugins/plugin-chart-pivot-table/src/types.ts
index 2a136e57e1..66e9d966fd 100644
--- a/plugins/plugin-chart-pivot-table/src/types.ts
+++ b/plugins/plugin-chart-pivot-table/src/types.ts
@@ -33,6 +33,11 @@ export interface PivotTableStylesProps {
 export type FilterType = Record<string, DataRecordValue>;
 export type SelectedFiltersType = Record<string, DataRecordValue[]>;
 
+export enum MetricsLayoutEnum {
+  ROWS = 'ROWS',
+  COLUMNS = 'COLUMNS',
+}
+
 interface PivotTableCustomizeProps {
   groupbyRows: string[];
   groupbyColumns: string[];
@@ -51,6 +56,7 @@ interface PivotTableCustomizeProps {
   emitFilter?: boolean;
   selectedFilters?: SelectedFiltersType;
   verboseMap?: JsonObject;
+  metricsLayout?: MetricsLayoutEnum;
 }
 
 export type PivotTableQueryFormData = QueryFormData &
diff --git a/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts b/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts
index d17bfd0b93..969136e19a 100644
--- a/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts
+++ b/plugins/plugin-chart-pivot-table/test/plugin/transformProps.test.ts
@@ -1,5 +1,6 @@
 import { ChartProps } from '@superset-ui/core';
 import transformProps from '../../src/plugin/transformProps';
+import { MetricsLayoutEnum } from '../../src/types';
 
 describe('PivotTableChart transformProps', () => {
   const setDataMask = jest.fn();
@@ -18,6 +19,7 @@ describe('PivotTableChart transformProps', () => {
     rowTotals: true,
     valueFormat: 'SMART_NUMBER',
     emitFilter: false,
+    metricsLayout: MetricsLayoutEnum.COLUMNS,
   };
   const chartProps = new ChartProps({
     formData,
@@ -55,6 +57,7 @@ describe('PivotTableChart transformProps', () => {
       setDataMask,
       selectedFilters: {},
       verboseMap: {},
+      metricsLayout: MetricsLayoutEnum.COLUMNS,
     });
   });
 });
diff --git a/plugins/plugin-chart-table/package.json b/plugins/plugin-chart-table/package.json
index 12f814b999..3c3f725d4d 100644
--- a/plugins/plugin-chart-table/package.json
+++ b/plugins/plugin-chart-table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/plugin-chart-table",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Chart - Table",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -26,8 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "@types/d3-array": "^2.9.0",
     "@types/react-table": "^7.0.29",
     "d3-array": "^2.4.0",
diff --git a/plugins/plugin-chart-word-cloud/package.json b/plugins/plugin-chart-word-cloud/package.json
index 1751fdf4a2..00c3cfbbab 100644
--- a/plugins/plugin-chart-word-cloud/package.json
+++ b/plugins/plugin-chart-word-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/plugin-chart-word-cloud",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Chart Plugin - Word Cloud",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "@types/d3-cloud": "^1.2.1",
     "@types/d3-scale": "^2.0.2",
     "d3-cloud": "^1.2.5",
diff --git a/plugins/preset-chart-xy/package.json b/plugins/preset-chart-xy/package.json
index 16d9c6cfbc..0e85e403d3 100644
--- a/plugins/preset-chart-xy/package.json
+++ b/plugins/preset-chart-xy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/preset-chart-xy",
-  "version": "0.17.52",
+  "version": "0.17.58",
   "description": "Superset Chart - XY",
   "sideEffects": [
     "*.css"
@@ -31,8 +31,8 @@
   "dependencies": {
     "@data-ui/theme": "^0.0.84",
     "@data-ui/xy-chart": "^0.0.84",
-    "@superset-ui/chart-controls": "0.17.52",
-    "@superset-ui/core": "0.17.52",
+    "@superset-ui/chart-controls": "0.17.58",
+    "@superset-ui/core": "0.17.58",
     "@vx/axis": "^0.0.198",
     "@vx/legend": "^0.0.198",
     "@vx/scale": "^0.0.197",
diff --git a/yarn.lock b/yarn.lock
index 850c145fdc..95612e6156 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4391,10 +4391,10 @@
     d3-cloud "^1.2.1"
     prop-types "^15.6.2"
 
-"@superset-ui/react-pivottable@^0.12.6":
-  version "0.12.6"
-  resolved "https://registry.yarnpkg.com/@superset-ui/react-pivottable/-/react-pivottable-0.12.6.tgz#c1d62a71e5f729381f8be0b1653b9a9e353d3dc3"
-  integrity sha512-2+81WL4ocv4VFzgkj3wOBcEgejnJfsJ2D08kMvFfeBt6fhqC35nkendeZMAjl4bFBmzSJIFS6H+agjoeOUyq5A==
+"@superset-ui/react-pivottable@^0.12.8":
+  version "0.12.8"
+  resolved "https://registry.yarnpkg.com/@superset-ui/react-pivottable/-/react-pivottable-0.12.8.tgz#3b7d6cd32719d6510b88b2334afacbb1735afee5"
+  integrity sha512-7DRxX/w1uSQE1pibSe64t1o+fmiP7ZWT2FJkjK510bSJm8NUIPCXtmpK+NKtNZuCteE9sqE7bQxd54SSq2xWKw==
   dependencies:
     immutability-helper "^3.1.1"
     prop-types "^15.7.2"