diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index 33c7888c3..0eda9de2e 100755
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -4633,7 +4633,6 @@ HINT:  No function matches the given name and argument types. You might need to
 CONTEXT:  referenced column: least_agg
 -- Add function and aggregate into extension
 alter extension postgres_fdw add function least_accum(anyelement, variadic anyarray);
-ERROR:  function least_accum(anyelement,anyarray) is already a member of extension "postgres_fdw"
 alter extension postgres_fdw add aggregate least_agg(variadic items anyarray);
 ERROR:  syntax error at or near "variadic"
 LINE 1: ...er extension postgres_fdw add aggregate least_agg(variadic i...
diff --git a/contrib/postgres_fdw/expected/postgres_fdw_partition.out b/contrib/postgres_fdw/expected/postgres_fdw_partition.out
index 485e39fdd..feac8e8dd 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw_partition.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw_partition.out
@@ -5482,7 +5482,6 @@ HINT:  No function matches the given name and argument types. You might need to
 CONTEXT:  referenced column: least_agg
 -- Add function and aggregate into extension
 alter extension postgres_fdw add function least_accum(anyelement, variadic anyarray);
-ERROR:  function least_accum(anyelement,anyarray) is already a member of extension "postgres_fdw"
 alter extension postgres_fdw add aggregate least_agg(variadic items anyarray);
 ERROR:  syntax error at or near "variadic"
 LINE 1: ...er extension postgres_fdw add aggregate least_agg(variadic i...
diff --git a/src/common/backend/catalog/builtin_funcs.ini b/src/common/backend/catalog/builtin_funcs.ini
index 295e032c6..1d0901969 100755
--- a/src/common/backend/catalog/builtin_funcs.ini
+++ b/src/common/backend/catalog/builtin_funcs.ini
@@ -293,7 +293,7 @@
         AddBuiltinFunc(_0(7895), _1("array_indexby_length"), _2(2), _3(false), _4(false), _5(array_indexby_length), _6(23), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('i'), _19(0), _20(2, 2277, 23), _21(NULL), _22(NULL), _23(NULL), _24(NULL), _25("array_indexby_length"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33("array index by length"), _34('f'), _35(NULL),  _36(0), _37(false), _38(NULL), _39(NULL), _40(0))
     ),
     AddFuncGroup(
-        "array_integer_delete", 1, 
+        "array_integer_deleteidx", 1, 
         AddBuiltinFunc(_0(7887), _1("array_integer_deleteidx"), _2(2), _3(true), _4(false), _5(array_integer_deleteidx), _6(2277), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('i'), _19(0), _20(2, 2277, 23), _21(NULL), _22(NULL), _23(NULL), _24(NULL), _25("array_integer_deleteidx"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33(NULL), _34('f'), _35(NULL),  _36(0), _37(false), _38(NULL), _39(NULL), _40(0))
     ),
     AddFuncGroup(
@@ -419,7 +419,7 @@
         AddBuiltinFunc(_0(2092), _1("array_upper"), _2(2), _3(true), _4(false), _5(array_upper), _6(23), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('i'), _19(0), _20(2, 2277, 23), _21(NULL), _22(NULL), _23(NULL), _24(NULL), _25("array_upper"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33("array upper dimension"), _34('f'), _35(NULL),  _36(0), _37(false), _38(NULL), _39(NULL), _40(0))
     ),
     AddFuncGroup(
-        "array_varchar_delete", 1, 
+        "array_varchar_deleteidx", 1, 
         AddBuiltinFunc(_0(7886), _1("array_varchar_deleteidx"), _2(2), _3(true), _4(false), _5(array_varchar_deleteidx), _6(2277), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(0), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('i'), _19(0), _20(2, 2277, 1043), _21(NULL), _22(NULL), _23(NULL), _24(NULL), _25("array_varchar_deleteidx"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33(NULL), _34('f'), _35(NULL),  _36(0), _37(false), _38(NULL), _39(NULL), _40(0))
     ),
     AddFuncGroup(
diff --git a/src/test/regress/expected/single_node_opr_sanity.out b/src/test/regress/expected/single_node_opr_sanity.out
index e460b008e..959b823fb 100755
--- a/src/test/regress/expected/single_node_opr_sanity.out
+++ b/src/test/regress/expected/single_node_opr_sanity.out
@@ -1607,6 +1607,16 @@ WHERE d.classoid IS NULL AND p1.oid <= 9999 order by 1;
  9999 | pg_test_err_contain_err
 --?.*
 
+-- pg_catalog.function() should be visible.
+SELECT oid, proname
+FROM pg_proc
+where pronamespace = 11 AND
+      pg_function_is_visible(oid) = false
+order by 1,2;
+ oid | proname 
+-----+---------
+(0 rows)
+
 -- **************** pg_cast ****************
 -- Catch bogus values in pg_cast columns (other than cases detected by
 -- oidjoins test).
diff --git a/src/test/regress/sql/single_node_opr_sanity.sql b/src/test/regress/sql/single_node_opr_sanity.sql
index 24ebf03c8..1db78bd24 100644
--- a/src/test/regress/sql/single_node_opr_sanity.sql
+++ b/src/test/regress/sql/single_node_opr_sanity.sql
@@ -307,6 +307,13 @@ FROM pg_proc as p1 LEFT JOIN pg_description as d
      ON p1.tableoid = d.classoid and p1.oid = d.objoid and d.objsubid = 0
 WHERE d.classoid IS NULL AND p1.oid <= 9999 order by 1;
 
+-- pg_catalog.function() should be visible.
+SELECT oid, proname
+FROM pg_proc
+where pronamespace = 11 AND
+      pg_function_is_visible(oid) = false
+order by 1,2;
+
 
 -- **************** pg_cast ****************