diff --git a/Control/AthenaCommon/share/GenerateBootstrapTest.ref b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
index 28478418663e08a1b80a92c6df28e09067f42845..b8aa02562e91c3b86838a1cdeb25a8ca08555fc3 100644
--- a/Control/AthenaCommon/share/GenerateBootstrapTest.ref
+++ b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
@@ -4,13 +4,13 @@ copy bootstrap.pkl
 ... Read 2 items from python pickle file:  bootstrap.pkl
 ... Read 2 items from python pickle file:  bootstrap_test.pkl
 Given list of size 0. Not looking for differences.
-Step 1: reference file #components: 29
-Step 2: file to check  #components: 29
+Step 1: reference file #components: 28
+Step 2: file to check  #components: 28
 Willing to acquire file bootstrap_threaded.pkl from
 /afs/cern.ch/user/s/ssnyder/atlas-work3g/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl
 copy bootstrap_threaded.pkl
 ... Read 2 items from python pickle file:  bootstrap_threaded.pkl
 ... Read 2 items from python pickle file:  bootstrap_threaded_test.pkl
 Given list of size 0. Not looking for differences.
-Step 1: reference file #components: 35
-Step 2: file to check  #components: 35
+Step 1: reference file #components: 34
+Step 2: file to check  #components: 34
diff --git a/Control/AthenaCommon/share/bootstrap.pkl b/Control/AthenaCommon/share/bootstrap.pkl
index d0008a52573956b9cbab7eef15747a2711c371ca..afb1153c49e67b45da1d3a9a4b7cc03903f3f861 100644
--- a/Control/AthenaCommon/share/bootstrap.pkl
+++ b/Control/AthenaCommon/share/bootstrap.pkl
@@ -387,9 +387,9 @@ S'ExtraOutputs'
 p202
 S'[]'
 p203
-sS'IgnoreFilterPassed'
+sS'Members'
 p204
-S'True'
+S'[]'
 p205
 sS'EvtStore'
 p206
@@ -403,9 +403,9 @@ sS'StopOverride'
 p210
 S'True'
 p211
-sS'Members'
+sS'IgnoreFilterPassed'
 p212
-S'[]'
+S'True'
 p213
 sS'NeededResources'
 p214
@@ -542,246 +542,234 @@ p1
 dict
 p2
 tRp3
