diff --git a/src/test/regress/expected/multi_array_agg.out b/src/test/regress/expected/multi_array_agg.out
index 9a1d0b00c..b3fe1b307 100644
--- a/src/test/regress/expected/multi_array_agg.out
+++ b/src/test/regress/expected/multi_array_agg.out
@@ -96,10 +96,10 @@ SELECT l_quantity, count(*), avg(l_extendedprice), array_agg(l_orderkey) FROM li
 	GROUP BY l_quantity ORDER BY l_quantity;
  l_quantity | count |          avg          |                                            array_agg                                             
 ------------+-------+-----------------------+--------------------------------------------------------------------------------------------------
-       1.00 |    17 | 1477.1258823529411765 | {5543,5633,5634,5698,5766,5856,5857,5986,8997,9026,9158,9184,9220,9222,9348,9383,9476}
-       2.00 |    19 | 3078.4242105263157895 | {5506,5540,5573,5669,5703,5730,5798,5831,5893,5920,5923,9030,9058,9123,9124,9188,9344,9441,9476}
-       3.00 |    14 | 4714.0392857142857143 | {5509,5543,5605,5606,5827,9124,9157,9184,9223,9254,9349,9414,9475,9477}
-       4.00 |    19 | 5929.7136842105263158 | {5504,5507,5508,5511,5538,5764,5766,5826,5829,5862,5959,5985,9091,9120,9281,9347,9382,9440,9473}
+       1.00 |    17 | 1477.1258823529411765 | {8997,9026,9158,9184,9220,9222,9348,9383,9476,5543,5633,5634,5698,5766,5856,5857,5986}
+       2.00 |    19 | 3078.4242105263157895 | {9030,9058,9123,9124,9188,9344,9441,9476,5506,5540,5573,5669,5703,5730,5798,5831,5893,5920,5923}
+       3.00 |    14 | 4714.0392857142857143 | {9124,9157,9184,9223,9254,9349,9414,9475,9477,5509,5543,5605,5606,5827}
+       4.00 |    19 | 5929.7136842105263158 | {9091,9120,9281,9347,9382,9440,9473,5504,5507,5508,5511,5538,5764,5766,5826,5829,5862,5959,5985}
 (4 rows)
 
 SELECT l_quantity, array_agg(extract (month FROM o_orderdate)) AS my_month
@@ -107,10 +107,10 @@ SELECT l_quantity, array_agg(extract (month FROM o_orderdate)) AS my_month
 	AND l_orderkey > 5500 AND l_orderkey < 9500 GROUP BY l_quantity ORDER BY l_quantity;
  l_quantity |                    my_month                    
 ------------+------------------------------------------------
-       1.00 | {9,5,7,5,9,11,11,4,7,7,4,7,4,2,6,3,5}
-       2.00 | {11,10,8,5,5,12,3,11,7,11,5,7,6,6,10,1,12,6,5}
-       3.00 | {4,9,8,11,7,10,6,7,8,5,8,9,11,3}
-       4.00 | {1,5,6,11,12,10,9,6,1,2,5,1,11,6,2,8,2,6,10}
+       1.00 | {7,7,4,7,4,2,6,3,5,9,5,7,5,9,11,11,4}
+       2.00 | {7,6,6,10,1,12,6,5,11,10,8,5,5,12,3,11,7,11,5}
+       3.00 | {10,6,7,8,5,8,9,11,3,4,9,8,11,7}
+       4.00 | {11,6,2,8,2,6,10,1,5,6,11,12,10,9,6,1,2,5,1}
 (4 rows)
 
 SELECT l_quantity, array_agg(l_orderkey * 2 + 1) FROM lineitem WHERE l_quantity < 5
@@ -118,10 +118,10 @@ SELECT l_quantity, array_agg(l_orderkey * 2 + 1) FROM lineitem WHERE l_quantity
 	AND l_orderkey > 5500 AND l_orderkey < 9500 GROUP BY l_quantity ORDER BY l_quantity;
  l_quantity |                  array_agg                  
 ------------+---------------------------------------------
-       1.00 | {11269,11397,11713,11715,11973,18317,18445}
-       2.00 | {11847,18061,18247,18953}
+       1.00 | {18317,18445,11269,11397,11713,11715,11973}
+       2.00 | {18061,18247,18953,11847}
        3.00 | {18249,18315,18699,18951,18955}
