diff --git a/src/bin/gs_guc/cluster_guc.conf b/src/bin/gs_guc/cluster_guc.conf
index 99783a6e873476a7f5e6fd30ab79f41055ac57bb..e41ba03cbef7f5d10b9957aa15904ecb5693b605 100755
--- a/src/bin/gs_guc/cluster_guc.conf
+++ b/src/bin/gs_guc/cluster_guc.conf
@@ -854,6 +854,7 @@ enable_aggr_coerce_type|bool|0,0|NULL|NULL|
 enable_default_local_index|bool|0,0|NULL|NULL|
 enable_pq|bool|0,0|NULL|NULL|
 ivfpq_kreorder|int|0,2147483647|NULL|NULL|
+cgroup_name|string|0,0|NULL|NULL|
 [cmserver]
 log_dir|string|0,0|NULL|NULL|
 log_file_size|int|0,2047|MB|NULL|
@@ -900,6 +901,7 @@ ddb_log_backup_file_count|int|1,100|NULL|NULL|
 ddb_max_log_file_size|string|0,0|NULL|NULL|
 ddb_log_suppress_enable|int|0,1|NULL|NULL|
 ddb_election_timeout|int|1,600|NULL|NULL|
+upgrade_from|int|0,4294967295|NULL|For upgrading, specify which version we are upgrading from.|
 [cmagent]
 log_dir|string|0,0|NULL|NULL|
 log_file_size|int|0,2047|MB|NULL|
diff --git a/src/common/backend/utils/misc/postgresql_single.conf.sample b/src/common/backend/utils/misc/postgresql_single.conf.sample
index 8c0bcf1013a2b7bf47b82470bfcd19f8591f212e..499e043248c0f12ce9ef6e2736d4668a8cece0f4 100644
--- a/src/common/backend/utils/misc/postgresql_single.conf.sample
+++ b/src/common/backend/utils/misc/postgresql_single.conf.sample
@@ -568,6 +568,7 @@ alarm_component = '/opt/snas/bin/snas_cm_cmd'
 
 use_workload_manager = on		# Enables workload manager in the system.
 					# (change requires restart)
+#cgroup_name = ''
 #------------------------------------------------------------------------------
 # SECURITY POLICY
 #------------------------------------------------------------------------------