diff --git a/.github/workflows/pg16-merge-validation.yml b/.github/workflows/pg16-merge-validation.yml
index c2f093f3de4..080a124574c 100644
--- a/.github/workflows/pg16-merge-validation.yml
+++ b/.github/workflows/pg16-merge-validation.yml
@@ -111,12 +111,8 @@ jobs:
           # Uncomment and add tests as features become available
           ALL_TESTS='{
             "include": [
-              {"test":"ic-small-opt-off",
-                "make_configs":["src/test/regress:installcheck-small"],
-                "pg_settings":{"optimizer":"off"}
-              },
-              {"test":"ic-greenplum-schedule",
-                "make_configs":["src/test/regress:installcheck-cbdb"],
+              {"test":"ic-good-opt-off",
+                "make_configs":["src/test/regress:installcheck-good"],
                 "pg_settings":{"optimizer":"off"}
               },
               {"test":"ic-isolation2-basic",
@@ -298,7 +294,7 @@ jobs:
             echo "- Install Prefix: ${INSTALL_PREFIX}"
             echo "- Port: 5432"
             echo "- Debug: Enabled (O0, g3, cassert)"
-            echo "- Disabled Features: ORCA, GPCloud, GPFdist, zstd"
+            echo "- Disabled Features: GPCloud"
           } >> "$GITHUB_STEP_SUMMARY"
 
       - name: Prepare Installation Directory
@@ -344,8 +340,8 @@ jobs:
             echo "  --enable-cassert"
             echo "  --enable-debug-extensions"
             echo "  --with-perl --with-python --with-libxml --with-openssl"
-            echo "  --without-zstd"
-            echo "  --disable-gpcloud --disable-orca --disable-gpfdist"
+            echo "  --with-zstd"
+            echo "  --disable-gpcloud"
             echo "  --with-pythonsrc-ext"
             echo "  --with-gssapi"
             echo ""
@@ -353,7 +349,7 @@ jobs:
             # Run configure as gpadmin
             if ! su - gpadmin -c "
               cd ${SRC_DIR}
-              export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:\${LD_LIBRARY_PATH}
+              export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}
               CFLAGS='-O0 -g3' ./configure \
                 --prefix=${INSTALL_PREFIX} \
                 --with-pgport=5432 \
@@ -362,14 +358,14 @@ jobs:
                 --with-python \
                 --with-libxml \
                 --with-openssl \
-                --without-zstd \
+                --with-zstd \
                 --enable-debug-extensions \
                 --disable-gpcloud \
-                --disable-orca \
-                --disable-gpfdist \
                 --with-pythonsrc-ext \
                 --with-gssapi \
-                --without-icu
+                --without-icu \
+                --with-libraries=${INSTALL_PREFIX}/lib \
+                --with-includes=/usr/local/xerces-c/include
             "; then
               echo "::error::Configure failed"
               exit 1
@@ -392,9 +388,9 @@ jobs:
             # Build and install as gpadmin (non-parallel to avoid issues)
             if ! time su - gpadmin -c "
               cd ${SRC_DIR}
-              export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:\${LD_LIBRARY_PATH}
-              make
-              make install
+              export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}
+              make -j$(nproc)
+              make -j$(nproc) install
             "; then
               echo "::error::Build and installation failed"
               exit 1
@@ -628,7 +624,7 @@ jobs:
           # We don't need to build, just configure
           su - gpadmin -c "
             cd ${SRC_DIR}
-            export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:\${LD_LIBRARY_PATH}
+            export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:${LD_LIBRARY_PATH}
             CFLAGS='-O0 -g3' ./configure \
               --prefix=${INSTALL_PREFIX} \
               --with-pgport=5432 \
@@ -637,14 +633,14 @@ jobs:
               --with-python \
               --with-libxml \
               --with-openssl \
-              --without-zstd \
+              --with-zstd \
               --enable-debug-extensions \
               --disable-gpcloud \
-              --disable-orca \
-              --disable-gpfdist \
               --with-pythonsrc-ext \
               --with-gssapi \