-       4.00 | {11653,11659,18241,18765}
+       4.00 | {18241,18765,11653,11659}
 (4 rows)
 
 -- Check that we can execute array_agg() with an expression containing NULL values
diff --git a/src/test/regress/expected/multi_index_statements.out b/src/test/regress/expected/multi_index_statements.out
index 245e2870f..7461e6025 100644
--- a/src/test/regress/expected/multi_index_statements.out
+++ b/src/test/regress/expected/multi_index_statements.out
@@ -10,59 +10,59 @@ SET client_min_messages TO DEBUG2;
 --
 -- Verify that we can create different types of indexes
 CREATE INDEX lineitem_orderkey_index ON lineitem (l_orderkey);
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  building index "lineitem_orderkey_index" on table "lineitem"
 CREATE INDEX lineitem_partkey_desc_index ON lineitem (l_partkey DESC);
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  building index "lineitem_partkey_desc_index" on table "lineitem"
 CREATE INDEX lineitem_partial_index ON lineitem (l_shipdate)
 	WHERE l_shipdate < '1995-01-01';
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  building index "lineitem_partial_index" on table "lineitem"
 CREATE INDEX lineitem_orderkey_hash_index ON lineitem USING hash (l_partkey);
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  building index "lineitem_orderkey_hash_index" on table "lineitem"
@@ -88,15 +88,15 @@ ERROR:  specifying tablespaces with CREATE INDEX statements is currently unsuppo
 -- Verify that we error out in case of postgres errors on supported statement
 -- types.
 CREATE INDEX lineitem_orderkey_index ON lineitem (l_orderkey);
-WARNING:  could not receive query results from localhost:57637
+WARNING:  could not receive query results from localhost:57638
 DETAIL:  Client error: relation "lineitem_orderkey_index_102014" already exists
 ERROR:  could not execute DDL command on worker node shards
 CREATE INDEX try_index ON lineitem USING gist (l_orderkey);
-WARNING:  could not receive query results from localhost:57637
+WARNING:  could not receive query results from localhost:57638
 DETAIL:  Client error: data type bigint has no default operator class for access method "gist"
 ERROR:  could not execute DDL command on worker node shards
 CREATE INDEX try_index ON lineitem (non_existent_column);
-WARNING:  could not receive query results from localhost:57637
+WARNING:  could not receive query results from localhost:57638
 DETAIL:  Client error: column "non_existent_column" does not exist
 ERROR:  could not execute DDL command on worker node shards
 -- Verify that none of failed indexes got created on the master node
@@ -123,42 +123,42 @@ DROP INDEX CONCURRENTLY lineitem_orderkey_index;
 ERROR:  dropping indexes concurrently on distributed tables is currently unsupported
 -- Verify that we can succesfully drop indexes
 DROP INDEX lineitem_orderkey_index;
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DROP INDEX lineitem_partkey_desc_index;
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DROP INDEX lineitem_partial_index;
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 -- Verify that we handle if exists statements correctly
@@ -167,16 +167,16 @@ ERROR:  index "non_existent_index" does not exist
 DROP INDEX IF EXISTS non_existent_index;
 NOTICE:  index "non_existent_index" does not exist, skipping
 DROP INDEX IF EXISTS lineitem_orderkey_hash_index;
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DROP INDEX lineitem_orderkey_hash_index;
diff --git a/src/test/regress/expected/multi_index_statements_0.out b/src/test/regress/expected/multi_index_statements_0.out
index e7cc610e4..0df6d6470 100644
--- a/src/test/regress/expected/multi_index_statements_0.out
+++ b/src/test/regress/expected/multi_index_statements_0.out
@@ -10,59 +10,59 @@ SET client_min_messages TO DEBUG2;
 --
 -- Verify that we can create different types of indexes
 CREATE INDEX lineitem_orderkey_index ON lineitem (l_orderkey);
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  building index "lineitem_orderkey_index" on table "lineitem"
 CREATE INDEX lineitem_partkey_desc_index ON lineitem (l_partkey DESC);
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  building index "lineitem_partkey_desc_index" on table "lineitem"
 CREATE INDEX lineitem_partial_index ON lineitem (l_shipdate)
 	WHERE l_shipdate < '1995-01-01';
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  building index "lineitem_partial_index" on table "lineitem"
 CREATE INDEX lineitem_orderkey_hash_index ON lineitem USING hash (l_partkey);
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 WARNING:  hash indexes are not WAL-logged and their use is discouraged
@@ -89,15 +89,15 @@ ERROR:  specifying tablespaces with CREATE INDEX statements is currently unsuppo
 -- Verify that we error out in case of postgres errors on supported statement
 -- types.
 CREATE INDEX lineitem_orderkey_index ON lineitem (l_orderkey);
