diff -U3 /home/vagrant/postgresql/src/test/regress/expected/subselect.out /home/vagrant/postgresql/src/test/regress/results/subselect.out
--- /home/vagrant/postgresql/src/test/regress/expected/subselect.out	2022-04-11 02:01:56.846066150 +0000
+++ /home/vagrant/postgresql/src/test/regress/results/subselect.out	2022-04-29 00:12:41.656445011 +0000
@@ -1298,29 +1298,29 @@
 --
 -- Check for incorrect optimization when IN subquery contains a SRF
 --
-explain (verbose, costs off)
+explain (verbose)
 select * from int4_tbl o where (f1, f1) in
   (select f1, generate_series(1,50) / 10 g from int4_tbl i group by f1);
-                            QUERY PLAN                             
--------------------------------------------------------------------
- Nested Loop Semi Join
+                                             QUERY PLAN                                              
+-----------------------------------------------------------------------------------------------------
+ Nested Loop Semi Join  (cost=1.06..10.40 rows=1 width=4)
    Output: o.f1
    Join Filter: (o.f1 = "ANY_subquery".f1)
-   ->  Seq Scan on public.int4_tbl o
+   ->  Seq Scan on public.int4_tbl o  (cost=0.00..1.05 rows=5 width=4)
          Output: o.f1
-   ->  Materialize
+   ->  Materialize  (cost=1.06..9.28 rows=1 width=8)
          Output: "ANY_subquery".f1, "ANY_subquery".g
-         ->  Subquery Scan on "ANY_subquery"
+         ->  Subquery Scan on "ANY_subquery"  (cost=1.06..9.28 rows=1 width=8)
                Output: "ANY_subquery".f1, "ANY_subquery".g
                Filter: ("ANY_subquery".f1 = "ANY_subquery".g)
-               ->  Result
+               ->  Result  (cost=1.06..6.15 rows=250 width=8)
                      Output: i.f1, ((generate_series(1, 50)) / 10)
-                     ->  ProjectSet
+                     ->  ProjectSet  (cost=1.06..2.40 rows=250 width=8)
                            Output: generate_series(1, 50), i.f1
-                           ->  HashAggregate
+                           ->  HashAggregate  (cost=1.06..1.11 rows=5 width=4)
                                  Output: i.f1
                                  Group Key: i.f1
-                                 ->  Seq Scan on public.int4_tbl i
+                                 ->  Seq Scan on public.int4_tbl i  (cost=0.00..1.05 rows=5 width=4)
                                        Output: i.f1
 (19 rows)
 
diff -U3 /home/vagrant/postgresql/src/test/regress/expected/privileges.out /home/vagrant/postgresql/src/test/regress/results/privileges.out
--- /home/vagrant/postgresql/src/test/regress/expected/privileges.out	2022-04-15 22:58:14.784668286 +0000
+++ /home/vagrant/postgresql/src/test/regress/results/privileges.out	2022-04-29 00:12:49.520444688 +0000
@@ -363,17 +363,17 @@
 (6 rows)
 
 -- But a security barrier view isolates the leaky operator.
-EXPLAIN (COSTS OFF) SELECT * FROM atest12sbv x, atest12sbv y
+EXPLAIN SELECT * FROM atest12sbv x, atest12sbv y
   WHERE x.a = y.b and abs(y.a) <<< 5;
-             QUERY PLAN              
--------------------------------------
- Nested Loop
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Nested Loop  (cost=0.00..340.15 rows=1 width=16)
    Join Filter: (atest12_1.a = y.b)
-   ->  Subquery Scan on y
+   ->  Subquery Scan on y  (cost=0.00..170.06 rows=1 width=8)
          Filter: (abs(y.a) <<< 5)
-         ->  Seq Scan on atest12
+         ->  Seq Scan on atest12  (cost=0.00..170.00 rows=4 width=8)
                Filter: (b <<< 5)
-   ->  Seq Scan on atest12 atest12_1
+   ->  Seq Scan on atest12 atest12_1  (cost=0.00..170.00 rows=4 width=8)
          Filter: (b <<< 5)
 (8 rows)
 
diff -U3 /home/vagrant/postgresql/src/test/regress/expected/incremental_sort.out /home/vagrant/postgresql/src/test/regress/results/incremental_sort.out
--- /home/vagrant/postgresql/src/test/regress/expected/incremental_sort.out	2022-04-15 22:58:14.776668287 +0000
+++ /home/vagrant/postgresql/src/test/regress/results/incremental_sort.out	2022-04-29 00:12:55.196444456 +0000
@@ -1478,22 +1478,22 @@
 
 -- Incremental sort vs. set operations with varno 0
 set enable_hashagg to off;
-explain (costs off) select * from t union select * from t order by 1,3;
-                        QUERY PLAN                        
-----------------------------------------------------------
- Incremental Sort
+explain  select * from t union select * from t order by 1,3;
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
+ Incremental Sort  (cost=29425.50..47127.57 rows=120000 width=12)
    Sort Key: t.a, t.c
    Presorted Key: t.a
-   ->  Unique
-         ->  Sort
+   ->  Unique  (cost=29344.85..30544.85 rows=120000 width=12)
+         ->  Sort  (cost=29344.85..29644.85 rows=120000 width=12)
                Sort Key: t.a, t.b, t.c
-               ->  Append
-                     ->  Gather
+               ->  Append  (cost=0.00..2950.00 rows=120000 width=12)
+                     ->  Gather  (cost=0.00..575.00 rows=60000 width=12)
                            Workers Planned: 2
-                           ->  Parallel Seq Scan on t
-                     ->  Gather
+                           ->  Parallel Seq Scan on t  (cost=0.00..575.00 rows=25000 width=12)
+                     ->  Gather  (cost=0.00..575.00 rows=60000 width=12)
                            Workers Planned: 2
-                           ->  Parallel Seq Scan on t t_1
+                           ->  Parallel Seq Scan on t t_1  (cost=0.00..575.00 rows=25000 width=12)
 (13 rows)
 
 -- Full sort, not just incremental sort can be pushed below a gather merge path