-              --without-icu 
+              --without-icu \
+              --with-libraries=${INSTALL_PREFIX}/lib \
+              --with-includes=/usr/local/xerces-c/include
           " 2>&1 | tee -a ${LOGS_DIR}/details/configure.log
 
       - name: Create gpdemo Cluster
diff --git a/src/test/regress/expected/autostats.out b/src/test/regress/expected/autostats.out
index 2705b8e70cd..0e12b10487e 100644
--- a/src/test/regress/expected/autostats.out
+++ b/src/test/regress/expected/autostats.out
@@ -45,8 +45,8 @@ set role=autostats_nonowner;
 LOG:  statement: set role=autostats_nonowner;
 insert into autostats_test select generate_series(1, 10);
 LOG:  statement: insert into autostats_test select generate_series(1, 10);
-LOG:  An exception was encountered during the execution of statement: insert into autostats_test select generate_series(1, 10);
 ERROR:  permission denied for table autostats_test
+LOG:  An exception was encountered during the execution of statement: insert into autostats_test select generate_series(1, 10);
 select relname, reltuples from pg_class where relname='autostats_test';
 LOG:  statement: select relname, reltuples from pg_class where relname='autostats_test';
     relname     | reltuples 
diff --git a/src/test/regress/expected/explain.out b/src/test/regress/expected/explain.out
index 078bf02c12b..eecddd6e407 100644
--- a/src/test/regress/expected/explain.out
+++ b/src/test/regress/expected/explain.out
@@ -759,6 +759,7 @@ select jsonb_pretty(
          "Settings": {                                      +
              "jit": "off",                                  +
              "Optimizer": "Postgres query optimizer",       +
+             "optimizer": "off",                            +
              "enable_parallel": "off",                      +
              "parallel_setup_cost": "0",                    +
              "parallel_tuple_cost": "0",                    +
diff --git a/src/test/regress/expected/external_table.out b/src/test/regress/expected/external_table.out
index 38fbb3458de..8b98e2e65cc 100644
--- a/src/test/regress/expected/external_table.out
+++ b/src/test/regress/expected/external_table.out
@@ -323,9 +323,9 @@ create external table badt1 (x text)
 location (:'badt1_file' )
 format 'text' (delimiter '|');
 select * from badt1;
-NOTICE:  gfile stat /home/gpadmin/cloudberry/src/test/regress/data/no/such/place/badt1.tbl failure: No such file or directory  (seg0 slice1 127.0.1.1:7002 pid=26072)
-NOTICE:  fstream unable to open file /home/gpadmin/cloudberry/src/test/regress/data/no/such/place/badt1.tbl  (seg0 slice1 127.0.1.1:7002 pid=26072)
-ERROR:  could not open file "/home/gpadmin/cloudberry/src/test/regress/data/no/such/place/badt1.tbl": 404 file not found  (seg0 slice1 127.0.1.1:7002 pid=26072)
+NOTICE:  gfile stat /ABSPATH/src/test/regress/data/no/such/place/badt1.tbl failure: No such file or directory  (seg0 slice1 127.0.1.1:7002 pid=26072)
+NOTICE:  fstream unable to open file /ABSPATH/src/test/regress/data/no/such/place/badt1.tbl  (seg0 slice1 127.0.1.1:7002 pid=26072)
+ERROR:  could not open file "/ABSPATH/src/test/regress/data/no/such/place/badt1.tbl": 404 file not found  (seg0 slice1 127.0.1.1:7002 pid=26072)
 drop external table badt1;
 --
 -- try a bad protocol
@@ -818,7 +818,7 @@ LOG ERRORS SEGMENT REJECT LIMIT 2;
 SELECT * FROM exttab_basic_3;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26072)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_basic_3, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_basic_3, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- Error log should be populated
 select count(*) > 0 from gp_read_error_log('exttab_basic_3');
  ?column? 
@@ -850,7 +850,7 @@ LOG ERRORS SEGMENT REJECT LIMIT 5;
 INSERT INTO exttab_insert_1 select * from exttab_basic_5;
 ERROR:  segment reject limit reached, aborting operation  (seg0 127.0.1.1:7002 pid=26072)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_basic_5, line 18 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_basic_5, line 18 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT * from exttab_insert_1 order by i;
  i  |     j     
 ----+-----------
@@ -921,7 +921,7 @@ NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'i'
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26167)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_basic_7, line 18 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_basic_7, line 18 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- Table should not exist
 SELECT * from exttab_ctas_2 order by i;
 ERROR:  relation "exttab_ctas_2" does not exist
