diff --git a/src/common/backend/utils/init/globals.cpp b/src/common/backend/utils/init/globals.cpp
index 838d07365..604642ab6 100644
--- a/src/common/backend/utils/init/globals.cpp
+++ b/src/common/backend/utils/init/globals.cpp
@@ -59,7 +59,7 @@ bool open_join_children = true;
 bool will_shutdown = false;
 
 /* hard-wired binary version number */
-const uint32 GRAND_VERSION_NUM = 92847;
+const uint32 GRAND_VERSION_NUM = 92848;
 
 const uint32 SRF_FUSION_VERSION_NUM = 92847;
 const uint32 INNER_UNIQUE_VERSION_NUM = 92845;
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index 8aef47b85..ec233c0a8 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -237,8 +237,6 @@ DECLARE_UNIQUE_INDEX(pg_pltemplate_name_index, 1137, on pg_pltemplate using btre
 DECLARE_UNIQUE_INDEX(pg_proc_oid_index, 2690, on pg_proc using btree(oid oid_ops));
 #define ProcedureOidIndexId  2690
 
-DECLARE_INDEX(pg_proc_proname_args_nsp_index, 2691, on pg_proc using btree(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops, propackageid oid_ops));
-#define ProcedureNameArgsNspIndexId  2691
 DECLARE_INDEX(pg_proc_proname_all_args_nsp_index, 9666, on pg_proc using btree(proname name_ops, allargtypes oidvector_ops, pronamespace oid_ops, propackageid oid_ops));
 #define ProcedureNameAllArgsNspIndexId  9666
 
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_848.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_848.sql
new file mode 100644
index 000000000..0fe28d41b
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_848.sql
@@ -0,0 +1,15 @@
+DO $$
+BEGIN
+    if working_version_num() < 92507 then
+        DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;
+        SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 2691;
+        CREATE UNIQUE INDEX pg_catalog.pg_proc_proname_args_nsp_index on pg_catalog.pg_proc USING BTREE(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops);
+        SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
+    elseif working_version_num() < 92609 or working_version_num() > 92655 then
+        DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;
+        SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 2691;
+        CREATE INDEX pg_catalog.pg_proc_proname_args_nsp_index on pg_catalog.pg_proc USING BTREE(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops, propackageid oid_ops);
+        SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
+    end if;
+END
+$$;
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_848.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_848.sql
new file mode 100644
index 000000000..0fe28d41b
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_848.sql
@@ -0,0 +1,15 @@
+DO $$
+BEGIN
+    if working_version_num() < 92507 then
+        DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;
+        SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 2691;
+        CREATE UNIQUE INDEX pg_catalog.pg_proc_proname_args_nsp_index on pg_catalog.pg_proc USING BTREE(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops);
+        SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
+    elseif working_version_num() < 92609 or working_version_num() > 92655 then
+        DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;
+        SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 2691;
+        CREATE INDEX pg_catalog.pg_proc_proname_args_nsp_index on pg_catalog.pg_proc USING BTREE(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops, propackageid oid_ops);
+        SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
+    end if;
+END
+$$;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_848.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_848.sql
new file mode 100644
index 000000000..0db553652
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_848.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_848.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_848.sql
new file mode 100644
index 000000000..0db553652
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_848.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;