diff --git a/src/common/backend/parser/parse_collate.cpp b/src/common/backend/parser/parse_collate.cpp
index 084226c21..4239e28c9 100644
--- a/src/common/backend/parser/parse_collate.cpp
+++ b/src/common/backend/parser/parse_collate.cpp
@@ -482,7 +482,7 @@ static bool assign_collations_walker(Node* node, assign_collations_context* cont
                 derivation,
                 typcollation,
                 (typcollation == DEFAULT_COLLATION_OID) ? true : false,
-                exprLocation(node),
+                node,
                 loccontext);
 
             /*
@@ -710,7 +710,7 @@ static bool assign_collations_walker(Node* node, assign_collations_context* cont
                 derivation,
                 typcollation,
                 (loccontext.strength > COLLATE_NONE) ? true : false,
-                exprLocation(node),
+                node,
                 loccontext);
             /*
              * Save the result collation into the expression node. If the
diff --git a/src/common/backend/utils/misc/guc/guc_sql.cpp b/src/common/backend/utils/misc/guc/guc_sql.cpp
index 29ffc7f40..349f54992 100755
--- a/src/common/backend/utils/misc/guc/guc_sql.cpp
+++ b/src/common/backend/utils/misc/guc/guc_sql.cpp
@@ -347,7 +347,7 @@ static const struct b_format_behavior_compat_entry b_format_behavior_compat_opti
     {"enable_set_variables", B_FORMAT_OPT_ENABLE_SET_VARIABLES},
     {"enable_modify_column", B_FORMAT_OPT_ENABLE_MODIFY_COLUMN},
     {"default_collation", B_FORMAT_OPT_DEFAULT_COLLATION},
-    {"fetch", B_FORMAT_OPT_FETCH}
+    {"fetch", B_FORMAT_OPT_FETCH},
     {"enable_multi_charset", B_FORMAT_OPT_ENABLE_MULTI_CHARSET}
 };
 
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_903.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_856.sql
similarity index 100%
rename from src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_903.sql
rename to src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_856.sql
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_903.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_856.sql
similarity index 100%
rename from src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_903.sql
rename to src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_856.sql
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_903.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_856.sql
similarity index 100%
rename from src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_903.sql
rename to src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_856.sql
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_903.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_856.sql
similarity index 100%
rename from src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_903.sql
rename to src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_856.sql