@@ -1011,7 +1011,7 @@ WHERE e1.i = e2.i ORDER BY e1.i
 SELECT * FROM cte1 ORDER BY cte1.i;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice2 127.0.1.1:7002 pid=26190)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_cte_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_cte_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 select count(*) from gp_read_error_log('exttab_cte_2');
  count 
 -------
@@ -1022,8 +1022,8 @@ select count(*) from gp_read_error_log('exttab_cte_2');
 select gp_read_error_log('exttab_cte_2');
                                                                                                                                         gp_read_error_log                                                                                                                                        
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- ("Fri Jan 02 07:40:32.618206 2026 PST",exttab_cte_2,"file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data [/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data]",5,,"invalid input syntax for type integer: ""error_1"", column i",error_1,)
- ("Fri Jan 02 07:40:32.618206 2026 PST",exttab_cte_2,"file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data [/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data]",7,,"invalid input syntax for type integer: ""error_1"", column i",error_1,)
+ ("Fri Jan 02 07:40:32.618206 2026 PST",exttab_cte_2,"file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data [/ABSPATH/src/test/regress/data/exttab_more_errors.data]",5,,"invalid input syntax for type integer: ""error_1"", column i",error_1,)
+ ("Fri Jan 02 07:40:32.618206 2026 PST",exttab_cte_2,"file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data [/ABSPATH/src/test/regress/data/exttab_more_errors.data]",7,,"invalid input syntax for type integer: ""error_1"", column i",error_1,)
 (2 rows)
 
 -- end_ignore
@@ -1075,7 +1075,7 @@ NOTICE:  found 2 data formatting errors (2 or more input rows), rejected related
 SELECT COUNT(*) FROM exttab_permissions_2;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26072)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_permissions_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_permissions_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- Only superuser can do gp_truncate_error_log('*.*')
 DROP ROLE IF EXISTS exttab_non_superuser;
 NOTICE:  role "exttab_non_superuser" does not exist, skipping
@@ -1290,7 +1290,7 @@ SELECT sum(distinct e1.i), sum(distinct e2.i), e1.j FROM
 group by e1.j;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice3 127.0.1.1:7002 pid=26262)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_subq_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_subq_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_subq_1')
@@ -1321,7 +1321,7 @@ group by e1.j
 HAVING sum(distinct e1.i) > (SELECT max(i) FROM exttab_subq_2);
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice5 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_subq_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_subq_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_subq_1')
@@ -1418,7 +1418,7 @@ FROM exttab_subq_2 e1, exttab_subq_1 e2
 WHERE e1.i = e2.i;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_subq_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_subq_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- CSQ
 SELECT gp_truncate_error_log('exttab_subq_1');
  gp_truncate_error_log 
@@ -1438,7 +1438,7 @@ WHERE e1.j = e2.j and
 e1.i + 1 IN ( SELECT i from exttab_subq_2 WHERE i <= e1.i);
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice3 127.0.1.1:7002 pid=26262)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_subq_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_subq_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_subq_1')
@@ -1467,7 +1467,7 @@ FROM exttab_subq_2 e1, exttab_subq_1 e2
 WHERE e1.i = e2.i;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_subq_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_subq_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_subq_1')
@@ -1597,7 +1597,7 @@ SELECT e1.i, e2.j FROM
 WHERE e1.i = e2.i;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_subtxs_2, line 7 of file://gpadmin:/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_subtxs_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 COMMIT;
 -- Error logs should not have been rolled back.
 -- Check that number of errors is greater than 12 instead of checking for
