diff --git a/src/include/catalog/pg_class.dat b/src/include/catalog/pg_class.dat
index ef0cf97ab7..5a1f3aa26d 100644
--- a/src/include/catalog/pg_class.dat
+++ b/src/include/catalog/pg_class.dat
@@ -22,47 +22,47 @@
 
 { oid => '1247',
   relname => 'pg_type', relnamespace => 'PGNSP', reltype => '71',
-  reloftype => '0', relowner => 'PGUID', relam => 'PGHEAPAM', relfilenode => '0',
-  reltablespace => '0', relpages => '0', reltuples => '0', relallvisible => '0',
-  reltoastrelid => '0', relhasindex => 'f', relisshared => 'f',
-  relpersistence => 'p', relkind => 'r', relnatts => '31', relchecks => '0',
-  relhasrules => 'f', relhastriggers => 'f', relhassubclass => 'f',
-  relrowsecurity => 'f', relforcerowsecurity => 'f', relispopulated => 't',
-  relreplident => 'n', relispartition => 'f', relrewrite => '0',
-  relfrozenxid => '3', relminmxid => '1', relacl => '_null_',
+  reloftype => '0', relowner => 'PGUID', relam => 'PGHEAPAM',
+  relfilenode => '0', reltablespace => '0', relpages => '0', reltuples => '0',
+  relallvisible => '0', reltoastrelid => '0', relhasindex => 'f',
+  relisshared => 'f', relpersistence => 'p', relkind => 'r', relnatts => '31',
+  relchecks => '0', relhasrules => 'f', relhastriggers => 'f',
+  relhassubclass => 'f', relrowsecurity => 'f', relforcerowsecurity => 'f',
+  relispopulated => 't', relreplident => 'n', relispartition => 'f',
+  relrewrite => '0', relfrozenxid => '3', relminmxid => '1', relacl => '_null_',
   reloptions => '_null_', relpartbound => '_null_' },
 { oid => '1249',
   relname => 'pg_attribute', relnamespace => 'PGNSP', reltype => '75',
-  reloftype => '0', relowner => 'PGUID', relam => 'PGHEAPAM', relfilenode => '0',
-  reltablespace => '0', relpages => '0', reltuples => '0', relallvisible => '0',
-  reltoastrelid => '0', relhasindex => 'f', relisshared => 'f',
-  relpersistence => 'p', relkind => 'r', relnatts => '24', relchecks => '0',
-  relhasrules => 'f', relhastriggers => 'f', relhassubclass => 'f',
-  relrowsecurity => 'f', relforcerowsecurity => 'f', relispopulated => 't',
-  relreplident => 'n', relispartition => 'f', relrewrite => '0',
-  relfrozenxid => '3', relminmxid => '1', relacl => '_null_',
+  reloftype => '0', relowner => 'PGUID', relam => 'PGHEAPAM',
+  relfilenode => '0', reltablespace => '0', relpages => '0', reltuples => '0',
+  relallvisible => '0', reltoastrelid => '0', relhasindex => 'f',
+  relisshared => 'f', relpersistence => 'p', relkind => 'r', relnatts => '24',
+  relchecks => '0', relhasrules => 'f', relhastriggers => 'f',
+  relhassubclass => 'f', relrowsecurity => 'f', relforcerowsecurity => 'f',
+  relispopulated => 't', relreplident => 'n', relispartition => 'f',
+  relrewrite => '0', relfrozenxid => '3', relminmxid => '1', relacl => '_null_',
   reloptions => '_null_', relpartbound => '_null_' },
 { oid => '1255',
   relname => 'pg_proc', relnamespace => 'PGNSP', reltype => '81',
-  reloftype => '0', relowner => 'PGUID', relam => 'PGHEAPAM', relfilenode => '0',
-  reltablespace => '0', relpages => '0', reltuples => '0', relallvisible => '0',
-  reltoastrelid => '0', relhasindex => 'f', relisshared => 'f',
-  relpersistence => 'p', relkind => 'r', relnatts => '29', relchecks => '0',
-  relhasrules => 'f', relhastriggers => 'f', relhassubclass => 'f',
-  relrowsecurity => 'f', relforcerowsecurity => 'f', relispopulated => 't',
-  relreplident => 'n', relispartition => 'f', relrewrite => '0',
-  relfrozenxid => '3', relminmxid => '1', relacl => '_null_',
+  reloftype => '0', relowner => 'PGUID', relam => 'PGHEAPAM',
+  relfilenode => '0', reltablespace => '0', relpages => '0', reltuples => '0',
+  relallvisible => '0', reltoastrelid => '0', relhasindex => 'f',
+  relisshared => 'f', relpersistence => 'p', relkind => 'r', relnatts => '29',
+  relchecks => '0', relhasrules => 'f', relhastriggers => 'f',
+  relhassubclass => 'f', relrowsecurity => 'f', relforcerowsecurity => 'f',
+  relispopulated => 't', relreplident => 'n', relispartition => 'f',
+  relrewrite => '0', relfrozenxid => '3', relminmxid => '1', relacl => '_null_',
   reloptions => '_null_', relpartbound => '_null_' },
 { oid => '1259',
   relname => 'pg_class', relnamespace => 'PGNSP', reltype => '83',
-  reloftype => '0', relowner => 'PGUID', relam => 'PGHEAPAM', relfilenode => '0',
-  reltablespace => '0', relpages => '0', reltuples => '0', relallvisible => '0',
-  reltoastrelid => '0', relhasindex => 'f', relisshared => 'f',
-  relpersistence => 'p', relkind => 'r', relnatts => '33', relchecks => '0',
-  relhasrules => 'f', relhastriggers => 'f', relhassubclass => 'f',
-  relrowsecurity => 'f', relforcerowsecurity => 'f', relispopulated => 't',
-  relreplident => 'n', relispartition => 'f', relrewrite => '0',
-  relfrozenxid => '3', relminmxid => '1', relacl => '_null_',
+  reloftype => '0', relowner => 'PGUID', relam => 'PGHEAPAM',
+  relfilenode => '0', reltablespace => '0', relpages => '0', reltuples => '0',
+  relallvisible => '0', reltoastrelid => '0', relhasindex => 'f',
+  relisshared => 'f', relpersistence => 'p', relkind => 'r', relnatts => '33',
+  relchecks => '0', relhasrules => 'f', relhastriggers => 'f',
+  relhassubclass => 'f', relrowsecurity => 'f', relforcerowsecurity => 'f',
+  relispopulated => 't', relreplident => 'n', relispartition => 'f',
+  relrewrite => '0', relfrozenxid => '3', relminmxid => '1', relacl => '_null_',
   reloptions => '_null_', relpartbound => '_null_' },
 
 ]
diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index 2e9d6cf2f5..e9638660ff 100644
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -870,8 +870,9 @@
 # Table access method handlers
 { oid => '3', oid_symbol => 'HEAP_TABLE_AM_HANDLER_OID',
   descr => 'row-oriented heap table access method handler',
-  proname => 'heap_tableam_handler', provolatile => 'v', prorettype => 'table_am_handler',
-  proargtypes => 'internal', prosrc => 'heap_tableam_handler' },
+  proname => 'heap_tableam_handler', provolatile => 'v',
+  prorettype => 'table_am_handler', proargtypes => 'internal',
+  prosrc => 'heap_tableam_handler' },
 
 # Index access method handlers
 { oid => '330', descr => 'btree index access method handler',
@@ -10433,10 +10434,10 @@
 
 # pg_config
 { oid => '3400', descr => 'pg_config binary as a function',
-  proname => 'pg_config', provolatile => 's', prorows => '23', proretset => 't', proparallel => 'r',
-  prorettype => 'record', proargtypes => '', proallargtypes => '{text,text}',
-  proargmodes => '{o,o}', proargnames => '{name,setting}',
-  prosrc => 'pg_config' },
+  proname => 'pg_config', prorows => '23', proretset => 't', provolatile => 's',
+  proparallel => 'r', prorettype => 'record', proargtypes => '',
+  proallargtypes => '{text,text}', proargmodes => '{o,o}',
+  proargnames => '{name,setting}', prosrc => 'pg_config' },
 
 # pg_controldata related functions
 { oid => '3441',