-WARNING:  could not receive query results from localhost:57637
+WARNING:  could not receive query results from localhost:57638
 DETAIL:  Client error: relation "lineitem_orderkey_index_102014" already exists
 ERROR:  could not execute DDL command on worker node shards
 CREATE INDEX try_index ON lineitem USING gist (l_orderkey);
-WARNING:  could not receive query results from localhost:57637
+WARNING:  could not receive query results from localhost:57638
 DETAIL:  Client error: data type bigint has no default operator class for access method "gist"
 ERROR:  could not execute DDL command on worker node shards
 CREATE INDEX try_index ON lineitem (non_existent_column);
-WARNING:  could not receive query results from localhost:57637
+WARNING:  could not receive query results from localhost:57638
 DETAIL:  Client error: column "non_existent_column" does not exist
 ERROR:  could not execute DDL command on worker node shards
 -- Verify that none of failed indexes got created on the master node
@@ -124,44 +124,44 @@ DROP INDEX CONCURRENTLY lineitem_orderkey_index;
 ERROR:  dropping indexes concurrently on distributed tables is currently unsupported
 -- Verify that we can succesfully drop indexes
 DROP INDEX lineitem_orderkey_index;
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  EventTriggerInvoke 16532
 DROP INDEX lineitem_partkey_desc_index;
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  EventTriggerInvoke 16532
 DROP INDEX lineitem_partial_index;
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  EventTriggerInvoke 16532
@@ -171,16 +171,16 @@ ERROR:  index "non_existent_index" does not exist
 DROP INDEX IF EXISTS non_existent_index;
 NOTICE:  index "non_existent_index" does not exist, skipping
 DROP INDEX IF EXISTS lineitem_orderkey_hash_index;
-DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102014 on node localhost:57638
+DEBUG:  applied command on shard 102014 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57637
 DEBUG:  applied command on shard 102013 on node localhost:57638
-DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102012 on node localhost:57638
+DEBUG:  applied command on shard 102012 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57637
 DEBUG:  applied command on shard 102011 on node localhost:57638
-DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102010 on node localhost:57638
+DEBUG:  applied command on shard 102010 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57637
 DEBUG:  applied command on shard 102009 on node localhost:57638
 DEBUG:  EventTriggerInvoke 16532
diff --git a/src/test/regress/expected/multi_large_table_join_planning.out b/src/test/regress/expected/multi_large_table_join_planning.out
index 3fbdf0b42..842f164cc 100644
--- a/src/test/regress/expected/multi_large_table_join_planning.out
+++ b/src/test/regress/expected/multi_large_table_join_planning.out
@@ -63,12 +63,12 @@ DEBUG:  generated sql query for job 1250 and task 15
 DETAIL:  query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_102010 lineitem JOIN orders_102015 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE (orders.o_totalprice > '10'::numeric)"
 DEBUG:  generated sql query for job 1250 and task 18
 DETAIL:  query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_102009 lineitem JOIN orders_102015 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE (orders.o_totalprice > '10'::numeric)"
-DEBUG:  assigned task 18 to node localhost:57637
-DEBUG:  assigned task 15 to node localhost:57638
-DEBUG:  assigned task 12 to node localhost:57637
-DEBUG:  assigned task 9 to node localhost:57638
-DEBUG:  assigned task 6 to node localhost:57637
-DEBUG:  assigned task 3 to node localhost:57638
+DEBUG:  assigned task 15 to node localhost:57637
+DEBUG:  assigned task 18 to node localhost:57638
+DEBUG:  assigned task 9 to node localhost:57637
+DEBUG:  assigned task 12 to node localhost:57638
+DEBUG:  assigned task 3 to node localhost:57637
+DEBUG:  assigned task 6 to node localhost:57638
 DEBUG:  join prunable for intervals [1,1000] and [6001,7000]
 DEBUG:  join prunable for intervals [6001,7000] and [1,1000]
 DEBUG:  generated sql query for job 1251 and task 3