@@ -1734,7 +1734,7 @@ SELECT e1.i, e2.j FROM
 WHERE e1.i = e2.i;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_txs_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_txs_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 COMMIT;
 -- Additional error rows should have been inserted into the error logs even if the tx is aborted.
 -- Truncate of error logs should not be rolled back even if the transaction is aborted. All operation on error logs are persisted.
@@ -1806,7 +1806,7 @@ SELECT e1.i, e2.j FROM
 WHERE e1.i = e2.i order by e1.i;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice2 127.0.1.1:7002 pid=26343)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_txs_3, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_txs_3, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 COMMIT;
 -- Error logs should not exist for these tables that would have been rolled back
 SELECT count(*) FROM gp_read_error_log('exttab_txs_3');
@@ -1855,7 +1855,7 @@ LANGUAGE plpgsql volatile;
 SELECT * FROM exttab_udfs_func1();
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice3 127.0.1.1:7002 pid=26362)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_udfs_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_udfs_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SQL statement "SELECT sum(distinct e1.i) as sum_i, sum(distinct e2.i) as sum_j, e1.j as j FROM
 	   (SELECT i, j FROM exttab_udfs_1 WHERE i < 5 ) e1,
 	   (SELECT i, j FROM exttab_udfs_2 WHERE i < 10) e2
@@ -1895,7 +1895,7 @@ SELECT gp_truncate_error_log('exttab_udfs_2');
 INSERT INTO exttab_udfs_insert_1 SELECT * FROM exttab_udfs_func1();
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice3 127.0.1.1:7002 pid=26389)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_udfs_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_udfs_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SQL statement "SELECT sum(distinct e1.i) as sum_i, sum(distinct e2.i) as sum_j, e1.j as j FROM
 	   (SELECT i, j FROM exttab_udfs_1 WHERE i < 5 ) e1,
 	   (SELECT i, j FROM exttab_udfs_2 WHERE i < 10) e2
@@ -1981,7 +1981,7 @@ SELECT * FROM exttab_udfs_func2();
 NOTICE:  found 2 data formatting errors (2 or more input rows), rejected related input data
 ERROR:  segment reject limit reached, aborting operation  (seg0 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_udfs_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_udfs_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_udfs_1')
@@ -2009,7 +2009,7 @@ SELECT exttab_udfs_func2();
 NOTICE:  found 2 data formatting errors (2 or more input rows), rejected related input data
 ERROR:  segment reject limit reached, aborting operation  (seg0 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_udfs_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_udfs_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_udfs_1')
@@ -2037,7 +2037,7 @@ INSERT INTO exttab_udfs_insert_1 SELECT * FROM exttab_udfs_func2();
 NOTICE:  found 2 data formatting errors (2 or more input rows), rejected related input data
 ERROR:  segment reject limit reached, aborting operation  (seg0 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_udfs_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_udfs_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_udfs_1')
@@ -2067,7 +2067,7 @@ HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur
 NOTICE:  found 2 data formatting errors (2 or more input rows), rejected related input data
 ERROR:  segment reject limit reached, aborting operation  (seg0 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_udfs_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_udfs_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_udfs_1')
@@ -2108,7 +2108,7 @@ SELECT * FROM exttab_union_2
 order by FOO.i;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice2 127.0.1.1:7002 pid=26423)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_union_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_union_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- Error table count
 select count(*) > 0 from
 (
@@ -2144,7 +2144,7 @@ UNION ALL
 SELECT e1.i, e2.j from exttab_union_2 e1 INNER JOIN exttab_union_2 e2 ON e1.i = e2.i;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice2 127.0.1.1:7002 pid=26444)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_union_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_union_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- should return 0 rows
 SELECT * from exttab_union_insert_1;
  i | j 
@@ -2231,7 +2231,7 @@ SELECT gp_truncate_error_log('exttab_views_2');
 SELECT * FROM exttab_views_3;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice3 127.0.1.1:7002 pid=26462)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_views_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_views_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- Error table should be populated
 SELECT count(*) > 0 FROM
 (
@@ -2266,7 +2266,7 @@ SELECT gp_truncate_error_log('exttab_views_2');
 INSERT INTO exttab_views_insert_1 SELECT * FROM exttab_views_3;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice3 127.0.1.1:7002 pid=26496)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_views_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_views_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- should not have any rows
 SELECT * FROM exttab_views_insert_1;
  i | j | k 
@@ -2306,7 +2306,7 @@ NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'j'
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice2 127.0.1.1:7002 pid=26490)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_views_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_views_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT * FROM exttab_views_ctas_1;
 ERROR:  relation "exttab_views_ctas_1" does not exist
 LINE 1: SELECT * FROM exttab_views_ctas_1;
@@ -2344,7 +2344,7 @@ NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'j'
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice2 127.0.1.1:7002 pid=26490)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_views_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_views_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 -- Relation should not exist
 SELECT * FROM exttab_views_ctas_1;
 ERROR:  relation "exttab_views_ctas_1" does not exist
