diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77aa4d7dd48..fdea0378b1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * **Database**: Allow database config using one propertie, closes [#5456](https://github.com/grafana/grafana/pull/5456)
 * **Graphite**: Add support for groupByNodes, closes [#5613](https://github.com/grafana/grafana/pull/5613)
 * **Influxdb**: Add support for elapsed(), closes [#5827](https://github.com/grafana/grafana/pull/5827)
+* **OpenTSDB**: Add support for explicitTags for OpenTSDB>=2.3, closes [#6360](https://github.com/grafana/grafana/pull/6361)
 * **OAuth**: Add support for generic oauth, closes [#4718](https://github.com/grafana/grafana/pull/4718)
 * **Cloudwatch**: Add support to expand multi select template variable, closes [#5003](https://github.com/grafana/grafana/pull/5003)
 * **Graph Panel**: Now supports flexible lower/upper bounds on Y-Max and Y-Min, PR [#5720](https://github.com/grafana/grafana/pull/5720)
diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
index 96a3bb1af7b..b6e92f64fee 100644
--- a/public/app/features/dashboard/dashboard_srv.ts
+++ b/public/app/features/dashboard/dashboard_srv.ts
@@ -88,7 +88,7 @@ export class DashboardSrv {
         onAltAction: () => {
           this.saveDashboardAs();
         },
-        onConfirm: function() {
+        onConfirm: () => {
           this.saveDashboard({overwrite: true});
         }
       });
diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index be8e2df42e4..9b0bb908ca2 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -159,19 +159,28 @@ module.directive('panelResizer', function($rootScope) {
         }
 
         scope.$apply(function() {
-          ctrl.render();
+         // ctrl.render();
         });
       }
 
       function dragEndHandler() {
+        ctrl.panel.span = Math.round(ctrl.panel.span);
+        if (lastPanel) {
+          lastPanel.span = Math.round(lastPanel.span);
+        }
+
         // if close to 12
         var rowSpan = ctrl.dashboard.rowSpan(ctrl.row);
         if (rowSpan < 12 && rowSpan > 11) {
           lastPanel.span +=  12 - rowSpan;
         }
 
-        scope.$apply(function() {
-          $rootScope.$broadcast('render');
+        // first digest to propagate panel width change
+        // then render
+        $rootScope.$apply(function() {
+          setTimeout(function() {
+            $rootScope.$broadcast('render');
+          });
         });
 
         $('body').off('mousemove', moveHandler);
diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index d5034ce271f..4ef7c9761fe 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -425,6 +425,10 @@ function (angular, _, dateMath) {
         }
       }
 
+      if (target.explicitTags) {
+        query.explicitTags = true;
+      }
+
       return query;
     }
 
diff --git a/public/app/plugins/datasource/opentsdb/partials/query.editor.html b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
index 255e23c5701..a2db8a68840 100644
--- a/public/app/plugins/datasource/opentsdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
@@ -249,6 +249,11 @@
 			</input>
 		</div>
 
+		<div class="gf-form" ng-if="ctrl.tsdbVersion > 2">
+			<gf-form-switch class="gf-form" label="Explicit tags" label-class="width-8 query-keyword" checked="ctrl.target.explicitTags" on-change="ctrl.targetBlur()">
+			</gf-form-switch>
+		</div>
+
 		<div class="gf-form gf-form--grow">
 			<div class="gf-form-label gf-form-label--grow"></div>
 		</div>