diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/aggregates.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/aggregates.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/aggregates.out	2025-06-22 06:54:03.421450000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/aggregates.out	2025-06-22 06:56:26.846159000 +0000
@@ -3612,8 +3612,8 @@
 ) AS sub
 GROUP BY c1
 ORDER BY c1;
-                                 QUERY PLAN                                  
------------------------------------------------------------------------------
+                                                  QUERY PLAN                                                   
+---------------------------------------------------------------------------------------------------------------
  GroupAggregate
    Group Key: sub.c1
    ->  Sort
@@ -3622,7 +3622,7 @@
                ->  HashAggregate
                      Group Key: test_groupagg.c1, test_groupagg.c2
                      ->  Seq Scan on test_groupagg
- Settings: max_parallel_workers = '0', max_parallel_workers_per_gather = '0'
+ Settings: debug_parallel_query = 'regress', max_parallel_workers = '0', max_parallel_workers_per_gather = '0'
 (9 rows)
 
 -- Only GroupAgg is selected
@@ -3636,8 +3636,8 @@
 ) AS sub
 GROUP BY c1
 ORDER BY c1;
-                                             QUERY PLAN                                              
------------------------------------------------------------------------------------------------------
+                                                              QUERY PLAN                                                               
+---------------------------------------------------------------------------------------------------------------------------------------
  GroupAggregate
    Group Key: test_groupagg.c1
    ->  GroupAggregate
@@ -3645,7 +3645,7 @@
          ->  Sort
                Sort Key: test_groupagg.c1, test_groupagg.c2
                ->  Seq Scan on test_groupagg
- Settings: max_parallel_workers = '0', max_parallel_workers_per_gather = '0', enable_hashagg = 'off'
+ Settings: debug_parallel_query = 'regress', max_parallel_workers = '0', max_parallel_workers_per_gather = '0', enable_hashagg = 'off'
 (8 rows)
 
 -- Only HashAgg is selected
@@ -3660,8 +3660,8 @@
 ) AS sub
 GROUP BY c1
 ORDER BY c1;
-                                              QUERY PLAN                                              
-------------------------------------------------------------------------------------------------------
+                                                               QUERY PLAN                                                               
+----------------------------------------------------------------------------------------------------------------------------------------
  Sort
    Sort Key: test_groupagg.c1
    ->  HashAggregate
@@ -3669,7 +3669,7 @@
          ->  HashAggregate
                Group Key: test_groupagg.c1, test_groupagg.c2
                ->  Seq Scan on test_groupagg
- Settings: max_parallel_workers = '0', max_parallel_workers_per_gather = '0', enable_groupagg = 'off'
+ Settings: debug_parallel_query = 'regress', max_parallel_workers = '0', max_parallel_workers_per_gather = '0', enable_groupagg = 'off'
 (8 rows)
 
 -- Only GroupAgg is selected as a fallback
@@ -3684,8 +3684,8 @@
 ) AS sub
 GROUP BY c1
 ORDER BY c1;
-                                                          QUERY PLAN                                                          
-------------------------------------------------------------------------------------------------------------------------------
+                                                                           QUERY PLAN                                                                           
+----------------------------------------------------------------------------------------------------------------------------------------------------------------
  GroupAggregate
    Group Key: test_groupagg.c1
    ->  GroupAggregate
@@ -3693,7 +3693,7 @@
          ->  Sort
                Sort Key: test_groupagg.c1, test_groupagg.c2
                ->  Seq Scan on test_groupagg
- Settings: max_parallel_workers = '0', max_parallel_workers_per_gather = '0', enable_hashagg = 'off', enable_groupagg = 'off'
+ Settings: debug_parallel_query = 'regress', max_parallel_workers = '0', max_parallel_workers_per_gather = '0', enable_hashagg = 'off', enable_groupagg = 'off'
 (8 rows)
 
 RESET enable_hashagg;
diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/join_hash.out /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join_hash.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/join_hash.out	2025-06-22 06:54:03.457446000 +0000
+++ /tmp/cirrus-ci-build/build/testrun/pg_upgrade/002_pg_upgrade/data/results/join_hash.out	2025-06-22 06:56:34.387265000 +0000
@@ -1137,18 +1137,21 @@
 int8_tbl i8,
 lateral (select t1.fivethous, i4.f1 from tenk1 t1 join int4_tbl i4
          on t1.fivethous = i4.f1+i8.q2 order by 1,2) ss;
-                        QUERY PLAN                         
------------------------------------------------------------
+                           QUERY PLAN                            
+-----------------------------------------------------------------
  Nested Loop
    ->  Seq Scan on int8_tbl i8
-   ->  Sort
-         Sort Key: t1.fivethous, i4.f1
-         ->  Hash Join
-               Hash Cond: (t1.fivethous = (i4.f1 + i8.q2))
-               ->  Seq Scan on tenk1 t1
-               ->  Hash
-                     ->  Seq Scan on int4_tbl i4
-(9 rows)
+   ->  Memoize
+         Cache Key: i8.q2
+         Cache Mode: binary
+         ->  Sort
+               Sort Key: t1.fivethous, i4.f1
+               ->  Hash Join
+                     Hash Cond: (t1.fivethous = (i4.f1 + i8.q2))
+                     ->  Seq Scan on tenk1 t1
+                     ->  Hash
+                           ->  Seq Scan on int4_tbl i4
+(12 rows)
 
 select i8.q2, ss.* from
 int8_tbl i8,