diff --git a/src/backend/cdb/cdbvars.c b/src/backend/cdb/cdbvars.c
index e7d0a93f006b9b45cd4ad30f7b4078ed12aac20c..e9bbc7bcd2e1e142283a6987aecdfbf59ea983fe 100644
--- a/src/backend/cdb/cdbvars.c
+++ b/src/backend/cdb/cdbvars.c
@@ -73,7 +73,7 @@ bool		Debug_print_prelim_plan;	/* Shall we log argument of
 
 bool		Debug_print_slice_table;	/* Shall we log the slice table? */
 
-bool		Debug_resource_group;	/* Shall we log the resource group? */
+bool		Debug_resource_group = false;	/* Shall we log the resource group? */
 
 bool		Debug_burn_xids;
 
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index ba0862a44f6b94eb38585c75f333d6c87f467557..deceb82864b5d79ad74f9a8818dfa84f8c449a84 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -130,7 +130,6 @@ bool        test_AppendOnlyHash_eviction_vs_just_marking_not_inuse = false;
 bool		Debug_appendonly_print_datumstream = false;
 bool		Debug_appendonly_print_visimap = false;
 bool		Debug_appendonly_print_compaction = false;
-bool		Debug_resource_group = false;
 bool		Debug_bitmap_print_insert = false;
 bool		Test_print_direct_dispatch_info = false;
 bool        Test_print_prefetch_joinqual = false;
@@ -199,9 +198,6 @@ int			Debug_dtm_action_protocol = DEBUG_DTM_ACTION_PROTOCOL_DEFAULT;
 int			Debug_dtm_action_segment = DEBUG_DTM_ACTION_SEGMENT_DEFAULT;
 int			Debug_dtm_action_nestinglevel = DEBUG_DTM_ACTION_NESTINGLEVEL_DEFAULT;
 
-/* Enable check for compatibility of encoding and locale in createdb */
-bool		gp_encoding_check_locale_compatibility;
-
 int			gp_connection_send_timeout;
 
 bool create_restartpoint_on_ckpt_record_replay = false;
diff --git a/src/include/cdb/cdbvars.h b/src/include/cdb/cdbvars.h
index 84a123a1ed039551c884d9d1901a8272d0bc9db6..2f549491e7d0491a7379e7fa239ddc75950b88dc 100644
--- a/src/include/cdb/cdbvars.h
+++ b/src/include/cdb/cdbvars.h
@@ -738,6 +738,9 @@ extern bool gp_cte_sharing;
 /* Enable RECURSIVE clauses in common table expressions */
 extern bool gp_recursive_cte;
 
+/* Enable check for compatibility of encoding and locale in createdb */
+extern bool gp_encoding_check_locale_compatibility;
+
 /* Priority for the segworkers relative to the postmaster's priority */
 extern int gp_segworker_relative_priority;