@@ -99,9 +99,9 @@ DEBUG:  pruning merge fetch taskId 4
 DETAIL:  Creating dependency on merge taskId 10
 DEBUG:  pruning merge fetch taskId 7
 DETAIL:  Creating dependency on merge taskId 13
-DEBUG:  assigned task 3 to node localhost:57637
-DEBUG:  assigned task 9 to node localhost:57638
 DEBUG:  assigned task 6 to node localhost:57637
+DEBUG:  assigned task 3 to node localhost:57638
+DEBUG:  assigned task 9 to node localhost:57637
 DEBUG:  completed cleanup query for job 1252 on node "localhost:57638"
 DEBUG:  completed cleanup query for job 1252 on node "localhost:57637"
 DEBUG:  completed cleanup query for job 1251 on node "localhost:57638"
@@ -167,18 +167,18 @@ DEBUG:  generated sql query for job 1253 and task 10
 DETAIL:  query string: "SELECT l_partkey, l_suppkey FROM lineitem_102010 lineitem WHERE (l_quantity < 5.0)"
 DEBUG:  generated sql query for job 1253 and task 12
 DETAIL:  query string: "SELECT l_partkey, l_suppkey FROM lineitem_102009 lineitem WHERE (l_quantity < 5.0)"
-DEBUG:  assigned task 12 to node localhost:57637
-DEBUG:  assigned task 10 to node localhost:57638
-DEBUG:  assigned task 8 to node localhost:57637
-DEBUG:  assigned task 6 to node localhost:57638
-DEBUG:  assigned task 4 to node localhost:57637
-DEBUG:  assigned task 2 to node localhost:57638
+DEBUG:  assigned task 10 to node localhost:57637
+DEBUG:  assigned task 12 to node localhost:57638
+DEBUG:  assigned task 6 to node localhost:57637
+DEBUG:  assigned task 8 to node localhost:57638
+DEBUG:  assigned task 2 to node localhost:57637
+DEBUG:  assigned task 4 to node localhost:57638
 DEBUG:  generated sql query for job 1254 and task 2
 DETAIL:  query string: "SELECT o_orderkey, o_shippriority FROM orders_102016 orders WHERE (o_totalprice <> 4.0)"
 DEBUG:  generated sql query for job 1254 and task 4
 DETAIL:  query string: "SELECT o_orderkey, o_shippriority FROM orders_102015 orders WHERE (o_totalprice <> 4.0)"
-DEBUG:  assigned task 4 to node localhost:57637
-DEBUG:  assigned task 2 to node localhost:57638
+DEBUG:  assigned task 2 to node localhost:57637
+DEBUG:  assigned task 4 to node localhost:57638
 DEBUG:  join prunable for task partitionId 0 and 1
 DEBUG:  join prunable for task partitionId 0 and 2
 DEBUG:  join prunable for task partitionId 0 and 3
diff --git a/src/test/regress/expected/multi_large_table_join_planning_0.out b/src/test/regress/expected/multi_large_table_join_planning_0.out
index 4b08b7fe0..33700d111 100644
--- a/src/test/regress/expected/multi_large_table_join_planning_0.out
+++ b/src/test/regress/expected/multi_large_table_join_planning_0.out
@@ -63,12 +63,12 @@ DEBUG:  generated sql query for job 1250 and task 15
 DETAIL:  query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_102010 lineitem JOIN orders_102015 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE (orders.o_totalprice > 10::numeric)"
 DEBUG:  generated sql query for job 1250 and task 18
 DETAIL:  query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_102009 lineitem JOIN orders_102015 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE (orders.o_totalprice > 10::numeric)"
