diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 5713f74018c356b55fb9f1fde53ea5b2a2b55256..b92c26a6453c27ffc52c4e40d21197212bfb36cc 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -6,7 +6,7 @@ TrigSignatureMoniMT INFO -- #1767768251 Events
TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113
TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 13 13 13 - - 13
-TrigSignatureMoniMT INFO -- #2613484113 Features 46 156 85 - -
+TrigSignatureMoniMT INFO -- #2613484113 Features 46 155 86 - -
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH #2426612258
TrigSignatureMoniMT INFO -- #2426612258 Events 20 20 0 0 0 0 - 0
TrigSignatureMoniMT INFO -- #2426612258 Features 0 0 0 0 -
@@ -75,7 +75,7 @@ TrigSignatureMoniMT INFO -- #2512605388 Events
TrigSignatureMoniMT INFO -- #2512605388 Features 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - 0
-TrigSignatureMoniMT INFO -- #1703681121 Features 1 5 0 - -
+TrigSignatureMoniMT INFO -- #1703681121 Features 1 3 0 - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM24VHI #3494457106
TrigSignatureMoniMT INFO -- #3494457106 Events 20 20 0 0 0 0 - 0
TrigSignatureMoniMT INFO -- #3494457106 Features 0 0 0 0 -
@@ -86,26 +86,26 @@ TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fa
TrigSignatureMoniMT INFO -- #2086577378 Events 20 20 0 - - - - 0
TrigSignatureMoniMT INFO -- #2086577378 Features 0 - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
-TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 13 13 - - 13
-TrigSignatureMoniMT INFO -- #683953566 Features 48 156 85 - -
+TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - - 14
+TrigSignatureMoniMT INFO -- #683953566 Features 48 156 87 - -
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 12 12 - - 12
-TrigSignatureMoniMT INFO -- #324908483 Features 41 144 47 - -
+TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - 13
+TrigSignatureMoniMT INFO -- #324908483 Features 41 141 47 - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 9 9 1 - 1
-TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 28 1 -
+TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 0 - 0
+TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 29 0 -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
-TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 8 8 0 - 0
-TrigSignatureMoniMT INFO -- #176627878 Features 13 47 27 0 -
+TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - 0
+TrigSignatureMoniMT INFO -- #176627878 Features 13 49 28 0 -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 8 8 0 - 0
-TrigSignatureMoniMT INFO -- #2758326765 Features 13 47 27 0 -
+TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 9 9 0 - 0
+TrigSignatureMoniMT INFO -- #2758326765 Features 13 49 28 0 -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM24VHI #713054523
TrigSignatureMoniMT INFO -- #713054523 Events 20 20 0 0 0 0 - 0
TrigSignatureMoniMT INFO -- #713054523 Features 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 12 11 - - 11
-TrigSignatureMoniMT INFO -- #1959043579 Features 26 96 21 - -
+TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - - 11
+TrigSignatureMoniMT INFO -- #1959043579 Features 26 90 20 - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI #1045486446
TrigSignatureMoniMT INFO -- #1045486446 Events 20 20 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - -
@@ -176,23 +176,23 @@ TrigSignatureMoniMT INFO HLT_j45_ftf_csskpf_nojc
TrigSignatureMoniMT INFO -- #3533281867 Events 20 20 3 - - - - 3
TrigSignatureMoniMT INFO -- #3533281867 Features 3 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 #1335156103
-TrigSignatureMoniMT INFO -- #1335156103 Events 20 20 4 - - - - 4
-TrigSignatureMoniMT INFO -- #1335156103 Features 4 - - - -
+TrigSignatureMoniMT INFO -- #1335156103 Events 20 20 5 - - - - 5
+TrigSignatureMoniMT INFO -- #1335156103 Features 5 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_nojcalib_L1J20 #3658890913
TrigSignatureMoniMT INFO -- #3658890913 Events 20 20 3 - - - - 3
TrigSignatureMoniMT INFO -- #3658890913 Features 3 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 #2857031468
-TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #2857031468 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 5 - - - - 5
+TrigSignatureMoniMT INFO -- #2857031468 Features 5 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J15 #2938374624
-TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #2938374624 Features 6 - - - -
+TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 5 - - - - 5
+TrigSignatureMoniMT INFO -- #2938374624 Features 5 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_059jvt_L1J15 #1593009344
TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 5 - - - - 5
TrigSignatureMoniMT INFO -- #1593009344 Features 5 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 #3341539267
-TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 7 - - - - 7
-TrigSignatureMoniMT INFO -- #3341539267 Features 7 - - - -
+TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 6 - - - - 6
+TrigSignatureMoniMT INFO -- #3341539267 Features 6 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
TrigSignatureMoniMT INFO -- #991419339 Events 20 20 5 5 5 - - 5
TrigSignatureMoniMT INFO -- #991419339 Features 5 5 5 - -
@@ -200,14 +200,14 @@ TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS
TrigSignatureMoniMT INFO -- #1961149049 Events 20 20 5 5 5 - - 5
TrigSignatureMoniMT INFO -- #1961149049 Features 5 5 5 - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 #761060030
-TrigSignatureMoniMT INFO -- #761060030 Events 20 20 4 - - - - 4
-TrigSignatureMoniMT INFO -- #761060030 Features 4 - - - -
+TrigSignatureMoniMT INFO -- #761060030 Events 20 20 5 - - - - 5
+TrigSignatureMoniMT INFO -- #761060030 Features 5 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 #1509925407
-TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 7 - - - - 7
-TrigSignatureMoniMT INFO -- #1509925407 Features 7 - - - -
+TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 6 - - - - 6
+TrigSignatureMoniMT INFO -- #1509925407 Features 6 - - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J20 #4012311417
-TrigSignatureMoniMT INFO -- #4012311417 Events 20 20 4 - - - - 4
-TrigSignatureMoniMT INFO -- #4012311417 Features 4 - - - -
+TrigSignatureMoniMT INFO -- #4012311417 Events 20 20 5 - - - - 5
+TrigSignatureMoniMT INFO -- #4012311417 Features 5 - - - -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 3 - - - - 3
TrigSignatureMoniMT INFO -- #2042444294 Features 3 - - - -
@@ -354,52 +354,52 @@ TrigSignatureMoniMT INFO -- #554271976 Events
TrigSignatureMoniMT INFO -- #554271976 Features 4 - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM #988149859
TrigSignatureMoniMT INFO -- #988149859 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #988149859 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #988149859 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM #3346942453
TrigSignatureMoniMT INFO -- #3346942453 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #3346942453 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #3346942453 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM #169452969
TrigSignatureMoniMT INFO -- #169452969 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #169452969 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #169452969 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwo_L1TAU12IM #2490017573
TrigSignatureMoniMT INFO -- #2490017573 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #2490017573 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #2490017573 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoEF_L1TAU12IM #506456080
TrigSignatureMoniMT INFO -- #506456080 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #506456080 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #506456080 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoMVA_L1TAU12IM #4055280067
TrigSignatureMoniMT INFO -- #4055280067 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #4055280067 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #4055280067 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM #1433975745
TrigSignatureMoniMT INFO -- #1433975745 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #1433975745 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #1433975745 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM #2222894847
TrigSignatureMoniMT INFO -- #2222894847 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2222894847 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #2222894847 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwo_L1TAU12IM #698603885
TrigSignatureMoniMT INFO -- #698603885 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #698603885 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #698603885 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwoMVA_L1TAU12IM #112814536
TrigSignatureMoniMT INFO -- #112814536 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #112814536 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #112814536 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwo_L1TAU12IM #1129072492
TrigSignatureMoniMT INFO -- #1129072492 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #1129072492 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #1129072492 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM #2472860683
TrigSignatureMoniMT INFO -- #2472860683 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2472860683 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #2472860683 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwo_L1TAU12IM #2537544560
TrigSignatureMoniMT INFO -- #2537544560 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #2537544560 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #2537544560 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM #2992830434
TrigSignatureMoniMT INFO -- #2992830434 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2992830434 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #2992830434 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM #1275052132
TrigSignatureMoniMT INFO -- #1275052132 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #1275052132 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #1275052132 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859
TrigSignatureMoniMT INFO -- #2456480859 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2456480859 Features 4 4 - - -
+TrigSignatureMoniMT INFO -- #2456480859 Features 4 3 - - -
TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988
TrigSignatureMoniMT INFO -- #532175988 Events 20 20 2 - - - - 2
TrigSignatureMoniMT INFO -- #532175988 Features 2 - - - -
@@ -422,14 +422,14 @@ TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #36
TrigSignatureMoniMT INFO -- #3626903018 Events 20 20 16 - - - - 16
TrigSignatureMoniMT INFO -- #3626903018 Features 16 - - - -
TrigSignatureMoniMT INFO HLT_xe30_pfsum_L1XE10 #998713382
-TrigSignatureMoniMT INFO -- #998713382 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #998713382 Features 5 - - - -
+TrigSignatureMoniMT INFO -- #998713382 Events 20 20 3 - - - - 3
+TrigSignatureMoniMT INFO -- #998713382 Features 3 - - - -
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 2 - - - - 2
TrigSignatureMoniMT INFO -- #1583719916 Features 2 - - - -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 7 - - - - 7
-TrigSignatureMoniMT INFO -- #2468872349 Features 7 - - - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 5 - - - - 5
+TrigSignatureMoniMT INFO -- #2468872349 Features 5 - - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 - - - - 0
TrigSignatureMoniMT INFO -- #531141817 Features 0 - - - -
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 9da25d053027813ab81ac8e90d24adce8fdb8768..4c004a0ae2da4723c863254ebd2bd412eca3b318 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -200,6 +200,7 @@ if globalflags.DataSource.is_geant4(): # MC modifiers
else: # More data modifiers
setModifiers += ['allowCOOLUpdates',
'BFieldAutoConfig',
+ 'useDynamicAlignFolders',
'useHLTMuonAlign',
#Check for beamspot quality flag
'UseBeamSpotFlagForBjet',