@@ -2459,7 +2459,7 @@ ORDER BY c1.i
 limit 5;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice9 127.0.1.1:7002 pid=26587)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_windows_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_windows_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT COUNT(*) > 0
 FROM
 (
@@ -2494,7 +2494,7 @@ WHERE e1.i = e2.i LIMIT 5
 SELECT * FROM cte1, exttab_limit_2 e3 where cte1.i = e3.i ORDER BY cte1.i LIMIT 3;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_limit_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_limit_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT count(*) FROM gp_read_error_log('exttab_limit_2');
  count 
 -------
@@ -2570,7 +2570,7 @@ WHERE e1.i = e2.i LIMIT 3
 SELECT * FROM cte1, exttab_limit_2 e3 where cte1.i = e3.i ORDER BY cte1.i LIMIT 5;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_limit_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_limit_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT count(*) > 0 FROM gp_read_error_log('exttab_limit_2');
  ?column? 
 ----------
@@ -2645,7 +2645,7 @@ SELECT gp_truncate_error_log('exttab_limit_2');
 SELECT * FROM exttab_limit_1 e1, exttab_limit_2 e2 where e1.i = e2.i LIMIT 3;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice3 127.0.1.1:7002 pid=26670)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_1", column i
-CONTEXT:  External table exttab_limit_2, line 7 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_more_errors.data, column i
+CONTEXT:  External table exttab_limit_2, line 7 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_more_errors.data, column i
 SELECT count(*) > 0 FROM
 (
 SELECT * FROM gp_read_error_log('exttab_limit_1')
@@ -2678,7 +2678,7 @@ LOG ERRORS SEGMENT REJECT LIMIT 20000;
 SELECT COUNT(*) FROM exttab_first_reject_limit_1;
 ERROR:  all 1000 first rows in this segment were rejected  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Aborting operation regardless of REJECT LIMIT value, last error was: invalid input syntax for type integer: "error_0", column i
-CONTEXT:  External table exttab_first_reject_limit_1, line 1000 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_first_errors.data, column i
+CONTEXT:  External table exttab_first_reject_limit_1, line 1000 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_first_errors.data, column i
 SELECT COUNT(*) > 0 FROM gp_read_error_log('exttab_first_reject_limit_1');
  ?column? 
 ----------
@@ -2717,7 +2717,7 @@ SET gp_initial_bad_row_limit = 2;
 SELECT COUNT(*) FROM exttab_first_reject_limit_2;
 ERROR:  all 2 first rows in this segment were rejected  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Aborting operation regardless of REJECT LIMIT value, last error was: invalid input syntax for type integer: "error_0", column i
-CONTEXT:  External table exttab_first_reject_limit_2, line 2 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_first_errors.data, column i
+CONTEXT:  External table exttab_first_reject_limit_2, line 2 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_first_errors.data, column i
 SELECT COUNT(*) > 0 from gp_read_error_log('exttab_first_reject_limit_2');
  ?column? 
 ----------
@@ -2735,7 +2735,7 @@ SELECT gp_truncate_error_log('exttab_first_reject_limit_2');
 SELECT COUNT(*) FROM exttab_first_reject_limit_2;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_0", column i
-CONTEXT:  External table exttab_first_reject_limit_2, line 500 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_first_errors.data, column i
+CONTEXT:  External table exttab_first_reject_limit_2, line 500 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_first_errors.data, column i
 SELECT COUNT(*) > 0 from gp_read_error_log('exttab_first_reject_limit_2');
  ?column? 
 ----------
@@ -2753,7 +2753,7 @@ SELECT gp_truncate_error_log('exttab_first_reject_limit_2');
 SELECT COUNT(*) FROM exttab_first_reject_limit_2;
 ERROR:  segment reject limit reached, aborting operation  (seg0 slice1 127.0.1.1:7002 pid=26235)
 DETAIL:  Last error was: invalid input syntax for type integer: "error_0", column i
-CONTEXT:  External table exttab_first_reject_limit_2, line 500 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_first_errors.data, column i
+CONTEXT:  External table exttab_first_reject_limit_2, line 500 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_first_errors.data, column i
 SELECT COUNT(*) > 0 from gp_read_error_log('exttab_first_reject_limit_2');
  ?column? 
 ----------
@@ -2822,7 +2822,7 @@ OPTIONS (hello 'world', bonjour 'again', nihao 'again and again' );
 --------+---------+-----------+----------+---------+-------------
  i      | integer |           |          |         | 
  j      | text    |           |          |         | 
-FDW options: (format 'text', delimiter '|', "null" E'\\N', escape E'\\', hello 'world', bonjour 'again', nihao 'again and again', format_type 't', location_uris 'file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_few_errors.data', execute_on 'ALL_SEGMENTS', log_errors 'f', encoding '6', is_writable 'false')
+FDW options: (format 'text', delimiter '|', "null" E'\\N', escape E'\\', hello 'world', bonjour 'again', nihao 'again and again', format_type 't', location_uris 'file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_few_errors.data', execute_on 'ALL_SEGMENTS', log_errors 'f', encoding '6', is_writable 'false')
 
 \d exttab_with_option_empty
          Foreign table "public.exttab_with_option_empty"
@@ -2830,7 +2830,7 @@ FDW options: (format 'text', delimiter '|', "null" E'\\N', escape E'\\', hello '
 --------+---------+-----------+----------+---------+-------------
  i      | integer |           |          |         | 
  j      | text    |           |          |         | 
-FDW options: (format 'text', delimiter '|', "null" E'\\N', escape E'\\', format_type 't', location_uris 'file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab_few_errors.data', execute_on 'ALL_SEGMENTS', log_errors 'f', encoding '6', is_writable 'false')
+FDW options: (format 'text', delimiter '|', "null" E'\\N', escape E'\\', format_type 't', location_uris 'file://HOSTNAME/ABSPATH/src/test/regress/data/exttab_few_errors.data', execute_on 'ALL_SEGMENTS', log_errors 'f', encoding '6', is_writable 'false')
 
 DROP EXTERNAL TABLE IF EXISTS exttab_with_option_empty;
 DROP EXTERNAL TABLE IF EXISTS exttab_with_option_1;
@@ -2998,7 +2998,7 @@ LANGUAGE plpgSQL READS SQL DATA;
 SET gp_log_gang TO DEBUG;
 SELECT * FROM exttab_error_context_callback_func();
 ERROR:  invalid input syntax for type integer: "1|1_number"  (seg0 slice1 127.0.1.1:7002 pid=26824)
-CONTEXT:  External table exttab_error_context_callback, line 1 of file://gpadmin/home/gpadmin/cloudberry/src/test/regress/data/exttab.data, column c1
+CONTEXT:  External table exttab_error_context_callback, line 1 of file://HOSTNAME/ABSPATH/src/test/regress/data/exttab.data, column c1
 PL/pgSQL function exttab_error_context_callback_func() line 5 at FOR over SELECT rows
 SET gp_log_gang TO DEFAULT;
 DROP FUNCTION exttab_error_context_callback_func();
diff --git a/src/test/regress/expected/gp_tablespace.out b/src/test/regress/expected/gp_tablespace.out
index 0f4267bbed9..e2545c6592c 100644
--- a/src/test/regress/expected/gp_tablespace.out
+++ b/src/test/regress/expected/gp_tablespace.out
@@ -416,28 +416,28 @@ SELECT force_mirrors_to_catch_up();
 (1 row)
 
 \! ls $PG_ABS_SRCDIR/testtablespace_existing_version_dir/*
-/home/gpadmin/cloudberry/src/test/regress/testtablespace_existing_version_dir/1:
+/ABSPATH/testtablespace_existing_version_dir/1:
 GPDB_99_399999991
 
-/home/gpadmin/cloudberry/src/test/regress/testtablespace_existing_version_dir/2:
+/ABSPATH/testtablespace_existing_version_dir/2:
 GPDB_99_399999991
 
-/home/gpadmin/cloudberry/src/test/regress/testtablespace_existing_version_dir/3:
+/ABSPATH/testtablespace_existing_version_dir/3:
 GPDB_99_399999991
 
-/home/gpadmin/cloudberry/src/test/regress/testtablespace_existing_version_dir/4:
+/ABSPATH/testtablespace_existing_version_dir/4:
 GPDB_99_399999991
 
-/home/gpadmin/cloudberry/src/test/regress/testtablespace_existing_version_dir/5:
+/ABSPATH/testtablespace_existing_version_dir/5:
 GPDB_99_399999991
 
-/home/gpadmin/cloudberry/src/test/regress/testtablespace_existing_version_dir/6:
+/ABSPATH/testtablespace_existing_version_dir/6:
 GPDB_99_399999991
 
-/home/gpadmin/cloudberry/src/test/regress/testtablespace_existing_version_dir/7:
+/ABSPATH/testtablespace_existing_version_dir/7:
 GPDB_99_399999991
 
-/home/gpadmin/cloudberry/src/test/regress/testtablespace_existing_version_dir/8:
+/ABSPATH/testtablespace_existing_version_dir/8:
 GPDB_99_399999991
 -- Test alter tablespace: PG does not seem to test these.    
 -- test SET & OWNER
diff --git a/src/test/regress/expected/profile.out b/src/test/regress/expected/profile.out
index 256d41024db..9c2c203602b 100644
--- a/src/test/regress/expected/profile.out
+++ b/src/test/regress/expected/profile.out
@@ -5,7 +5,7 @@
 SELECT COUNT(*) FROM pg_stat_activity;
  count 
 -------
-    10
+     9
 (1 row)
 
 -- Display pg_authid, pg_roles, pg_profile and pg_password_history catalog
diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out
index 55b836f029c..b0e53f2141b 100644
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -413,7 +413,7 @@ INSERT INTO drop_stats_test_xact DEFAULT VALUES;
 SELECT n_tup_ins FROM gp_stat_xact_all_tables_summary where relid = :drop_stats_test_xact_oid;
  n_tup_ins 
 -----------
-         1
+         2
 (1 row)
 
 DROP TABLE drop_stats_test_xact;
@@ -459,7 +459,7 @@ INSERT INTO drop_stats_test_xact DEFAULT VALUES;
 SELECT n_tup_ins FROM gp_stat_xact_all_tables_summary where relid = :drop_stats_test_xact_oid;
  n_tup_ins 
 -----------
-         1
+         2
 (1 row)
 
 DROP TABLE drop_stats_test_xact;
@@ -499,7 +499,7 @@ INSERT INTO drop_stats_test_subxact DEFAULT VALUES;
 SELECT n_tup_ins FROM gp_stat_xact_all_tables_summary where relid = :drop_stats_test_subxact_oid;
  n_tup_ins 
 -----------
-         2
+         4
 (1 row)
 
 SAVEPOINT sp2;
@@ -508,7 +508,7 @@ ROLLBACK TO SAVEPOINT sp2;
 SELECT n_tup_ins FROM gp_stat_xact_all_tables_summary where relid = :drop_stats_test_subxact_oid;
  n_tup_ins 
 -----------
-         2
+         4
 (1 row)
 
 COMMIT;
diff --git a/src/test/regress/input/uao_dml/uao_dml.source b/src/test/regress/input/uao_dml/uao_dml.source
index b51faff222d..e13a17c2b20 100644
--- a/src/test/regress/input/uao_dml/uao_dml.source
+++ b/src/test/regress/input/uao_dml/uao_dml.source
@@ -70,11 +70,11 @@ select reltuples from pg_class where relname = 'ao2_@amname@';
 select count(*)  from ao2_@amname@;
 delete from ao2_@amname@ where i < 27;
 -- make sure the pgstat msg sends out at least PGSTAT_STAT_INTERVAL msec since last one
-select pg_sleep(0.6);
+SELECT gp_stat_force_next_flush();
 analyze ao2_@amname@;
 select count(*)  from ao2_@amname@;
 -- make sure the pgstat msg sends out at least PGSTAT_STAT_INTERVAL msec since last one
-select pg_sleep(0.6);
+SELECT gp_stat_force_next_flush();
 select pg_stat_get_live_tuples(c.oid) as livetuples, pg_stat_get_dead_tuples(c.oid) as deadtuples 
 from pg_class c 
 where relname = 'ao2_@amname@';
diff --git a/src/test/regress/output/uao_dml/uao_dml.source b/src/test/regress/output/uao_dml/uao_dml.source
index 49963db03e7..db6c4ec0200 100644
--- a/src/test/regress/output/uao_dml/uao_dml.source
+++ b/src/test/regress/output/uao_dml/uao_dml.source
@@ -147,9 +147,9 @@ select count(*)  from ao2_@amname@;
 
 delete from ao2_@amname@ where i < 27;
 -- make sure the pgstat msg sends out at least PGSTAT_STAT_INTERVAL msec since last one
-select pg_sleep(0.6);
- pg_sleep 
-----------
+SELECT gp_stat_force_next_flush();
+ gp_stat_force_next_flush 
+--------------------------
  
 (1 row)
 
@@ -161,9 +161,9 @@ select count(*)  from ao2_@amname@;
 (1 row)
 
 -- make sure the pgstat msg sends out at least PGSTAT_STAT_INTERVAL msec since last one
-select pg_sleep(0.6);
- pg_sleep 
-----------
+SELECT gp_stat_force_next_flush();
+ gp_stat_force_next_flush 
+--------------------------
  
 (1 row)
 
diff --git a/src/test/regress/sql/external_table.sql b/src/test/regress/sql/external_table.sql
index b8054a085d4..4a86d944626 100644
--- a/src/test/regress/sql/external_table.sql
+++ b/src/test/regress/sql/external_table.sql
@@ -23,6 +23,14 @@
 -- m/DETAIL:  Found \d+ URLs and \d+ primary segments./
 -- s/Found.+//
 --
+-- # normalize absolute source paths across environments
+-- m|/.+/src/test/regress/|
+-- s|/.+/src/test/regress/|/ABSPATH/src/test/regress/|
+--
+-- # normalize file:// URIs with hostname and absolute path
+-- m|file://\w+/.+/src/test/regress/|
+-- s|file://\w+/.+/src/test/regress/|file://HOSTNAME/ABSPATH/src/test/regress/|
+--
 -- end_matchsubs
 \getenv abs_srcdir PG_ABS_SRCDIR
 \getenv hostname PG_HOSTNAME
diff --git a/src/test/regress/sql/gp_tablespace.sql b/src/test/regress/sql/gp_tablespace.sql
index 30ab9236949..fbfd411201e 100644
--- a/src/test/regress/sql/gp_tablespace.sql
+++ b/src/test/regress/sql/gp_tablespace.sql
@@ -1,3 +1,7 @@
+-- start_matchsubs
+-- m|/.*/testtablespace_existing_version_dir/|
+-- s|/.*/testtablespace_existing_version_dir/|/ABSPATH/testtablespace_existing_version_dir/|
+-- end_matchsubs
 -- start_matchignore
 -- m/WARNING:  tablespace symlink path is too long for TAR/
 -- m/DETAIL:  The symlinked path \".*\" will be truncated to 100 characters when sending a TAR to the utilities \(e.g. pg_basebackup\)/