diff --git a/src/common/backend/utils/init/globals.cpp b/src/common/backend/utils/init/globals.cpp
index 640ba05937f5462b8852eb30b9ad91c71ed0181e..87dbef78f00c7ca4be99aaca004dcd349dfcc86e 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 = 92608;
+const uint32 GRAND_VERSION_NUM = 92609;
 
 const uint32 SQL_PATCH_VERSION_NUM = 92608;
 const uint32 PREDPUSH_SAME_LEVEL_VERSION_NUM = 92522;
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index bad2396752b49698c6b8774f0c7605addc8266cd..9ea740ddd20c5ebb0726d5359e25de1ded86b674 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -223,8 +223,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_609.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_609.sql
new file mode 100644
index 0000000000000000000000000000000000000000..df9797eac77de707402dc5c23897d96fb3ce3462
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_609.sql
@@ -0,0 +1,19 @@
+DO
+$do$
+    DECLARE
+        index_exists boolean := true;
+    BEGIN
+        select case when count(*)=1 then true else false end from (select 1 from pg_class where oid = 2691 and relkind = 'i' and relname = 'pg_proc_proname_args_nsp_index') into index_exists;
+        IF index_exists = false then
+            IF working_version_num() < 92507 then
+                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;
+            ELSE
+                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 IF;
+    END
+$do$;
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_609.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_609.sql
new file mode 100644
index 0000000000000000000000000000000000000000..df9797eac77de707402dc5c23897d96fb3ce3462
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_609.sql
@@ -0,0 +1,19 @@
+DO
+$do$
+    DECLARE
+        index_exists boolean := true;
+    BEGIN
+        select case when count(*)=1 then true else false end from (select 1 from pg_class where oid = 2691 and relkind = 'i' and relname = 'pg_proc_proname_args_nsp_index') into index_exists;
+        IF index_exists = false then
+            IF working_version_num() < 92507 then
+                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;
+            ELSE
+                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 IF;
+    END
+$do$;
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_609.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_609.sql
new file mode 100644
index 0000000000000000000000000000000000000000..dd6bf55c90d22ad54af0169cec89fc4e4fd7d103
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_609.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_609.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_609.sql
new file mode 100644
index 0000000000000000000000000000000000000000..dd6bf55c90d22ad54af0169cec89fc4e4fd7d103
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_609.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;
\ No newline at end of file