-S'StatusCodeSvc'
+S'CoreDumpSvc'
 p4
 (dp5
-S'Filter'
+S'Signals'
 p6
-S"['Reflex::NewDelFunctionsT<StatusCode>::delete_T(void*)', 'ROOT::Reflex::NewDelFunctionsT<StatusCode>::delete_T(void*)']"
+S'[11, 7, 4, 8]'
 p7
-sS'OutputLevel'
+sS'FatalHandler'
 p8
-S'3'
-sS'AbortOnError'
+S'-1'
 p9
-S'True'
-p10
 ssS'AthenaSealSvc'
-p11
-(dp12
+p10
+(dp11
 S'DictNames'
-p13
+p12
 S'[]'
-p14
+p13
 sS'IgnoreDicts'
-p15
+p14
 S"['libSealCLHEPDict']"
-p16
+p15
 sS'IgnoreNames'
-p17
+p16
 S"['Gaudi', 'GaudiPython::Interface', 'GaudiPython::Helper', 'FactoryTable', 'IInterface', 'IFactory', 'IAlgFactory', 'ISvcFactory', 'IToolFactory', 'InterfaceID', 'StatusCode', 'IAppMgrUI', 'IProperty', 'Property', 'std::vector<Property*>', 'std::vector<const Property*>', 'std::list<IAlgorithm*>', 'std::list<IService*>', 'std::list<const IFactory*>', 'std::vector<IRegistry*>', 'SimpleProperty', 'SimplePropertyRef', 'IService', 'IAlgorithm', 'ISvcManager', 'IAlgManager', 'IJobOptionsSvc', 'ISvcLocator', 'IEventProcessor', 'IDataProviderSvc', 'IDataManagerSvc', 'IRegistry', 'ContainedObject', 'std::vector<const ContainedObject*>', 'DataObject', 'IHistogramSvc', 'AIDA::I', 'Algorithm', 'Service', 'GaudiPython::PyAlgorithm', 'GaudiPython::PyAlgorithmWrap', 'IParticlePropertySvc', 'ParticleProperty', 'StoreGateSvc', 'IStoragePolicy', 'CharDbArray', 'DoubleDbArray', 'FloatDbArray', 'IntDbArray', 'LongDbArray', 'ShortDbArray', 'AthenaEventLoopMgr', 'MinimalEventLoopMgr', 'PyAthenaEventLoopMgr', 'NTuple::Directory', 'NTuple::File ', 'NTuple::Tuple', 'INTuple', 'NTuple::Tuple', 'greater<int>', 'allocator<', 'string']"
-p18
-ssS'CoreDumpSvc'
-p19
-(dp20
-S'Signals'
-p21
-S'[11, 7, 4, 8]'
-p22
-sS'FatalHandler'
-p23
-S'-1'
-p24
+p17
 ssS'ApplicationMgr'
-p25
-(dp26
+p18
+(dp19
 S'Runable'
-p27
+p20
 S'AppMgrRunable'
-p28
+p21
 sS'ReturnCode'
-p29
+p22
 S'0'
 sS'TopAlg'
-p30
+p23
 S"['AthSequencer/AthMasterSeq']"
-p31
+p24
 sS'PrintAlgsSequence'
-p32
+p25
 S'False'
-p33
+p26
 sS'EventLoop'
-p34
+p27
 S'AthenaEventLoopMgr'
-p35
+p28
 sS'ExtSvcCreates'
-p36
-g33
+p29
+g26
 sS'Environment'
-p37
+p30
 S'{}'
-p38
+p31
 sS'JobOptionsPath'
-p39
+p32
 S''
 sS'Dlls'
-p40
+p33
 S'[]'
-p41
+p34
 sS'SvcMapping'
-p42
+p35
 S"['EvtDataSvc/EventDataSvc', 'DetDataSvc/DetectorDataSvc', 'HistogramSvc/HistogramDataSvc', 'HbookCnv::PersSvc/HbookHistSvc', 'RootHistCnv::PersSvc/RootHistSvc', 'EvtPersistencySvc/EventPersistencySvc', 'DetPersistencySvc/DetectorPersistencySvc', 'HistogramPersistencySvc/HistogramPersistencySvc']"
-p43
+p36
 sS'AppName'
-p44
+p37
 S'ApplicationMgr'
-p45
+p38
 sS'AuditServices'
-p46
-g33
+p39
+g26
 sS'OutStream'
-p47
+p40
 S'[]'
-p48
+p41
 sS'ActivateHistory'
-p49
-g33
+p42
+g26
 sS'StalledEventMonitoring'
-p50
-g33
+p43
+g26
 sS'InitializationLoopCheck'
-p51
-g33
+p44
+g26
 sS'JobOptionsSvcType'
-p52
+p45
 S'JobOptionsSvc'
-p53
+p46
 sS'JobOptionsPreAction'
-p54
+p47
 S''
 sS'StatusCodeCheck'
-p55
-g10
+p48
+g26
 sS'AuditTools'
-p56
-g33
+p49
+g26
 sS'AlgTypeAliases'
-p57
+p50
 S'{}'
-p58
+p51
 sS'EvtSel'
-p59
+p52
 S''
 sS'PluginDebugLevel'
-p60
+p53
 S'0'
 sS'OutputLevel'
-p61
+p54
 S'3'
 sS'AppVersion'
-p62
+p55
 S''
 sS'EvtMax'
-p63
+p56
 S'-1'
-p64
+p57
 sS'SvcOptMapping'
-p65
+p58
 S'[]'
-p66
+p59
 sS'CreateSvc'
-p67
+p60
 S"['ToolSvc/ToolSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc']"
-p68
+p61
 sS'PropertiesPrint'
-p69
-g33
+p62
+g26
 sS'JobOptionsType'
-p70
+p63
 S'NONE'
-p71
+p64
 sS'OutStreamType'
-p72
+p65
 S'AthenaOutputStream'
-p73
+p66
 sS'StopOnSignal'
-p74
-g33
+p67
+g26
 sS'ExtSvc'
-p75
-S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StatusCodeSvc/StatusCodeSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'JobOptionsSvc/JobOptionsSvc']"
-p76
+p68
+S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'JobOptionsSvc/JobOptionsSvc']"
+p69
 sS'AuditAlgorithms'
-p77
-g33
+p70
+g26
 sS'HistogramPersistency'
-p78
+p71
 S'NONE'
-p79
+p72
 sS'MessageSvcType'
-p80
+p73
 S'MessageSvc'
-p81
+p74
 sS'JobOptionsPostAction'
-p82
+p75
 S''
 ssS'MessageSvc'
-p83
-(dp84
+p76
+(dp77
 S'verboseColorCode'
-p85
+p78
 S'[]'
-p86
+p79
 sS'setInfo'
-p87
+p80
 S'[]'
-p88
+p81
 sS'tracedInactiveSources'
-p89
+p82
 S'[]'
-p90
+p83
 sS'setAlways'
-p91
+p84
 S'[]'
-p92
+p85
 sS'debugColorCode'
-p93
+p86
 S'[]'
-p94
+p87
 sS'alwaysColorCode'
-p95
+p88
 S'[]'
-p96
+p89
 sS'enableSuppression'
-p97
-g10
-sg8
+p90
+S'True'
+p91
+sS'OutputLevel'
+p92
 S'3'
 sS'warningColorCode'
-p98
+p93
 S"['yellow']"
-p99
+p94
 sS'errorColorCode'
-p100
+p95
 S"['white', 'red']"
-p101
+p96
 sS'setVerbose'
-p102
+p97
 S'[]'
-p103
+p98
 sS'infoColorCode'
-p104
+p99
 S'[]'
-p105
+p100
 sS'setDebug'
-p106
+p101
 S'[]'
-p107
+p102
 sS'setFatal'
-p108
+p103
 S'[]'
-p109
+p104
 sS'setError'
-p110
+p105
 S'[]'
-p111
+p106
 sS'fatalColorCode'
-p112
+p107
 S"['blue', 'red']"
-p113
+p108
 sS'setWarning'
-p114
+p109
 S'[]'
-p115
+p110
 ss.(lp1
 .
\ No newline at end of file
diff --git a/Control/AthenaCommon/share/bootstrap_threaded.pkl b/Control/AthenaCommon/share/bootstrap_threaded.pkl
index a0267a8011bf719ab8e94a4b8750926b990ecb39..e3f4e7d4f354dc3bacaa4a89ac56a0ecccb4b63b 100644
--- a/Control/AthenaCommon/share/bootstrap_threaded.pkl
+++ b/Control/AthenaCommon/share/bootstrap_threaded.pkl
@@ -249,393 +249,379 @@ sS'DetStore'
 p129
 S'StoreGateSvc/DetectorStore'
 p130
-ssS'StatusCodeSvc'
+ssS'AthMasterSeq'
 p131
 (dp132
-S'Filter'
-p133
-S"['Reflex::NewDelFunctionsT<StatusCode>::delete_T(void*)', 'ROOT::Reflex::NewDelFunctionsT<StatusCode>::delete_T(void*)']"
-p134
-sS'OutputLevel'
-p135
-S'3'
-sS'AbortOnError'
-p136
-S'False'
-p137
-ssS'AthMasterSeq'
-p138
-(dp139
 S'ExtraOutputs'
-p140
+p133
 S'[]'
-p141
+p134
 sS'EvtStore'
-p142
+p135
 S'StoreGateSvc'
-p143
+p136
 sS'ExtraInputs'
-p144
+p137
 S'[]'
-p145
+p138
 sS'Sequential'
-p146
+p139
 S'True'
-p147
+p140
 sS'Members'
-p148
+p141
 S"['AthSequencer/AthAlgEvtSeq', 'AthSequencer/AthOutSeq', 'AthSequencer/AthRegSeq']"
-p149
+p142
 sS'NeededResources'
-p150
+p143
 S'[]'
-p151
+p144
 sS'DetStore'
-p152
+p145
 S'StoreGateSvc/DetectorStore'
-p153
+p146
 ssS'AthAlgEvtSeq'
-p154
-(dp155
+p147
+(dp148
 S'ExtraOutputs'
-p156
+p149
 S'[]'
-p157
+p150
 sS'EvtStore'
-p158
+p151
 S'StoreGateSvc'
-p159
+p152
 sS'ExtraInputs'
-p160
+p153
 S'[]'
-p161
+p154
 sS'Sequential'
-p162
+p155
 S'True'
-p163
+p156
 sS'StopOverride'
-p164
+p157
 S'True'
-p165
+p158
 sS'Members'
-p166
+p159
 S"['AthSequencer/AthBeginSeq', 'AthSequencer/AthAllAlgSeq', 'AthSequencer/AthEndSeq']"
-p167
+p160
 sS'NeededResources'
-p168
+p161
 S'[]'
-p169
+p162
 sS'DetStore'
-p170
+p163
 S'StoreGateSvc/DetectorStore'
-p171
+p164
 ssS'AthEndSeq'
-p172
-(dp173
+p165
+(dp166
 S'ExtraOutputs'
-p174
+p167
 S'[]'
-p175
+p168
 sS'EvtStore'
-p176
+p169
 S'StoreGateSvc'
-p177
+p170
 sS'ExtraInputs'
-p178
+p171
 S'[]'
-p179
+p172
 sS'Sequential'
-p180
+p173
 S'True'
-p181
+p174
 sS'Members'
-p182
+p175
 S"['AthIncFirerAlg/EndIncFiringAlg', 'IncidentProcAlg/IncidentProcAlg2']"
-p183
+p176
 sS'NeededResources'
-p184
+p177
 S'[]'
-p185
+p178
 sS'DetStore'
-p186
+p179
 S'StoreGateSvc/DetectorStore'
-p187
+p180
 ssS'AlgResourcePool'
-p188
-(dp189
+p181
+(dp182
 S'OutputLevel'
-p190
+p183
 S'3'
 sS'TopAlg'
-p191
+p184
 S"['AthMasterSeq']"
-p192
+p185
 ssS'AthRegSeq'
-p193
-(dp194
+p186
+(dp187
 S'ExtraOutputs'
-p195
+p188
 S'[]'
-p196
+p189
 sS'EvtStore'
-p197
+p190
 S'StoreGateSvc'
-p198
+p191
 sS'ExtraInputs'
-p199
+p192
 S'[]'
-p200
+p193
 sS'StopOverride'
-p201
+p194
 S'True'
-p202
+p195
 sS'Members'
-p203
+p196
 S'[]'
-p204
+p197
 sS'NeededResources'
-p205
+p198
 S'[]'
-p206
+p199
 sS'DetStore'
-p207
+p200
 S'StoreGateSvc/DetectorStore'
-p208
+p201
 ssS'EndIncFiringAlg'
-p209
-(dp210
+p202
+(dp203
 S'ExtraOutputs'
-p211
+p204
 S'[]'
-p212
+p205
 sS'EvtStore'
-p213
+p206
 S'StoreGateSvc'
-p214
+p207
 sS'ExtraInputs'
-p215
+p208
 S'[]'
-p216
+p209
 sS'FireSerial'
-p217
+p210
 S'False'
-p218
+p211
 sS'Incidents'
-p219
+p212
 S"['EndEvent']"
-p220
+p213
 sS'NeededResources'
-p221
+p214
 S'[]'
-p222
+p215
 sS'DetStore'
-p223
+p216
 S'StoreGateSvc/DetectorStore'
-p224
+p217
 ssS'Streams'
-p225
-(dp226
+p218
+(dp219
 S'ExtraOutputs'
-p227
+p220
 S'[]'
-p228
+p221
 sS'EvtStore'
-p229
+p222
 S'StoreGateSvc'
-p230
+p223
 sS'ExtraInputs'
-p231
+p224
 S'[]'
-p232
+p225
 sS'Members'
-p233
+p226
 S'[]'
-p234
+p227
 sS'NeededResources'
-p235
+p228
 S'[]'
-p236
+p229
 sS'DetStore'
-p237
+p230
 S'StoreGateSvc/DetectorStore'
-p238
+p231
 ssS'NTupleSvc'
-p239
-(dp240
+p232
+(dp233
 S'InhibitPathes'
-p241
+p234
 S'[]'
-p242
+p235
 sS'Input'
-p243
+p236
 S'[]'
-p244
+p237
 sS'Output'
-p245
+p238
 S'[]'
-p246
+p239
 ssS'EventPersistencySvc'
-p247
-(dp248
+p240
+(dp241
 S'CnvServices'
-p249
+p242
 S'[]'
-p250
+p243
 ssS'AthAlgSeq'
-p251
-(dp252
+p244
+(dp245
 S'ExtraOutputs'
-p253
+p246
 S'[]'
-p254
-sS'IgnoreFilterPassed'
-p255
-S'True'
-p256
+p247
+sS'Members'
+p248
+S"['SGInputLoader/SGInputLoader']"
+p249
 sS'EvtStore'
-p257
+p250
 S'StoreGateSvc'
-p258
+p251
 sS'ExtraInputs'
-p259
+p252
 S'[]'
-p260
+p253
 sS'StopOverride'
-p261
+p254
 S'True'
-p262
-sS'Members'
-p263
-S"['SGInputLoader/SGInputLoader']"
-p264
+p255
+sS'IgnoreFilterPassed'
+p256
+S'True'
+p257
 sS'NeededResources'
-p265
+p258
 S'[]'
-p266
+p259
 sS'DetStore'
-p267
+p260
 S'StoreGateSvc/DetectorStore'
-p268
+p261
 ssS'AthAllAlgSeq'
-p269
-(dp270
+p262
+(dp263
 S'ExtraOutputs'
-p271
+p264
 S'[]'
-p272
+p265
 sS'EvtStore'
-p273
+p266
 S'StoreGateSvc'
-p274
+p267
 sS'ExtraInputs'
-p275
+p268
 S'[]'
-p276
+p269
 sS'StopOverride'
-p277
+p270
 S'True'
-p278
+p271
 sS'Members'
-p279
+p272
 S"['AthSequencer/AthAlgSeq', 'AthSequencer/AthCondSeq']"
-p280
+p273
 sS'NeededResources'
-p281
+p274
 S'[]'
-p282
+p275
 sS'DetStore'
-p283
+p276
 S'StoreGateSvc/DetectorStore'
-p284
+p277
 ssS'AthenaSealSvc'
-p285
-(dp286
+p278
+(dp279
 S'DictNames'
-p287
+p280
 S'[]'
-p288
+p281
 sS'IgnoreDicts'
-p289
+p282
 S"['libSealCLHEPDict']"
-p290
+p283
 sS'IgnoreNames'
-p291
+p284
 S"['Gaudi', 'GaudiPython::Interface', 'GaudiPython::Helper', 'FactoryTable', 'IInterface', 'IFactory', 'IAlgFactory', 'ISvcFactory', 'IToolFactory', 'InterfaceID', 'StatusCode', 'IAppMgrUI', 'IProperty', 'Property', 'std::vector<Property*>', 'std::vector<const Property*>', 'std::list<IAlgorithm*>', 'std::list<IService*>', 'std::list<const IFactory*>', 'std::vector<IRegistry*>', 'SimpleProperty', 'SimplePropertyRef', 'IService', 'IAlgorithm', 'ISvcManager', 'IAlgManager', 'IJobOptionsSvc', 'ISvcLocator', 'IEventProcessor', 'IDataProviderSvc', 'IDataManagerSvc', 'IRegistry', 'ContainedObject', 'std::vector<const ContainedObject*>', 'DataObject', 'IHistogramSvc', 'AIDA::I', 'Algorithm', 'Service', 'GaudiPython::PyAlgorithm', 'GaudiPython::PyAlgorithmWrap', 'IParticlePropertySvc', 'ParticleProperty', 'StoreGateSvc', 'IStoragePolicy', 'CharDbArray', 'DoubleDbArray', 'FloatDbArray', 'IntDbArray', 'LongDbArray', 'ShortDbArray', 'AthenaEventLoopMgr', 'MinimalEventLoopMgr', 'PyAthenaEventLoopMgr', 'NTuple::Directory', 'NTuple::File ', 'NTuple::Tuple', 'INTuple', 'NTuple::Tuple', 'greater<int>', 'allocator<', 'string']"
-p292
+p285
 ssS'IncidentProcAlg2'
-p293
-(dp294
+p286
+(dp287
 S'ExtraOutputs'
-p295
+p288
 S'[]'
-p296
+p289
 sS'NeededResources'
-p297
+p290
 S'[]'
-p298
+p291
 sS'ExtraInputs'
-p299
+p292
 S'[]'
-p300
+p293
 ssS'DetectorStore'
-p301
-(dp302
+p294
+(dp295
 S'IncidentSvc'
-p303
+p296
 S'IncidentSvc'
-p304
+p297
 sS'ProxyProviderSvc'
-p305
+p298
 S'ProxyProviderSvc'
-p306
+p299
 ssS'ConditionStore'
-p307
-(dp308
+p300
+(dp301
 S'IncidentSvc'
-p309
+p302
 S'IncidentSvc'
-p310
+p303
 sS'ProxyProviderSvc'
-p311
+p304
 S'ProxyProviderSvc'
-p312
+p305
 ssS'IncidentProcAlg1'
-p313
-(dp314
+p306
+(dp307
 S'ExtraOutputs'
-p315
+p308
 S'[]'
-p316
+p309
 sS'NeededResources'
-p317
+p310
 S'[]'
-p318
+p311
 sS'ExtraInputs'
-p319
+p312
 S'[]'
-p320
+p313
 ssS'HistogramDataSvc'
-p321
-(dp322
+p314
+(dp315
 S'Input'
-p323
+p316
 S'[]'
-p324
+p317
 sS'InhibitPathes'
-p325
+p318
 S'[]'
-p326
+p319
 ssS'HistoryStore'
-p327
-(dp328
+p320
+(dp321
 S'IncidentSvc'
-p329
+p322
 S'IncidentSvc'
-p330
+p323
 sS'ProxyProviderSvc'
-p331
+p324
 S'ProxyProviderSvc'
-p332
+p325
 ss.ccollections
 defaultdict
 p1
@@ -813,7 +799,7 @@ p81
 g40
 sS'ExtSvc'
 p82
-S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StatusCodeSvc/StatusCodeSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'SG::HiveMgrSvc/EventDataSvc', 'AlgResourcePool/AlgResourcePool', 'AvalancheSchedulerSvc/AvalancheSchedulerSvc', 'AthenaHiveEventLoopMgr/AthenaHiveEventLoopMgr', 'TimelineSvc/TimelineSvc', 'JobOptionsSvc/JobOptionsSvc']"
+S"['ToolSvc/ToolSvc', 'AuditorSvc/AuditorSvc', 'MessageSvc/MessageSvc', 'IncidentSvc/IncidentSvc', 'EvtPersistencySvc/EventPersistencySvc', 'HistogramSvc/HistogramDataSvc', 'NTupleSvc/NTupleSvc', 'RndmGenSvc/RndmGenSvc', 'ChronoStatSvc/ChronoStatSvc', 'StoreGateSvc/StoreGateSvc', 'StoreGateSvc/DetectorStore', 'StoreGateSvc/HistoryStore', 'StoreGateSvc/ConditionStore', 'ClassIDSvc/ClassIDSvc', 'AthDictLoaderSvc/AthDictLoaderSvc', 'AthenaSealSvc/AthenaSealSvc', 'CoreDumpSvc/CoreDumpSvc', 'SG::HiveMgrSvc/EventDataSvc', 'AlgResourcePool/AlgResourcePool', 'AvalancheSchedulerSvc/AvalancheSchedulerSvc', 'AthenaHiveEventLoopMgr/AthenaHiveEventLoopMgr', 'TimelineSvc/TimelineSvc', 'JobOptionsSvc/JobOptionsSvc']"
 p83
 sS'AuditAlgorithms'
 p84