diff --git a/mariadb-plugin-columnstore.install.generated b/mariadb-plugin-columnstore.install.generated
index d987525f2a6..2b1434e58b9 100644
--- a/mariadb-plugin-columnstore.install.generated
+++ b/mariadb-plugin-columnstore.install.generated
@@ -1 +1,3 @@
 #File is generated by ColumnstoreLibrary.cmake, do not edit
+etc/mysql/columnstore.cnf # added in dbcon/mysql/CMakeLists.txt
+usr/local/mysql/lib/plugin/ha_columnstore.so # added in dbcon/mysql/CMakeLists.txt
diff --git a/sql/field.h b/sql/field.h
index 37155d7874c..7e83fef7934 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -604,13 +604,13 @@ class Virtual_column_info: public Sql_alloc,
   Lex_ident_column name;                        /* Name of constraint */
   /* see VCOL_* (VCOL_FIELD_REF, ...) */
   uint flags;
-  Name_resolution_context *context;
+  Name_resolution_context *context_not_used;
 
   Virtual_column_info()
    :Type_handler_hybrid_field_type(&type_handler_null),
     vcol_type((enum_vcol_info_type)VCOL_TYPE_NONE),
     in_partitioning_expr(FALSE),
-    utf8(TRUE), automatic_name(FALSE), expr(NULL), flags(0), context(NULL)
+    utf8(TRUE), automatic_name(FALSE), expr(NULL), flags(0), context_not_used(NULL)
   {
     name.str= NULL;
     name.length= 0;
diff --git a/sql/item.cc b/sql/item.cc
index 58c28349fa9..6660a96f930 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3321,7 +3321,7 @@ Item_field::Item_field(THD *thd, Name_resolution_context *context_arg,
   set_field(f);
   with_flags|= item_with_t::FIELD;
   if (f->vcol_info)
-    f->vcol_info->context= context_arg;
+    f->vcol_info->context_not_used= context_arg;
 }
 
 
diff --git a/sql/opt_vcol_substitution.cc b/sql/opt_vcol_substitution.cc
index 1601b83f954..19c26ee3403 100644
--- a/sql/opt_vcol_substitution.cc
+++ b/sql/opt_vcol_substitution.cc
@@ -469,11 +469,15 @@ void subst_vcol_if_compatible(Vcol_subst_context *ctx,
   Item_field *itf= new (thd->mem_root) Item_field(thd, vcol_field);
   if (!itf)
     return; // Out of memory, caller will know from thd->is_error()
-  if (!vcol_field->vcol_info->context)
+
+  // The below will set context_not_used.
+  //    It also has a debug assert for checking its the same between
+  //    different item objects
+  if (!vcol_field->vcol_info->context_not_used)
     vcol_expr->walk(&Item::get_context_for_vcol_processor,
-                    &vcol_field->vcol_info->context,
+                    &vcol_field->vcol_info->context_not_used,
                     WALK_SUBQUERY);
-  itf->context= vcol_field->vcol_info->context;
+  itf->context= vcol_field->vcol_info->context_not_used;
   bitmap_set_bit(vcol_field->table->read_set, vcol_field->field_index);
   DBUG_ASSERT(itf->fixed());
   thd->change_item_tree(vcol_expr_ref, itf);