diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 7372331fbc6714cd706e3c0dbcf7142da466e151..74481aeb2f77440b8449e69cd85789d8e7463619 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -31,10 +31,10 @@ ciRefFileMap = {
                 # OverlayTier0Test_required-test
                 'overlay-d1498-21.0'   : 'v2',
                 'overlay-d1498-22.0'   : 'v38',
-                'overlay-d1592-22.0'   : 'v1',
+                'overlay-d1592-22.0'   : 'v2',
                 'overlay-bkg-21.0'     : 'v1',
                 'overlay-bkg-22.0'     : 'v4',
-                'dataoverlay-d1590-22.0' : 'v4',
+                'dataoverlay-d1590-22.0' : 'v5',
                 'dataoverlay-hits-22.0'  : 'v1',
                }
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index c059ebb16c13fa47a65b285dc75a12a5217e75a2..7cd1818c9f1fddf5e1e00d3d9c6f8e820cd47baf 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -60,8 +60,8 @@ HLT_2e3_etcut_L12EM3:
   stepFeatures:
     0: 342
     1: 976
-    2: 712
-    3: 270
+    2: 708
+    3: 268
 HLT_2g10_loose_mu20_L1MU20:
   eventCount: 0
   stepCounts:
@@ -872,8 +872,8 @@ HLT_e3_etcut_L1EM3:
   stepFeatures:
     0: 171
     1: 491
-    2: 360
-    3: 136
+    2: 358
+    3: 135
 HLT_e5_etcut_L1EM3:
   eventCount: 20
   stepCounts:
@@ -883,7 +883,7 @@ HLT_e5_etcut_L1EM3:
     3: 20
   stepFeatures:
     0: 137
-    1: 458
+    1: 459
     2: 173
     3: 102
 HLT_e5_lhloose_L1EM3:
@@ -896,7 +896,7 @@ HLT_e5_lhloose_L1EM3:
     4: 6
   stepFeatures:
     0: 60
-    1: 145
+    1: 146
     2: 78
     3: 44
     4: 7
@@ -910,7 +910,7 @@ HLT_e5_lhloose_noringer_L1EM3:
     4: 6
   stepFeatures:
     0: 56
-    1: 128
+    1: 130
     2: 88
     3: 46
     4: 7
@@ -924,7 +924,7 @@ HLT_e5_lhmedium_L1EM3:
     4: 4
   stepFeatures:
     0: 58
-    1: 131
+    1: 132
     2: 76
     3: 42
     4: 5
@@ -938,7 +938,7 @@ HLT_e5_lhmedium_noringer_L1EM3:
     4: 4
   stepFeatures:
     0: 48
-    1: 97
+    1: 99
     2: 66
     3: 38
     4: 5
@@ -952,7 +952,7 @@ HLT_e5_lhtight_L1EM3:
     4: 4
   stepFeatures:
     0: 57
-    1: 128
+    1: 129
     2: 74
     3: 41
     4: 5
@@ -966,7 +966,7 @@ HLT_e5_lhtight_nod0_L1EM3:
     4: 4
   stepFeatures:
     0: 57
-    1: 128
+    1: 129
     2: 74
     3: 41
     4: 5
@@ -980,7 +980,7 @@ HLT_e5_lhtight_noringer_L1EM3:
     4: 4
   stepFeatures:
     0: 45
-    1: 92
+    1: 94
     2: 60
     3: 36
     4: 5
@@ -994,7 +994,7 @@ HLT_e5_lhtight_noringer_nod0_L1EM3:
     4: 4
   stepFeatures:
     0: 45
-    1: 92
+    1: 94
     2: 60
     3: 36
     4: 5
@@ -1035,7 +1035,7 @@ HLT_e7_etcut_L1EM3:
     3: 20
   stepFeatures:
     0: 89
-    1: 361
+    1: 362
     2: 117
     3: 73
 HLT_e7_lhmedium_mu24_L1MU20:
@@ -1663,11 +1663,11 @@ HLT_j45_pf_subjesgscIS_ftf_L1J20:
     0: 19
     1: 52
 HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20:
-  eventCount: 13
+  eventCount: 14
   stepCounts:
     0: 19
     1: 18
-    2: 13
+    2: 14
   stepFeatures:
     0: 19
     1: 49
@@ -1729,15 +1729,15 @@ HLT_j45_subjesgscIS_ftf_L1J15:
     0: 20
     1: 48
 HLT_j45_subjesgscIS_ftf_bdl1r70_split_L1J20:
-  eventCount: 13
+  eventCount: 12
   stepCounts:
     0: 19
     1: 19
-    2: 13
+    2: 12
   stepFeatures:
     0: 19
     1: 47
-    2: 24
+    2: 23
 HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
   eventCount: 15
   stepCounts:
@@ -1747,7 +1747,7 @@ HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20:
   stepFeatures:
     0: 19
     1: 47
-    2: 27
+    2: 28
 HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20:
   eventCount: 19
   stepCounts:
@@ -2473,17 +2473,17 @@ HLT_sct_noise_SCTPEB_L1RD0_EMPTY:
 HLT_tau0_perf_ptonly_L1TAU100:
   eventCount: 0
 HLT_tau0_perf_ptonly_L1TAU12:
-  eventCount: 15
+  eventCount: 16
   stepCounts:
     0: 18
-    1: 15
-    2: 15
-    3: 15
+    1: 16
+    2: 16
+    3: 16
   stepFeatures:
     0: 42
-    1: 23
-    2: 23
-    3: 23
+    1: 24
+    2: 24
+    3: 24
 HLT_tau0_perf_ptonly_L1TAU60:
   eventCount: 3
   stepCounts:
@@ -2893,7 +2893,7 @@ HLT_unconvtrk120_isohpttrack_imedium_L1XE50:
   stepCounts:
     0: 6
   stepFeatures:
-    0: 11
+    0: 10
 HLT_xe100_cvfpufit_L1XE50:
   eventCount: 6
   stepCounts:
@@ -2977,21 +2977,21 @@ HLT_xe110_pfsum_L1XE50:
     0: 10
     1: 5
 HLT_xe110_pfsum_cssk_L1XE50:
-  eventCount: 3
+  eventCount: 2
   stepCounts:
     0: 10
-    1: 3
+    1: 2
   stepFeatures:
     0: 10
-    1: 3
+    1: 2
 HLT_xe110_pfsum_vssk_L1XE50:
-  eventCount: 4
+  eventCount: 3
   stepCounts:
     0: 10
-    1: 4
+    1: 3
   stepFeatures:
     0: 10
-    1: 4
+    1: 3
 HLT_xe110_tc_em_L1XE50:
   eventCount: 5
   stepCounts:
@@ -3109,7 +3109,7 @@ HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrloose_L1XE50:
   stepCounts:
     0: 3
   stepFeatures:
-    0: 7
+    0: 6
 HLT_xe80_tcpufit_unconvtrk120_isohpttrack_iaggrmedium_L1XE50:
   eventCount: 2
   stepCounts:
@@ -3121,13 +3121,13 @@ HLT_xe80_tcpufit_unconvtrk120_isohpttrack_imedium_L1XE50:
   stepCounts:
     0: 5
   stepFeatures:
-    0: 15
+    0: 14
 HLT_xe80_tcpufit_unconvtrk80_isohpttrack_imedium_L1XE50:
   eventCount: 6
   stepCounts:
     0: 6
   stepFeatures:
-    0: 20
+    0: 19
 HLT_xe95_trkmht_xe90_tcpufit_xe75_cell_L1XE50:
   eventCount: 4
   stepCounts: