diff --git a/src/common/backend/catalog/builtin_funcs.ini b/src/common/backend/catalog/builtin_funcs.ini
index 18d811064..2a13daacb 100644
--- a/src/common/backend/catalog/builtin_funcs.ini
+++ b/src/common/backend/catalog/builtin_funcs.ini
@@ -3545,11 +3545,11 @@
     ),   
     AddFuncGroup(                                                               
          "hypopg_drop_index", 1,                                              
-         AddBuiltinFunc(_0(4891), _1("hypopg_drop_index"), _2(1), _3(false), _4(false), _5(hypopg_drop_index), _6(16), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(1), _12(0), _13(0), _14('f'), _15(false), _16(false), _17('s'), _18(0), _19(1, 23), _20(NULL), _21(NULL), _22(NULL), _23(NULL), _24("hypopg_drop_index"), _25(NULL), _26(NULL), _27(NULL), _28(0), _29(false), _30(NULL), _31(false))
+         AddBuiltinFunc(_0(4891), _1("hypopg_drop_index"), _2(1), _3(false), _4(false), _5(hypopg_drop_index), _6(16), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14('f'), _15(false), _16(false), _17('s'), _18(0), _19(1, 23), _20(NULL), _21(NULL), _22(NULL), _23(NULL), _24("hypopg_drop_index"), _25(NULL), _26(NULL), _27(NULL), _28(0), _29(false), _30(NULL), _31(false))
     ),
     AddFuncGroup(                                                               
          "hypopg_estimate_size", 1,                                                
-         AddBuiltinFunc(_0(4892), _1("hypopg_estimate_size"), _2(1), _3(false), _4(false), _5(hypopg_estimate_size), _6(20), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(1), _12(0), _13(0), _14('f'), _15(false), _16(false), _17('s'), _18(0), _19(1, 23), _20(NULL), _21(NULL), _22(NULL), _23(NULL), _24("hypopg_estimate_size"), _25(NULL), _26(NULL), _27(NULL), _28(0), _29(false), _30(NULL), _31(false))
+         AddBuiltinFunc(_0(4892), _1("hypopg_estimate_size"), _2(1), _3(false), _4(false), _5(hypopg_estimate_size), _6(20), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14('f'), _15(false), _16(false), _17('s'), _18(0), _19(1, 23), _20(NULL), _21(NULL), _22(NULL), _23(NULL), _24("hypopg_estimate_size"), _25(NULL), _26(NULL), _27(NULL), _28(0), _29(false), _30(NULL), _31(false))
     ),                                                                           
     AddFuncGroup(                                                               
          "hypopg_reset_index", 1,                                               
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
index 890018264..e1f48146c 100644
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@@ -36,6 +36,7 @@ SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%' ORDER BY name;
  enable_global_stats               | on
  enable_hashagg                    | on
  enable_hashjoin                   | on
+ enable_hypo_index                 | off
  enable_incremental_catchup        | on
  enable_incremental_checkpoint     | on
  enable_index_nestloop             | on
@@ -86,7 +87,7 @@ SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%' ORDER BY name;
  enable_vector_engine              | on
  enable_wdr_snapshot               | off
  enable_xlog_prune                 | on
-(82 rows)
+(83 rows)
 
 CREATE TABLE foo2(fooid int, f2 int);
 INSERT INTO foo2 VALUES(1, 11);
diff --git a/src/test/regress/expected/single_node_opr_sanity.out b/src/test/regress/expected/single_node_opr_sanity.out
index d19e7e43d..c28f54cbf 100755
--- a/src/test/regress/expected/single_node_opr_sanity.out
+++ b/src/test/regress/expected/single_node_opr_sanity.out
@@ -2706,7 +2706,7 @@ select count(*) from pg_proc where prokind = 'w';
 select count(*) from pg_proc where prokind = 'f';
  count 
 -------
-  3156
+  3161
 (1 row)
 
 select count(*) from pg_proc where prokind = 'p';
diff --git a/src/test/regress/pg_regress.cpp b/src/test/regress/pg_regress.cpp
index c03eae721..0349498bf 100644
--- a/src/test/regress/pg_regress.cpp
+++ b/src/test/regress/pg_regress.cpp
@@ -4980,7 +4980,7 @@ static void run_single_test(const char* test, test_function tfunc, diag_function
     REGR_PRINT_ELAPSED_TIME;
 }
 
-#define BASE_GLOBAL_VARIABLE_NUM 235
+#define BASE_GLOBAL_VARIABLE_NUM 237
 static void check_global_variables()
 {
     char* cmd =