diff --git a/sql/table.h b/sql/table.h
index d46f91ee2dd..981fc5d23c5 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -2526,7 +2526,7 @@ struct TABLE_LIST
   List<TABLE_LIST> *view_tables;
   /* most upper view this table belongs to */
   TABLE_LIST	*belong_to_view;
-  /* A derived table this table belongs to */
+  /* A merged derived table this table belongs to */
   TABLE_LIST    *belong_to_derived;
   /*
     The view directly referencing this table
diff --git a/storage/spider/mysql-test/spider/bugfix/r/mdev_26345.result b/storage/spider/mysql-test/spider/bugfix/r/mdev_26345.result
index 9f569795299..31a2cc452d0 100644
--- a/storage/spider/mysql-test/spider/bugfix/r/mdev_26345.result
+++ b/storage/spider/mysql-test/spider/bugfix/r/mdev_26345.result
@@ -15,6 +15,9 @@ insert into t1 VALUES (1,4), (1,2), (2,11);
 SELECT MIN(b), a FROM t1 WHERE a=1;
 MIN(b)	a
 2	1
+select * from (SELECT MIN(b), a FROM t1 WHERE a=1) as v;
+MIN(b)	a
+2	1
 SELECT MAX(b), a FROM t1 WHERE a<3;
 MAX(b)	a
 11	1
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_26345.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_26345.test
index b14df3bf332..e3a0631721d 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/mdev_26345.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_26345.test
@@ -22,6 +22,7 @@ create table t1 (a int, b int, PRIMARY KEY (a, b)) ENGINE=Spider
 COMMENT='WRAPPER "mysql", srv "srv",TABLE "t2"';
 insert into t1 VALUES (1,4), (1,2), (2,11);
 SELECT MIN(b), a FROM t1 WHERE a=1;
+select * from (SELECT MIN(b), a FROM t1 WHERE a=1) as v;
 SELECT MAX(b), a FROM t1 WHERE a<3;
 drop table t1, t2;
 
diff --git a/storage/spider/mysql-test/spider/bugfix/t/mdev_29502.test b/storage/spider/mysql-test/spider/bugfix/t/mdev_29502.test
index 91a8cad5f8b..7e0bcc61df9 100644
--- a/storage/spider/mysql-test/spider/bugfix/t/mdev_29502.test
+++ b/storage/spider/mysql-test/spider/bugfix/t/mdev_29502.test
@@ -24,10 +24,14 @@ eval CREATE TABLE t1 (a INT KEY) ENGINE=Spider COMMENT='WRAPPER "mysql",srv "$sr
 SELECT MAX(a) FROM t1;
 SELECT SUM(a) FROM t1;
 SELECT COUNT(a) FROM t1;
+# Spider does not create a GBH with view protocol in these cases which
+# would cause extra direct aggregate counts than without view protocol
+--disable_view_protocol
 SELECT MAX(a), SUM(a) FROM t1;
 SELECT COUNT(a), MAX(a), SUM(a) FROM t1;
 SELECT MAX(a), COUNT(a), SUM(a) FROM t1;
 SELECT MAX(a), MAX(COALESCE(a)) FROM t1;
+--enable_view_protocol
 SHOW STATUS LIKE 'Spider_direct_aggregate';
 
 DROP TABLE t, t1;
diff --git a/storage/spider/spd_group_by_handler.cc b/storage/spider/spd_group_by_handler.cc
index 0c62e6cf7eb..70f9ef3c0b5 100644
--- a/storage/spider/spd_group_by_handler.cc
+++ b/storage/spider/spd_group_by_handler.cc
@@ -1566,6 +1566,16 @@ group_by_handler *spider_create_group_by_handler(
         DBUG_PRINT("info",("spider select item=%p", item));
         if (item->const_item())
         {
+          /*
+            Do not create the GBH when a derived table or view is
+            involved
+          */
+          if (thd->derived_tables != NULL)
+          {
+            keep_going= FALSE;
+            break;
+          }
+
           /*
             Do not handle the complex case where there's a const item
             in the auxiliary fields. It is too unlikely (if at all) to