-DEBUG:  assigned task 18 to node localhost:57637
-DEBUG:  assigned task 15 to node localhost:57638
-DEBUG:  assigned task 12 to node localhost:57637
-DEBUG:  assigned task 9 to node localhost:57638
-DEBUG:  assigned task 6 to node localhost:57637
-DEBUG:  assigned task 3 to node localhost:57638
+DEBUG:  assigned task 15 to node localhost:57637
+DEBUG:  assigned task 18 to node localhost:57638
+DEBUG:  assigned task 9 to node localhost:57637
+DEBUG:  assigned task 12 to node localhost:57638
+DEBUG:  assigned task 3 to node localhost:57637
+DEBUG:  assigned task 6 to node localhost:57638
 DEBUG:  join prunable for intervals [1,1000] and [6001,7000]
 DEBUG:  join prunable for intervals [6001,7000] and [1,1000]
 DEBUG:  generated sql query for job 1251 and task 3
@@ -99,9 +99,9 @@ DEBUG:  pruning merge fetch taskId 4
 DETAIL:  Creating dependency on merge taskId 10
 DEBUG:  pruning merge fetch taskId 7
 DETAIL:  Creating dependency on merge taskId 13
-DEBUG:  assigned task 3 to node localhost:57637
-DEBUG:  assigned task 9 to node localhost:57638
 DEBUG:  assigned task 6 to node localhost:57637
+DEBUG:  assigned task 3 to node localhost:57638
+DEBUG:  assigned task 9 to node localhost:57637
 DEBUG:  completed cleanup query for job 1252 on node "localhost:57638"
 DEBUG:  completed cleanup query for job 1252 on node "localhost:57637"
 DEBUG:  completed cleanup query for job 1251 on node "localhost:57638"
@@ -167,18 +167,18 @@ DEBUG:  generated sql query for job 1253 and task 10
 DETAIL:  query string: "SELECT l_partkey, l_suppkey FROM lineitem_102010 lineitem WHERE (l_quantity < 5.0)"
 DEBUG:  generated sql query for job 1253 and task 12
 DETAIL:  query string: "SELECT l_partkey, l_suppkey FROM lineitem_102009 lineitem WHERE (l_quantity < 5.0)"
-DEBUG:  assigned task 12 to node localhost:57637
-DEBUG:  assigned task 10 to node localhost:57638
-DEBUG:  assigned task 8 to node localhost:57637
-DEBUG:  assigned task 6 to node localhost:57638
-DEBUG:  assigned task 4 to node localhost:57637
-DEBUG:  assigned task 2 to node localhost:57638
+DEBUG:  assigned task 10 to node localhost:57637
+DEBUG:  assigned task 12 to node localhost:57638
+DEBUG:  assigned task 6 to node localhost:57637
+DEBUG:  assigned task 8 to node localhost:57638
+DEBUG:  assigned task 2 to node localhost:57637
+DEBUG:  assigned task 4 to node localhost:57638
 DEBUG:  generated sql query for job 1254 and task 2
 DETAIL:  query string: "SELECT o_orderkey, o_shippriority FROM orders_102016 orders WHERE (o_totalprice <> 4.0)"
 DEBUG:  generated sql query for job 1254 and task 4
 DETAIL:  query string: "SELECT o_orderkey, o_shippriority FROM orders_102015 orders WHERE (o_totalprice <> 4.0)"
-DEBUG:  assigned task 4 to node localhost:57637
-DEBUG:  assigned task 2 to node localhost:57638
+DEBUG:  assigned task 2 to node localhost:57637
+DEBUG:  assigned task 4 to node localhost:57638
 DEBUG:  join prunable for task partitionId 0 and 1
 DEBUG:  join prunable for task partitionId 0 and 2
 DEBUG:  join prunable for task partitionId 0 and 3
diff --git a/src/test/regress/expected/multi_large_table_task_assignment.out b/src/test/regress/expected/multi_large_table_task_assignment.out
index 33ec87b9b..7ba87fa94 100644
--- a/src/test/regress/expected/multi_large_table_task_assignment.out
+++ b/src/test/regress/expected/multi_large_table_task_assignment.out
@@ -25,8 +25,8 @@ FROM
 WHERE
 	o_custkey = c_custkey;
 DEBUG:  StartTransactionCommand
