diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_420.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_420.sql
index d357e1010..f8e11b4e8 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_420.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_420.sql
@@ -259,7 +259,7 @@ DROP TYPE IF EXISTS pg_catalog.jsonb;
 DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE;
-DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;UPDATE pg_catalog.pg_am set amcanunique = FALSE where amname = 'cbtree';
+DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;UPDATE pg_catalog.pg_am set amcanunique = FALSE, amhandler = 0 where amname = 'cbtree';
 CREATE OR REPLACE VIEW pg_catalog.gs_session_cpu_statistics AS
 SELECT
         S.datid AS datid,
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_920.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_920.sql
index 570b0b1d4..ed05e8404 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_920.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_920.sql
@@ -1,12 +1,21 @@
-DROP VIEW IF EXISTS pg_catalog.pg_publication_tables;
-CREATE VIEW pg_catalog.pg_publication_tables AS
-    SELECT
-        P.pubname AS pubname,
-        N.nspname AS schemaname,
-        C.relname AS tablename
-    FROM pg_publication P, pg_class C
-         JOIN pg_namespace N ON (N.oid = C.relnamespace)
-    WHERE C.oid IN (SELECT relid FROM pg_catalog.pg_get_publication_tables(P.pubname));
+do $$DECLARE ans boolean;
+BEGIN
+    for ans in select case when count(*) = 1 then true else false end as ans from (select relname from pg_class where relname = 'pg_publication_tables' and relkind = 'v')
+    LOOP
+        if ans = true then -- base version is after 92-507, create older view
+            DROP VIEW IF EXISTS pg_catalog.pg_publication_tables;
+            CREATE VIEW pg_catalog.pg_publication_tables AS
+                SELECT
+                    P.pubname AS pubname,
+                    N.nspname AS schemaname,
+                    C.relname AS tablename
+                FROM pg_publication P, pg_class C
+                    JOIN pg_namespace N ON (N.oid = C.relnamespace)
+                WHERE C.oid IN (SELECT relid FROM pg_catalog.pg_get_publication_tables(P.pubname));
+        end if;
+        exit;
+    END LOOP;
+END$$;
 
 -- drop reform info functions
 DROP FUNCTION IF EXISTS pg_catalog.query_node_reform_info_from_dms() CASCADE;
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_420.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_420.sql
index d357e1010..f8e11b4e8 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_420.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_420.sql
@@ -259,7 +259,7 @@ DROP TYPE IF EXISTS pg_catalog.jsonb;
 DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;DROP FUNCTION IF EXISTS pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE;
-DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;UPDATE pg_catalog.pg_am set amcanunique = FALSE where amname = 'cbtree';
+DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT encrypt_result_str text) CASCADE;UPDATE pg_catalog.pg_am set amcanunique = FALSE, amhandler = 0 where amname = 'cbtree';
 CREATE OR REPLACE VIEW pg_catalog.gs_session_cpu_statistics AS
 SELECT
         S.datid AS datid,
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_920.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_920.sql
index 9702137ea..d247eb62e 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_920.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_920.sql
@@ -1,12 +1,21 @@
-DROP VIEW IF EXISTS pg_catalog.pg_publication_tables;
-CREATE VIEW pg_catalog.pg_publication_tables AS
-    SELECT
-        P.pubname AS pubname,
-        N.nspname AS schemaname,
-        C.relname AS tablename
-    FROM pg_publication P, pg_class C
-         JOIN pg_namespace N ON (N.oid = C.relnamespace)
-    WHERE C.oid IN (SELECT relid FROM pg_catalog.pg_get_publication_tables(P.pubname));
+do $$DECLARE ans boolean;
+BEGIN
+    for ans in select case when count(*) = 1 then true else false end as ans from (select relname from pg_class where relname = 'pg_publication_tables' and relkind = 'v')
+    LOOP
+        if ans = true then -- base version is after 92-507, create older view
+            DROP VIEW IF EXISTS pg_catalog.pg_publication_tables;
+            CREATE VIEW pg_catalog.pg_publication_tables AS
+                SELECT
+                    P.pubname AS pubname,
+                    N.nspname AS schemaname,
+                    C.relname AS tablename
+                FROM pg_publication P, pg_class C
+                    JOIN pg_namespace N ON (N.oid = C.relnamespace)
+                WHERE C.oid IN (SELECT relid FROM pg_catalog.pg_get_publication_tables(P.pubname));
+        end if;
+        exit;
+    END LOOP;
+END$$;
 
 -- drop reform info functions
 DROP FUNCTION IF EXISTS pg_catalog.query_node_reform_info_from_dms() CASCADE;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_420.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_420.sql
index 04eb184fc..f906df238 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_420.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_420.sql
@@ -1402,7 +1402,7 @@ CREATE FUNCTION pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN typ
 
 DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE;
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 6323;
-CREATE FUNCTION pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text, OUT encrypt_result_str text) RETURNS text  LANGUAGE INTERNAL  as 'gs_encrypt';UPDATE pg_catalog.pg_am set amcanunique = TRUE where amname = 'cbtree';
+CREATE FUNCTION pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text, OUT encrypt_result_str text) RETURNS text  LANGUAGE INTERNAL  as 'gs_encrypt';UPDATE pg_catalog.pg_am set amcanunique = TRUE, amhandler = 0 where amname = 'cbtree';
 CREATE OR REPLACE VIEW pg_catalog.gs_session_cpu_statistics AS
 SELECT
         S.datid AS datid,
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_420.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_420.sql
index 6bec8e58d..e2da80934 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_420.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_420.sql
@@ -1402,7 +1402,7 @@ CREATE FUNCTION pg_catalog.gs_decrypt(IN decryptstr text, IN keystr text, IN typ
 
 DROP FUNCTION IF EXISTS pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text,OUT decrypt_result_str text) CASCADE;
 SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 6323;
-CREATE FUNCTION pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text, OUT encrypt_result_str text) RETURNS text  LANGUAGE INTERNAL  as 'gs_encrypt';UPDATE pg_catalog.pg_am set amcanunique = TRUE where amname = 'cbtree';
+CREATE FUNCTION pg_catalog.gs_encrypt(IN encryptstr text, IN keystr text, IN type text, OUT encrypt_result_str text) RETURNS text  LANGUAGE INTERNAL  as 'gs_encrypt';UPDATE pg_catalog.pg_am set amcanunique = TRUE, amhandler = 0 where amname = 'cbtree';
 CREATE OR REPLACE VIEW pg_catalog.gs_session_cpu_statistics AS
 SELECT
         S.datid AS datid,