-DEBUG:  assigned task 4 to node localhost:57637
-DEBUG:  assigned task 2 to node localhost:57638
+DEBUG:  assigned task 2 to node localhost:57637
+DEBUG:  assigned task 4 to node localhost:57638
 DEBUG:  join prunable for intervals [1,1000] and [1001,2000]
 DEBUG:  join prunable for intervals [1,1000] and [6001,7000]
 DEBUG:  join prunable for intervals [1001,2000] and [6001,7000]
@@ -39,9 +39,9 @@ DEBUG:  pruning merge fetch taskId 4
 DETAIL:  Creating dependency on merge taskId 8
 DEBUG:  pruning merge fetch taskId 7
 DETAIL:  Creating dependency on merge taskId 11
-DEBUG:  assigned task 3 to node localhost:57637
-DEBUG:  assigned task 9 to node localhost:57638
 DEBUG:  assigned task 6 to node localhost:57637
+DEBUG:  assigned task 3 to node localhost:57638
+DEBUG:  assigned task 9 to node localhost:57637
 DEBUG:  CommitTransactionCommand
  count 
 -------
@@ -64,12 +64,12 @@ WHERE
 	o_custkey = c_custkey AND
 	o_orderkey = l_orderkey;
 DEBUG:  StartTransactionCommand
-DEBUG:  assigned task 15 to node localhost:57637
+DEBUG:  assigned task 3 to node localhost:57637
+DEBUG:  assigned task 15 to node localhost:57638
+DEBUG:  assigned task 6 to node localhost:57637
 DEBUG:  assigned task 18 to node localhost:57638
 DEBUG:  assigned task 9 to node localhost:57637
 DEBUG:  assigned task 12 to node localhost:57638
-DEBUG:  assigned task 3 to node localhost:57637
-DEBUG:  assigned task 6 to node localhost:57638
 DEBUG:  join prunable for intervals [1,2496] and [13921,14947]
 DEBUG:  join prunable for intervals [1,2496] and [11554,13920]
 DEBUG:  join prunable for intervals [1,2496] and [8997,11554]
@@ -114,12 +114,12 @@ DEBUG:  pruning merge fetch taskId 19
 DETAIL:  Creating dependency on merge taskId 47
 DEBUG:  pruning merge fetch taskId 22
 DETAIL:  Creating dependency on merge taskId 54
-DEBUG:  assigned task 3 to node localhost:57637
-DEBUG:  assigned task 6 to node localhost:57638
-DEBUG:  assigned task 9 to node localhost:57637
-DEBUG:  assigned task 12 to node localhost:57638
-DEBUG:  assigned task 18 to node localhost:57637
-DEBUG:  assigned task 24 to node localhost:57638
+DEBUG:  assigned task 6 to node localhost:57637
+DEBUG:  assigned task 3 to node localhost:57638
+DEBUG:  assigned task 24 to node localhost:57637
+DEBUG:  assigned task 9 to node localhost:57638
+DEBUG:  assigned task 12 to node localhost:57637
+DEBUG:  assigned task 18 to node localhost:57638
 DEBUG:  propagating assignment from merge task 40 to constrained sql task 15
 DEBUG:  propagating assignment from merge task 47 to constrained sql task 21
 DEBUG:  CommitTransactionCommand
@@ -154,15 +154,15 @@ FROM
 WHERE
 	l_partkey = c_nationkey;
 DEBUG:  StartTransactionCommand
-DEBUG:  assigned task 12 to node localhost:57637
-DEBUG:  assigned task 10 to node localhost:57638
-DEBUG:  assigned task 8 to node localhost:57637
-DEBUG:  assigned task 6 to node localhost:57638
-DEBUG:  assigned task 4 to node localhost:57637
-DEBUG:  assigned task 2 to node localhost:57638
+DEBUG:  assigned task 10 to node localhost:57637
+DEBUG:  assigned task 12 to node localhost:57638
 DEBUG:  assigned task 6 to node localhost:57637
+DEBUG:  assigned task 8 to node localhost:57638
+DEBUG:  assigned task 2 to node localhost:57637
 DEBUG:  assigned task 4 to node localhost:57638
 DEBUG:  assigned task 2 to node localhost:57637
+DEBUG:  assigned task 6 to node localhost:57638
+DEBUG:  assigned task 4 to node localhost:57637
 DEBUG:  join prunable for task partitionId 0 and 1
 DEBUG:  join prunable for task partitionId 0 and 2
 DEBUG:  join prunable for task partitionId 0 and 3
diff --git a/src/test/regress/input/multi_stage_data.source b/src/test/regress/input/multi_stage_data.source
index a65b05c69..9effe58d5 100644
--- a/src/test/regress/input/multi_stage_data.source
+++ b/src/test/regress/input/multi_stage_data.source
@@ -4,11 +4,8 @@
 
 -- Tests for staging data in a distributed cluster. Please note that the number
 -- of shards uploaded depends on two config values: citus.shard_replication_factor and
--- citus.shard_max_size. These values are manually set in pg_regress.c. We also set
--- the shard placement policy to the local-node-first policy as other regression
--- tests expect the placements to be in that order.
-
-SET citus.shard_placement_policy TO 'local-node-first';
+-- citus.shard_max_size. These values are set in pg_regress_multi.pl. Shard placement
+-- policy is left to the default value (round-robin) to test the common install case.
 
 \STAGE lineitem FROM '@abs_srcdir@/data/lineitem.1.data' with delimiter '|'
 \STAGE lineitem FROM '@abs_srcdir@/data/lineitem.2.data' with delimiter '|'
diff --git a/src/test/regress/input/multi_stage_more_data.source b/src/test/regress/input/multi_stage_more_data.source
index 63a24d5c1..3ec97813f 100644
--- a/src/test/regress/input/multi_stage_more_data.source
+++ b/src/test/regress/input/multi_stage_more_data.source
@@ -5,10 +5,6 @@
 -- We stage more data to customer and part tables to test distributed joins. The
 -- staging causes the planner to consider customer and part tables as large, and
 -- evaluate plans where some of the underlying tables need to be repartitioned.
--- We also set the shard placement policy to the local-node-first policy as other
--- regression tests expect the placements to be in that order.
-
-SET citus.shard_placement_policy TO 'local-node-first';
 
 \STAGE customer FROM '@abs_srcdir@/data/customer.2.data' with delimiter '|'
 \STAGE customer FROM '@abs_srcdir@/data/customer.3.data' with delimiter '|'
diff --git a/src/test/regress/output/multi_stage_data.source b/src/test/regress/output/multi_stage_data.source
index 74a4d84e2..0eed8965f 100644
--- a/src/test/regress/output/multi_stage_data.source
+++ b/src/test/regress/output/multi_stage_data.source
@@ -3,10 +3,8 @@
 --
 -- Tests for staging data in a distributed cluster. Please note that the number
 -- of shards uploaded depends on two config values: citus.shard_replication_factor and
--- citus.shard_max_size. These values are manually set in pg_regress.c. We also set
--- the shard placement policy to the local-node-first policy as other regression
--- tests expect the placements to be in that order.
-SET citus.shard_placement_policy TO 'local-node-first';
+-- citus.shard_max_size. These values are set in pg_regress_multi.pl. Shard placement
+-- policy is left to the default value (round-robin) to test the common install case.
 \STAGE lineitem FROM '@abs_srcdir@/data/lineitem.1.data' with delimiter '|'
 \STAGE lineitem FROM '@abs_srcdir@/data/lineitem.2.data' with delimiter '|'
 \STAGE orders FROM '@abs_srcdir@/data/orders.1.data' with delimiter '|'
diff --git a/src/test/regress/output/multi_stage_more_data.source b/src/test/regress/output/multi_stage_more_data.source
index 0a57bc64e..2e0f38f1d 100644
--- a/src/test/regress/output/multi_stage_more_data.source
+++ b/src/test/regress/output/multi_stage_more_data.source
@@ -4,9 +4,6 @@
 -- We stage more data to customer and part tables to test distributed joins. The
 -- staging causes the planner to consider customer and part tables as large, and
 -- evaluate plans where some of the underlying tables need to be repartitioned.
--- We also set the shard placement policy to the local-node-first policy as other
--- regression tests expect the placements to be in that order.
-SET citus.shard_placement_policy TO 'local-node-first';
 \STAGE customer FROM '@abs_srcdir@/data/customer.2.data' with delimiter '|'
 \STAGE customer FROM '@abs_srcdir@/data/customer.3.data' with delimiter '|'
 \STAGE part FROM '@abs_srcdir@/data/part.more.data' with delimiter '|'