diff --git a/Control/DataModelTest/DataModelRunTests/share/CondReadWrite.ref b/Control/DataModelTest/DataModelRunTests/share/CondReadWrite.ref
index de9d96d61dfd80412f4c9e984e5d8cf20c0d6118..aedea9599219fd3313da1c3a9bccfffd5df373a0 100644
--- a/Control/DataModelTest/DataModelRunTests/share/CondReadWrite.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/CondReadWrite.ref
@@ -1,7 +1,7 @@
-Thu Dec  6 06:22:29 CET 2018
+Sun Jan 20 03:32:05 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3/fa0fd6d0989] -- built on [2018-12-06T0538]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/7fb5304f19] -- built on [2019-01-19T2316]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
@@ -22,7 +22,7 @@ Folder created
 >== Storing COOL object succeeded. Current content:
 [0,0] - [0,5) (0) [xint (Int32) : 10]
 [0,5] - [2147483647,4294967295) (0) [xint (Int32) : 20]
-Py:ConfigurableDb    INFO Read module info for 5473 configurables from 53 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 55 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 EventInfoMgtInit: Got release version  Athena-22.0.1
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
@@ -32,7 +32,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus077.cern.ch on Thu Dec  6 06:23:23 2018
+                                          running on lxplus076.cern.ch on Sun Jan 20 03:32:47 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -40,53 +40,54 @@ ApplicationMgr                                     INFO Updating Gaudi::PluginSe
 StatusCodeSvc                                      INFO initialize
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 2946 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 3047 CLIDRegistry entries for module ALL
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaEventLoopMgr                                 INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc                                         INFO  getRegistryEntries: read 1818 CLIDRegistry entries for module ALL
-CondInputLoader                                    INFO Initializing CondInputLoader...
-MetaDataSvc                                        INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc                                   INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-PoolSvc                                            INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
-PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
-PoolSvc                                            INFO Frontier compression level set to 5
-DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-04T2300/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus077.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-PoolSvc                                            INFO Successfully setup replica sorting algorithm
-PoolSvc                                            INFO Setting up APR FileCatalog and Streams
-PoolSvc                                         WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc                                         WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc                                            INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc                                            INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession                                          INFO     Open     DbSession    
-Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
-IOVDbSvc                                           INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc                                           INFO Only 5 POOL conditions files will be open at once
-IOVDbFolder                                        INFO Read from meta data only for folder /TagInfo
-IOVDbFolder                                        INFO Extensible folder /DMTest/TestAttrList
-IOVDbSvc                                           INFO Initialised with 2 connections and 2 folders
-IOVDbSvc                                           INFO Service IOVDbSvc initialised successfully
-IOVDbSvc                                           INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc                                           INFO Opening COOL connection for sqlite://;schema=condtest_rw.db;dbname=OFLP200
-IOVSvc                                             INFO No IOVSvcTool associated with store "StoreGateSvc"
-IOVSvcTool                                         INFO IOVRanges will be checked at every Run
-IOVDbSvc                                           INFO Disconnecting from sqlite://;schema=condtest_rw.db;dbname=OFLP200
-IOVDbSvc                                           INFO Added taginfo remove for /DMTest/TestAttrList
-ClassIDSvc                                         INFO  getRegistryEntries: read 1341 CLIDRegistry entries for module ALL
-CondInputLoader                                    INFO Adding base classes:
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 1829 CLIDRegistry entries for module ALL
+CondInputLoader                             0      INFO Initializing CondInputLoader...
+MetaDataSvc                                 0      INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
+AthenaPoolCnvSvc                            0      INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
+PoolSvc                                     0      INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
+PoolSvc                                     0      INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
+PoolSvc                                     0      INFO Frontier compression level set to 5
+DBReplicaSvc                                0      INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc                                0      INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-18T2347/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc                                0      INFO Total of 10 servers found for host lxplus076.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+PoolSvc                                     0      INFO Successfully setup replica sorting algorithm
+PoolSvc                                     0      INFO Setting up APR FileCatalog and Streams
+PoolSvc                                     0   WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc                                     0   WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc                                     0      INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
+PoolSvc                                     0      INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession                                   0      INFO     Open     DbSession    
+Domain[ROOT_All]                            0      INFO >   Access   DbDomain     READ      [ROOT_All] 
+MetaDataSvc                                 0      INFO Found MetaDataTools = PublicToolHandleArray([])
+IOVDbSvc                                    0      INFO Opened read transaction for POOL PersistencySvc
+IOVDbSvc                                    0      INFO Only 5 POOL conditions files will be open at once
+IOVDbFolder                                 0      INFO Read from meta data only for folder /TagInfo
+IOVDbFolder                                 0      INFO Extensible folder /DMTest/TestAttrList
+IOVDbSvc                                    0      INFO Initialised with 2 connections and 2 folders
+IOVDbSvc                                    0      INFO Service IOVDbSvc initialised successfully
+IOVDbSvc                                    0      INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc                                    0      INFO Opening COOL connection for sqlite://;schema=condtest_rw.db;dbname=OFLP200
+IOVSvc                                      0      INFO No IOVSvcTool associated with store "StoreGateSvc"
+IOVSvcTool                                  0      INFO IOVRanges will be checked at every Run
+IOVDbSvc                                    0      INFO Disconnecting from sqlite://;schema=condtest_rw.db;dbname=OFLP200
+IOVDbSvc                                    0      INFO Added taginfo remove for /DMTest/TestAttrList
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 1346 CLIDRegistry entries for module ALL
+CondInputLoader                             0      INFO Adding base classes:
   +  ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TestAttrList' )   ->
-CondInputLoader                                    INFO Will create WriteCondHandle dependencies for the following DataObjects:
+CondInputLoader                             0      INFO Will create WriteCondHandle dependencies for the following DataObjects:
     +  ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TestAttrList' ) 
-HistogramPersistencySvc                         WARNING Histograms saving not required.
-EventSelector                                      INFO  Enter McEventSelector Initialization 
-AthenaEventLoopMgr                                 INFO Setup EventSelector service EventSelector
-ApplicationMgr                                     INFO Application Manager Initialized successfully
-ClassIDSvc                                         INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
-CondInputLoader                                    INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TestAttrList'
-ApplicationMgr                                     INFO Application Manager Started successfully
-EventPersistencySvc                                INFO Added successfully Conversion service:McCnvSvc
+HistogramPersistencySvc                     0   WARNING Histograms saving not required.
+EventSelector                               0      INFO  Enter McEventSelector Initialization 
+AthenaEventLoopMgr                          0      INFO Setup EventSelector service EventSelector
+ApplicationMgr                              0      INFO Application Manager Initialized successfully
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
+CondInputLoader                             0      INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TestAttrList'
+ApplicationMgr                              0      INFO Application Manager Started successfully
+EventPersistencySvc                         0      INFO Added successfully Conversion service:McCnvSvc
 AthenaEventLoopMgr                      0   0      INFO   ===>>>  start of run 0    <<<===
 EventPersistencySvc                     0   0      INFO Added successfully Conversion service:AthenaPoolCnvSvc
 EventPersistencySvc                     0   0      INFO Added successfully Conversion service:TagInfoMgr
@@ -266,10 +267,10 @@ IncidentProcAlg1                        19  0      INFO Finalize
 CondInputLoader                         19  0      INFO Finalizing CondInputLoader...
 IncidentProcAlg2                        19  0      INFO Finalize
 EventSelector                           19  0      INFO finalize
-IOVDbFolder                             19  0      INFO Folder /DMTest/TestAttrList (AttrList) db-read 20/26 objs/chan/bytes 47/1/188 ((     0.11 ))s
-IOVDbSvc                                19  0      INFO  bytes in ((      0.11 ))s
+IOVDbFolder                             19  0      INFO Folder /DMTest/TestAttrList (AttrList) db-read 20/26 objs/chan/bytes 47/1/192 ((     0.05 ))s
+IOVDbSvc                                19  0      INFO  bytes in ((      0.05 ))s
 IOVDbSvc                                19  0      INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
-IOVDbSvc                                19  0      INFO Connection sqlite://;schema=condtest_rw.db;dbname=OFLP200 : nConnect: 21 nFolders: 1 ReadTime: ((     0.11 ))s
+IOVDbSvc                                19  0      INFO Connection sqlite://;schema=condtest_rw.db;dbname=OFLP200 : nConnect: 21 nFolders: 1 ReadTime: ((     0.05 ))s
 AthDictLoaderSvc                        19  0      INFO in finalize...
 ToolSvc                                 19  0      INFO Removing all tools created by ToolSvc
 ChronoStatSvc.finalize()                19  0      INFO  Service finalized successfully 
diff --git a/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref b/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
index 8800bc3257b859465ccae8f425d6456bc4d1e754..999a525d6524844979e902f400fa61d6c44c0b7d 100644
--- a/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/CondReaderMT.ref
@@ -1,7 +1,7 @@
-Tue Dec 11 15:26:14 CET 2018
+Sun Jan 20 03:38:58 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3g/fc1ea6b7761] -- built on [2018-12-11T1514]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/7fb5304f19] -- built on [2019-01-19T2316]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
@@ -10,7 +10,7 @@ Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/CondReaderMT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/CondReader_jo.py"
 Py:Athena            INFO including file "AthenaPoolCnvSvc/AthenaPool_jobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 5443 configurables from 42 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 55 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "DataModelRunTests/loadReadDicts.py"
 EventInfoMgtInit: Got release version  Athena-22.0.1
@@ -22,14 +22,14 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus079.cern.ch on Tue Dec 11 15:26:37 2018
+                                          running on lxplus076.cern.ch on Sun Jan 20 03:39:43 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 3632 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 3685 CLIDRegistry entries for module ALL
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaHiveEventLoopMgr                             INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
@@ -39,48 +39,49 @@ PoolSvc                                            INFO io_register[PoolSvc](xml
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-12-10T2259/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus079.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-18T2347/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus076.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                            INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
 DbSession                                          INFO     Open     DbSession    
 Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
+MetaDataSvc                                        INFO Found MetaDataTools = PublicToolHandleArray([])
 IOVDbSvc                                           INFO Opened read transaction for POOL PersistencySvc
 IOVDbSvc                                           INFO Only 5 POOL conditions files will be open at once
 IOVDbSvc                                           INFO Cache alignment will be done in 3 slices
 IOVDbFolder                                        INFO Read from meta data only for folder /TagInfo
 IOVDbSvc                                           INFO Initialised with 2 connections and 5 folders
 IOVDbSvc                                           INFO Service IOVDbSvc initialised successfully
-ClassIDSvc                                         INFO  getRegistryEntries: read 2898 CLIDRegistry entries for module ALL
-PyComponentMgr                                     INFO Initializing PyComponentMgr...
-LoadReadDicts                                      INFO Initializing LoadReadDicts...
-ClassIDSvc                                         INFO  getRegistryEntries: read 7066 CLIDRegistry entries for module ALL
-CondInputLoader                                    INFO Initializing CondInputLoader...
-IOVDbSvc                                           INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
-IOVDbSvc                                           INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
-IOVSvc                                             INFO No IOVSvcTool associated with store "StoreGateSvc"
-IOVSvcTool                                         INFO IOVRanges will be checked at every Event
-IOVDbSvc                                           INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
-IOVDbSvc                                           INFO Added taginfo remove for /DMTest/RLTest
-IOVDbSvc                                           INFO Added taginfo remove for /DMTest/S2
-IOVDbSvc                                           INFO Added taginfo remove for /DMTest/TSTest
-IOVDbSvc                                           INFO Added taginfo remove for /DMTest/TestAttrList
-CondInputLoader                                    INFO Adding base classes:
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 2903 CLIDRegistry entries for module ALL
+PyComponentMgr                              0      INFO Initializing PyComponentMgr...
+LoadReadDicts                               0      INFO Initializing LoadReadDicts...
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 7066 CLIDRegistry entries for module ALL
+CondInputLoader                             0      INFO Initializing CondInputLoader...
+IOVDbSvc                                    0      INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
+IOVDbSvc                                    0      INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
+IOVSvc                                      0      INFO No IOVSvcTool associated with store "StoreGateSvc"
+IOVSvcTool                                  0      INFO IOVRanges will be checked at every Event
+IOVDbSvc                                    0      INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
+IOVDbSvc                                    0      INFO Added taginfo remove for /DMTest/RLTest
+IOVDbSvc                                    0      INFO Added taginfo remove for /DMTest/S2
+IOVDbSvc                                    0      INFO Added taginfo remove for /DMTest/TSTest
+IOVDbSvc                                    0      INFO Added taginfo remove for /DMTest/TestAttrList
+CondInputLoader                             0      INFO Adding base classes:
   +  ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/RLTest' )   ->
   +  ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TSTest' )   ->
   +  ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TestAttrList' )   ->
   +  ( 'DMTest::S2' , 'ConditionStore+/DMTest/S2' )   -> DMTest::S1 (243020043)
-CondInputLoader                                    INFO Will create WriteCondHandle dependencies for the following DataObjects:
+CondInputLoader                             0      INFO Will create WriteCondHandle dependencies for the following DataObjects:
     +  ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/RLTest' ) 
     +  ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TSTest' ) 
     +  ( 'AthenaAttributeList' , 'ConditionStore+/DMTest/TestAttrList' ) 
     +  ( 'DMTest::S1' , 'ConditionStore+/DMTest/S2' ) 
     +  ( 'DMTest::S2' , 'ConditionStore+/DMTest/S2' ) 
-ThreadPoolSvc                                      INFO no thread init tools attached
-AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc                              INFO Found 10 algorithms
-AvalancheSchedulerSvc                              INFO Data Dependencies for Algorithms:
+ThreadPoolSvc                               0      INFO no thread init tools attached
+AvalancheSchedulerSvc                       0      INFO Activating scheduler in a separate thread
+AvalancheSchedulerSvc                       0      INFO Found 10 algorithms
+AvalancheSchedulerSvc                       0      INFO Data Dependencies for Algorithms:
   BeginIncFiringAlg
       none
   IncidentProcAlg1
@@ -115,27 +116,27 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
       none
   IncidentProcAlg2
       none
-AvalancheSchedulerSvc                              INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
+AvalancheSchedulerSvc                       0      INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
    o  ( 'EventInfo' , 'StoreGateSvc+McEventInfo' )     required by Algorithm: 
        * DMTest::CondReaderAlg
-PrecedenceSvc                                      INFO Assembling CF and DF task precedence rules
-PrecedenceRulesGraph                               INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
-PrecedenceSvc                                      INFO PrecedenceSvc initialized successfully
-AvalancheSchedulerSvc                              INFO Concurrency level information:
-AvalancheSchedulerSvc                              INFO  o Number of events in flight: 1
-AvalancheSchedulerSvc                              INFO  o TBB thread pool size:  'ThreadPoolSize':1
-HistogramPersistencySvc                         WARNING Histograms saving not required.
-EventSelector                                      INFO  Enter McEventSelector Initialization 
-AthenaHiveEventLoopMgr                             INFO Setup EventSelector service EventSelector
-ApplicationMgr                                     INFO Application Manager Initialized successfully
-PoolSvc                                            INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
-ClassIDSvc                                         INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
-CondInputLoader                                    INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/RLTest'
-CondInputLoader                                    INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TSTest'
-CondInputLoader                                    INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TestAttrList'
-CondInputLoader                                    INFO created CondCont<DMTest::S2> with key 'ConditionStore+/DMTest/S2'
-ApplicationMgr                                     INFO Application Manager Started successfully
-AthenaHiveEventLoopMgr                             INFO Starting loop on events
+PrecedenceSvc                               0      INFO Assembling CF and DF task precedence rules
+PrecedenceRulesGraph                        0      INFO CondSvc found. DF precedence rules will be augmented with 'Conditions'
+PrecedenceSvc                               0      INFO PrecedenceSvc initialized successfully
+AvalancheSchedulerSvc                       0      INFO Concurrency level information:
+AvalancheSchedulerSvc                       0      INFO  o Number of events in flight: 1
+AvalancheSchedulerSvc                       0      INFO  o TBB thread pool size:  'ThreadPoolSize':1
+HistogramPersistencySvc                     0   WARNING Histograms saving not required.
+EventSelector                               0      INFO  Enter McEventSelector Initialization 
+AthenaHiveEventLoopMgr                      0      INFO Setup EventSelector service EventSelector
+ApplicationMgr                              0      INFO Application Manager Initialized successfully
+PoolSvc                                     0      INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
+CondInputLoader                             0      INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/RLTest'
+CondInputLoader                             0      INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TSTest'
+CondInputLoader                             0      INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/DMTest/TestAttrList'
+CondInputLoader                             0      INFO created CondCont<DMTest::S2> with key 'ConditionStore+/DMTest/S2'
+ApplicationMgr                              0      INFO Application Manager Started successfully
+AthenaHiveEventLoopMgr                      0      INFO Starting loop on events
 EventPersistencySvc                     0   0      INFO Added successfully Conversion service:McCnvSvc
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start of run 0    <<<===
 EventPersistencySvc                     0   0      INFO Added successfully Conversion service:AthenaPoolCnvSvc
@@ -144,7 +145,7 @@ ClassIDSvc                              0   0      INFO  getRegistryEntries: rea
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #0, run #0 on slot 0,  0 events processed so far  <<<===
 IOVDbSvc                                0   0      INFO Opening COOL connection for sqlite://;schema=condtest.db;dbname=OFLP200
 IOVDbSvc                                0   0      INFO Disconnecting from sqlite://;schema=condtest.db;dbname=OFLP200
-Domain[ROOT_All]                        0   0      INFO ->  Access   DbDatabase   READ      [ROOT_All] A834E12A-0572-2942-88EC-5A969061BCA7
+Domain[ROOT_All]                        0   0      INFO ->  Access   DbDatabase   READ      [ROOT_All] 7D5FA637-9F94-F945-B609-15DC691119C4
 Domain[ROOT_All]                        0   0      INFO                           condtest.pool.root
 RootDatabase.open                       0   0      INFO condtest.pool.root File version:61404
 DMTest::CondReaderAlg                   0   0      INFO Event 0 LBN 0
@@ -417,9 +418,9 @@ DMTest::CondReaderAlg                   29  0      INFO   rl xint (int) : 7
 DMTest::CondReaderAlg                   29  0      INFO   ts xint (int) : 900
 DMTest::CondReaderAlg                   29  0      INFO   s3 907
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #29, run #0 on slot 0,  30 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 1.70628
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.59194
 condtest.pool.root                                 INFO Database being retired...
-Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] A834E12A-0572-2942-88EC-5A969061BCA7
+Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 7D5FA637-9F94-F945-B609-15DC691119C4
 Domain[ROOT_All]                                   INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
@@ -431,10 +432,10 @@ EventSelector                                      INFO finalize
 AvalancheSchedulerSvc                              INFO Joining Scheduler thread
 PyComponentMgr                                     INFO Finalizing PyComponentMgr...
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
-IOVDbFolder                                        INFO Folder /DMTest/RLTest (AttrList) db-read 1/7 objs/chan/bytes 7/1/28 ((     0.01 ))s
-IOVDbFolder                                        INFO Folder /DMTest/S2 (PoolRef) db-read 1/5 objs/chan/bytes 15/1/2715 ((     0.00 ))s
-IOVDbFolder                                        INFO Folder /DMTest/TSTest (AttrList) db-read 1/9 objs/chan/bytes 9/1/36 ((     0.00 ))s
-IOVDbFolder                                        INFO Folder /DMTest/TestAttrList (AttrList) db-read 1/10 objs/chan/bytes 30/1/120 ((     0.00 ))s
+IOVDbFolder                                        INFO Folder /DMTest/RLTest (AttrList) db-read 1/7 objs/chan/bytes 7/1/32 ((     0.01 ))s
+IOVDbFolder                                        INFO Folder /DMTest/S2 (PoolRef) db-read 1/5 objs/chan/bytes 15/1/2896 ((     0.00 ))s
+IOVDbFolder                                        INFO Folder /DMTest/TSTest (AttrList) db-read 1/9 objs/chan/bytes 9/1/40 ((     0.00 ))s
+IOVDbFolder                                        INFO Folder /DMTest/TestAttrList (AttrList) db-read 1/10 objs/chan/bytes 30/1/124 ((     0.00 ))s
 IOVDbSvc                                           INFO  bytes in ((      0.01 ))s
 IOVDbSvc                                           INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: ((     0.00 ))s
 IOVDbSvc                                           INFO Connection sqlite://;schema=condtest.db;dbname=OFLP200 : nConnect: 2 nFolders: 4 ReadTime: ((     0.01 ))s
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
index 6e9413716294c42932a2fac162d61936bbbcfa65..b25249820c62d9777428fc0066ac1afe16a9b920 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle1MT.ref
@@ -1,7 +1,7 @@
-Fri Feb  2 16:13:28 CET 2018
+Sun Jan 20 03:54:55 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3g/fe158bca093] -- built on [2018-02-02T1445]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/7fb5304f19] -- built on [2019-01-19T2316]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
@@ -9,32 +9,32 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestDecorHandle1MT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestDecorHandle1_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5453 configurables from 7 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 55 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 [?1034hApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r1)
-                                          running on lxplus011.cern.ch on Fri Feb  2 16:14:00 2018
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
+                                          running on lxplus076.cern.ch on Sun Jan 20 03:55:17 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 2846 CLIDRegistry entries for module ALL
-ChronoStatSvc                                      INFO  Number of skipped events for MemStat-1
+ClassIDSvc                                         INFO  getRegistryEntries: read 3685 CLIDRegistry entries for module ALL
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaHiveEventLoopMgr                             INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc                                         INFO  getRegistryEntries: read 7054 CLIDRegistry entries for module ALL
-ClassIDSvc                                         INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
-ThreadPoolSvc                                      INFO no thread init tools attached
-AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc                              INFO Found 10 algorithms
-AvalancheSchedulerSvc                              INFO Data Dependencies for Algorithms:
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 7925 CLIDRegistry entries for module ALL
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+ThreadPoolSvc                               0      INFO no thread init tools attached
+AvalancheSchedulerSvc                       0      INFO Activating scheduler in a separate thread
+AvalancheSchedulerSvc                       0      INFO Found 10 algorithms
+AvalancheSchedulerSvc                       0      INFO Data Dependencies for Algorithms:
   BeginIncFiringAlg
       none
   IncidentProcAlg1
@@ -75,27 +75,27 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
       none
   IncidentProcAlg2
       none
-AvalancheSchedulerSvc                              INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
+AvalancheSchedulerSvc                       0      INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
    o  ( 'EventInfo' , 'StoreGateSvc+McEventInfo' )     required by Algorithm: 
        * xAODTestDecor
        * xAODTestWrite
        * xAODTestWriteCInfo
        * xAODTestWriteCVec
-PrecedenceSvc                                      INFO Assembling CF and DF task precedence rules
-PrecedenceSvc                                      INFO PrecedenceSvc initialized successfully
-AvalancheSchedulerSvc                              INFO Concurrency level information:
-AvalancheSchedulerSvc                              INFO  o Number of events in flight: 1
-AvalancheSchedulerSvc                              INFO  o TBB thread pool size:  'ThreadPoolSize':1
-HistogramPersistencySvc                         WARNING Histograms saving not required.
-EventSelector                                      INFO  Enter McEventSelector Initialization 
-AthenaHiveEventLoopMgr                             INFO Setup EventSelector service EventSelector
-ApplicationMgr                                     INFO Application Manager Initialized successfully
-ApplicationMgr                                     INFO Application Manager Started successfully
-AthenaHiveEventLoopMgr                             INFO Starting loop on events
+PrecedenceSvc                               0      INFO Assembling CF and DF task precedence rules
+PrecedenceSvc                               0      INFO PrecedenceSvc initialized successfully
+AvalancheSchedulerSvc                       0      INFO Concurrency level information:
+AvalancheSchedulerSvc                       0      INFO  o Number of events in flight: 1
+AvalancheSchedulerSvc                       0      INFO  o TBB thread pool size:  'ThreadPoolSize':1
+HistogramPersistencySvc                     0   WARNING Histograms saving not required.
+EventSelector                               0      INFO  Enter McEventSelector Initialization 
+AthenaHiveEventLoopMgr                      0      INFO Setup EventSelector service EventSelector
+ApplicationMgr                              0      INFO Application Manager Initialized successfully
+ApplicationMgr                              0      INFO Application Manager Started successfully
+AthenaHiveEventLoopMgr                      0      INFO Starting loop on events
 EventPersistencySvc                     0   0      INFO Added successfully Conversion service:McCnvSvc
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start of run 0    <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #0, run #0 on slot 0,  0 events processed so far  <<<===
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
 xAODTestReadDecor                       0   0      INFO cvec.dInt1: 401 402 403 404 405 406 407 408 409 410
 xAODTestReadDecor                       0   0      INFO cinfo.dInt1: 3000
 xAODTestReadDecor                       0   0      INFO cinfo.dInt1Base: 3001
@@ -215,14 +215,13 @@ xAODTestReadDecor                       19  0      INFO cinfo.dInt1: 60000
 xAODTestReadDecor                       19  0      INFO cinfo.dInt1Base: 60001
 xAODTestReadDecor                       19  0      INFO cinfo.dInt1: 60000
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.459334
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.0617592
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
 SGInputLoader                                      INFO Finalizing SGInputLoader...
 IncidentProcAlg2                                   INFO Finalize
 EventSelector                                      INFO finalize
 AvalancheSchedulerSvc                              INFO Joining Scheduler thread
-AvalancheSchedulerSvc                   19  0      INFO Terminating thread-pool resources
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
 AthDictLoaderSvc                                   INFO in finalize...
 ToolSvc                                            INFO Removing all tools created by ToolSvc
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
index 47c5bda161d67681487b614943fab170a2b35b70..46443a9cc14e8ab62e44982d95151386dc636fa6 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestDecorHandle2MT.ref
@@ -1,7 +1,7 @@
-Tue Oct  9 19:15:18 CEST 2018
+Sun Jan 20 03:55:59 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc8-dbg] [atlas-work3/eea13fb904b] -- built on [2018-10-09T1607]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/7fb5304f19] -- built on [2019-01-19T2316]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
@@ -9,7 +9,7 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestDecorHandle2MT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestDecorHandle2_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5504 configurables from 72 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 55 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "DataModelRunTests/loadReadDicts.py"
 Py:Athena            INFO including file "DataModelRunTests/setCatalog.py"
@@ -19,15 +19,15 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r3)
-                                          running on lxplus028.cern.ch on Tue Oct  9 19:15:43 2018
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
+                                          running on lxplus076.cern.ch on Sun Jan 20 03:56:20 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 3632 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 3685 CLIDRegistry entries for module ALL
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaHiveEventLoopMgr                             INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
@@ -36,13 +36,14 @@ AthenaPoolCnvSvc                                   INFO Initializing AthenaPoolC
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-10-08T2213/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-18T2347/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus076.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                            INFO POOL WriteCatalog is file:xAODTestDecorHandle2MT_catalog.xml
 DbSession                                          INFO     Open     DbSession    
 Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
+MetaDataSvc                                        INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool'])
 EventSelector                                      INFO Initializing EventSelector - package version EventSelectorAthenaPool-00-00-00
 EventSelector                                      INFO reinitialization...
 EventSelector                                      INFO EventSelection with query 
@@ -81,18 +82,18 @@ Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase
 Domain[ROOT_All]                                   INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 DbSession                                          INFO     Open     DbSession    
 Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] 193567E1-5DA3-394A-8C65-9C3A154628D8
+Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] D4AD9562-BDC5-3A43-9B45-7B8A2D9851C8
 Domain[ROOT_All]                                   INFO                           xaoddata.root
 RootDatabase.open                                  INFO xaoddata.root File version:61404
-ClassIDSvc                                         INFO  getRegistryEntries: read 1996 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 2050 CLIDRegistry entries for module ALL
 EventPersistencySvc                                INFO Added successfully Conversion service:AthenaPoolCnvSvc
-ClassIDSvc                                         INFO  getRegistryEntries: read 1080 CLIDRegistry entries for module ALL
-PyComponentMgr                                     INFO Initializing PyComponentMgr...
-LoadReadDicts                                      INFO Initializing LoadReadDicts...
-ThreadPoolSvc                                      INFO no thread init tools attached
-AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc                              INFO Found 7 algorithms
-AvalancheSchedulerSvc                              INFO Data Dependencies for Algorithms:
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 1139 CLIDRegistry entries for module ALL
+PyComponentMgr                              0      INFO Initializing PyComponentMgr...
+LoadReadDicts                               0      INFO Initializing LoadReadDicts...
+ThreadPoolSvc                               0      INFO no thread init tools attached
+AvalancheSchedulerSvc                       0      INFO Activating scheduler in a separate thread
+AvalancheSchedulerSvc                       0      INFO Found 7 algorithms
+AvalancheSchedulerSvc                       0      INFO Data Dependencies for Algorithms:
   BeginIncFiringAlg
       none
   IncidentProcAlg1
@@ -109,33 +110,33 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
       none
   IncidentProcAlg2
       none
-AvalancheSchedulerSvc                              INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
+AvalancheSchedulerSvc                       0      INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
    o  ( 'DMTest::CVec' , 'StoreGateSvc+cvec.dInt1' )     required by Algorithm: 
        * xAODTestReadDecor
    o  ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1' )     required by Algorithm: 
        * xAODTestReadDecor
    o  ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1Base' )     required by Algorithm: 
        * xAODTestReadDecor
-PrecedenceSvc                                      INFO Assembling CF and DF task precedence rules
-PrecedenceSvc                                      INFO PrecedenceSvc initialized successfully
-AvalancheSchedulerSvc                              INFO Concurrency level information:
-AvalancheSchedulerSvc                              INFO  o Number of events in flight: 1
-AvalancheSchedulerSvc                              INFO  o TBB thread pool size:  'ThreadPoolSize':1
-HistogramPersistencySvc                         WARNING Histograms saving not required.
-AthenaHiveEventLoopMgr                             INFO Setup EventSelector service EventSelector
-ApplicationMgr                                     INFO Application Manager Initialized successfully
-PoolSvc                                            INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
-xaoddata.root                                      INFO Database being retired...
-Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 193567E1-5DA3-394A-8C65-9C3A154628D8
-Domain[ROOT_All]                                   INFO >   Deaccess DbDomain     READ      [ROOT_All] 
-DbSession                                          INFO     Open     DbSession    
-Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] 193567E1-5DA3-394A-8C65-9C3A154628D8
-Domain[ROOT_All]                                   INFO                           xaoddata.root
-RootDatabase.open                                  INFO xaoddata.root File version:61404
-ApplicationMgr                                     INFO Application Manager Started successfully
-AthenaHiveEventLoopMgr                             INFO Starting loop on events
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 6960 CLIDRegistry entries for module ALL
+PrecedenceSvc                               0      INFO Assembling CF and DF task precedence rules
+PrecedenceSvc                               0      INFO PrecedenceSvc initialized successfully
+AvalancheSchedulerSvc                       0      INFO Concurrency level information:
+AvalancheSchedulerSvc                       0      INFO  o Number of events in flight: 1
+AvalancheSchedulerSvc                       0      INFO  o TBB thread pool size:  'ThreadPoolSize':1
+HistogramPersistencySvc                     0   WARNING Histograms saving not required.
+AthenaHiveEventLoopMgr                      0      INFO Setup EventSelector service EventSelector
+ApplicationMgr                              0      INFO Application Manager Initialized successfully
+PoolSvc                                     0      INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
+xaoddata.root                               0      INFO Database being retired...
+Domain[ROOT_All]                            0      INFO ->  Deaccess DbDatabase   READ      [ROOT_All] D4AD9562-BDC5-3A43-9B45-7B8A2D9851C8
+Domain[ROOT_All]                            0      INFO >   Deaccess DbDomain     READ      [ROOT_All] 
+DbSession                                   0      INFO     Open     DbSession    
+Domain[ROOT_All]                            0      INFO >   Access   DbDomain     READ      [ROOT_All] 
+Domain[ROOT_All]                            0      INFO ->  Access   DbDatabase   READ      [ROOT_All] D4AD9562-BDC5-3A43-9B45-7B8A2D9851C8
+Domain[ROOT_All]                            0      INFO                           xaoddata.root
+RootDatabase.open                           0      INFO xaoddata.root File version:61404
+ApplicationMgr                              0      INFO Application Manager Started successfully
+AthenaHiveEventLoopMgr                      0      INFO Starting loop on events
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 6971 CLIDRegistry entries for module ALL
 AthenaPoolConverter                     0   0      INFO massageEventInfo: unable to get OverrideRunNumberFromInput property from EventSelector 
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start of run 0    <<<===
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #0, run #0 on slot 0,  0 events processed so far  <<<===
@@ -260,9 +261,9 @@ xAODTestReadDecor                       19  0      INFO cinfo.dInt1: 60000
 xAODTestReadDecor                       19  0      INFO cinfo.dInt1Base: 60001
 xAODTestReadDecor                       19  0      INFO cinfo.dInt1: 60000
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.549882
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.175549
 xaoddata.root                                      INFO Database being retired...
-Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 193567E1-5DA3-394A-8C65-9C3A154628D8
+Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] D4AD9562-BDC5-3A43-9B45-7B8A2D9851C8
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
 SGInputLoader                                      INFO Finalizing SGInputLoader...
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadRenameMT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadRenameMT.ref
index 8f778d87b79cec8444175e0f27af2a1f745c123e..727d030ce84123f11962aca7e974025520f24b8a 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestReadRenameMT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestReadRenameMT.ref
@@ -1,7 +1,7 @@
-Fri Nov 30 18:48:19 CET 2018
+Sun Jan 20 17:03:43 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc62-opt] [atlas-work3g/fd1aa8b860d] -- built on [2018-11-30T1805]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/7fb5304f19] -- built on [2019-01-19T2316]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
@@ -9,7 +9,7 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestReadRenameMT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestReadRename_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5428 configurables from 6 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 55 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "DataModelRunTests/loadReadDicts.py"
 Py:Athena            INFO including file "DataModelRunTests/setCatalog.py"
@@ -20,14 +20,14 @@ MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
-                                          running on lxplus082.cern.ch on Fri Nov 30 18:48:33 2018
+                                          running on lxplus076.cern.ch on Sun Jan 20 17:04:03 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 3632 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 3685 CLIDRegistry entries for module ALL
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaHiveEventLoopMgr                             INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
@@ -36,13 +36,14 @@ AthenaPoolCnvSvc                                   INFO Initializing AthenaPoolC
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-11-29T2311/Athena/22.0.1/InstallArea/x86_64-slc6-gcc62-opt/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus082.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-18T2347/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus076.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                            INFO POOL WriteCatalog is file:xAODTestReadRenameMT_catalog.xml
 DbSession                                          INFO     Open     DbSession    
 Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
+MetaDataSvc                                        INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool'])
 EventSelector                                      INFO Initializing EventSelector - package version EventSelectorAthenaPool-00-00-00
 EventSelector                                      INFO reinitialization...
 EventSelector                                      INFO EventSelection with query 
@@ -81,20 +82,20 @@ Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase
 Domain[ROOT_All]                                   INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 DbSession                                          INFO     Open     DbSession    
 Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] E0040A5B-580B-AC43-A2CF-6AC575B5D8A5
+Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] 16C596E8-D0DA-9D44-8818-EFDA82CF74F9
 Domain[ROOT_All]                                   INFO                           xaoddata.root
 RootDatabase.open                                  INFO xaoddata.root File version:61404
-ClassIDSvc                                         INFO  getRegistryEntries: read 1989 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 2050 CLIDRegistry entries for module ALL
 EventPersistencySvc                                INFO Added successfully Conversion service:AthenaPoolCnvSvc
 ClassIDSvc                                         INFO  getRegistryEntries: read 2 CLIDRegistry entries for module ALL
-ClassIDSvc                                         INFO  getRegistryEntries: read 7330 CLIDRegistry entries for module ALL
-ClassIDSvc                                         INFO  getRegistryEntries: read 65 CLIDRegistry entries for module ALL
-PyComponentMgr                                     INFO Initializing PyComponentMgr...
-LoadReadDicts                                      INFO Initializing LoadReadDicts...
-ThreadPoolSvc                                      INFO no thread init tools attached
-AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc                              INFO Found 8 algorithms
-AvalancheSchedulerSvc                              INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 7387 CLIDRegistry entries for module ALL
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+PyComponentMgr                              0      INFO Initializing PyComponentMgr...
+LoadReadDicts                               0      INFO Initializing LoadReadDicts...
+ThreadPoolSvc                               0      INFO no thread init tools attached
+AvalancheSchedulerSvc                       0      INFO Activating scheduler in a separate thread
+AvalancheSchedulerSvc                       0      INFO Found 8 algorithms
+AvalancheSchedulerSvc                       0      INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
    o  ( 'DMTest::CVec' , 'StoreGateSvc+cvec_renamed' )     required by Algorithm: 
        * xAODTestReadCVec
    o  ( 'DMTest::CVec' , 'StoreGateSvc+cvec_renamed.dInt1_renamed' )     required by Algorithm: 
@@ -103,26 +104,26 @@ AvalancheSchedulerSvc                              INFO Will attribute the follo
        * xAODTestReadDecor
    o  ( 'SG::AuxElement' , 'StoreGateSvc+cinfo.dInt1_renamedBase' )     required by Algorithm: 
        * xAODTestReadDecor
-PrecedenceSvc                                      INFO Assembling CF and DF task precedence rules
-PrecedenceSvc                                      INFO PrecedenceSvc initialized successfully
-AvalancheSchedulerSvc                              INFO Concurrency level information:
-AvalancheSchedulerSvc                              INFO  o Number of events in flight: 1
-AvalancheSchedulerSvc                              INFO  o TBB thread pool size:  'ThreadPoolSize':1
-HistogramPersistencySvc                         WARNING Histograms saving not required.
-AthenaHiveEventLoopMgr                             INFO Setup EventSelector service EventSelector
-ApplicationMgr                                     INFO Application Manager Initialized successfully
-PoolSvc                                            INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
-xaoddata.root                                      INFO Database being retired...
-Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] E0040A5B-580B-AC43-A2CF-6AC575B5D8A5
-Domain[ROOT_All]                                   INFO >   Deaccess DbDomain     READ      [ROOT_All] 
-DbSession                                          INFO     Open     DbSession    
-Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] E0040A5B-580B-AC43-A2CF-6AC575B5D8A5
-Domain[ROOT_All]                                   INFO                           xaoddata.root
-RootDatabase.open                                  INFO xaoddata.root File version:61404
-ApplicationMgr                                     INFO Application Manager Started successfully
-AthenaHiveEventLoopMgr                             INFO Starting loop on events
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 714 CLIDRegistry entries for module ALL
+PrecedenceSvc                               0      INFO Assembling CF and DF task precedence rules
+PrecedenceSvc                               0      INFO PrecedenceSvc initialized successfully
+AvalancheSchedulerSvc                       0      INFO Concurrency level information:
+AvalancheSchedulerSvc                       0      INFO  o Number of events in flight: 1
+AvalancheSchedulerSvc                       0      INFO  o TBB thread pool size:  'ThreadPoolSize':1
+HistogramPersistencySvc                     0   WARNING Histograms saving not required.
+AthenaHiveEventLoopMgr                      0      INFO Setup EventSelector service EventSelector
+ApplicationMgr                              0      INFO Application Manager Initialized successfully
+PoolSvc                                     0      INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
+xaoddata.root                               0      INFO Database being retired...
+Domain[ROOT_All]                            0      INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 16C596E8-D0DA-9D44-8818-EFDA82CF74F9
+Domain[ROOT_All]                            0      INFO >   Deaccess DbDomain     READ      [ROOT_All] 
+DbSession                                   0      INFO     Open     DbSession    
+Domain[ROOT_All]                            0      INFO >   Access   DbDomain     READ      [ROOT_All] 
+Domain[ROOT_All]                            0      INFO ->  Access   DbDatabase   READ      [ROOT_All] 16C596E8-D0DA-9D44-8818-EFDA82CF74F9
+Domain[ROOT_All]                            0      INFO                           xaoddata.root
+RootDatabase.open                           0      INFO xaoddata.root File version:61404
+ApplicationMgr                              0      INFO Application Manager Started successfully
+AthenaHiveEventLoopMgr                      0      INFO Starting loop on events
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 716 CLIDRegistry entries for module ALL
 AthenaPoolConverter                     0   0      INFO massageEventInfo: unable to get OverrideRunNumberFromInput property from EventSelector 
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start of run 0    <<<===
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #0, run #0 on slot 0,  0 events processed so far  <<<===
@@ -1238,9 +1239,9 @@ xAODTestReadDecor                       19  0      INFO cinfo.dInt1_renamed: 600
 xAODTestReadDecor                       19  0      INFO cinfo.dInt1_renamedBase: 60001
 xAODTestReadDecor                       19  0      INFO cinfo.dInt1_renamed: 60000
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.319653
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.500661
 xaoddata.root                                      INFO Database being retired...
-Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] E0040A5B-580B-AC43-A2CF-6AC575B5D8A5
+Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 16C596E8-D0DA-9D44-8818-EFDA82CF74F9
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
 SGInputLoader                                      INFO Finalizing SGInputLoader...
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
index 865d82b3660354f5be5c3dc7f1e051ee32e238c4..1c713ab8267cc3a575a8ed2828acf72096d2d609 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks1MT.ref
@@ -1,7 +1,7 @@
-Tue Jan  2 16:45:21 PST 2018
+Sun Jan 20 16:47:26 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [dev/3227fd4b6f] -- built on [2018-01-02T1642]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/7fb5304f19] -- built on [2019-01-19T2316]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
@@ -9,23 +9,23 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestSymlinks1MT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestSymlinks1_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5430 configurables from 7 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 55 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 [?1034hApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r1)
-                                          running on zeus on Tue Jan  2 16:45:33 2018
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
+                                          running on lxplus076.cern.ch on Sun Jan 20 16:47:52 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 2845 CLIDRegistry entries for module ALL
-ChronoStatSvc                                      INFO  Number of skipped events for MemStat-1
+ClassIDSvc                                         INFO  getRegistryEntries: read 3685 CLIDRegistry entries for module ALL
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaHiveEventLoopMgr                             INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
@@ -34,22 +34,22 @@ AthenaPoolCnvSvc                                   INFO Initializing AthenaPoolC
 PoolSvc                                            INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
-DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(proxyurl=http://msquid01-ib.nersc.gov:3128)(proxyurl=http://msquid02-ib.nersc.gov:3128) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /bld2/build/v30r1.002/build/install/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO No specific match for domain found - use default fallback
-DBReplicaSvc                                       INFO Total of 2 servers found for host zeus [ATLF atlas_dd ]
+DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-18T2347/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus076.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                            INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
 DbSession                                          INFO     Open     DbSession    
 Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
-ClassIDSvc                                         INFO  getRegistryEntries: read 7463 CLIDRegistry entries for module ALL
-ClassIDSvc                                         INFO  getRegistryEntries: read 61 CLIDRegistry entries for module ALL
-xAODTestAlg                                     WARNING Implicit circular data dependency detected for id  ( 'SG::AuxElement' , 'StoreGateSvc+cinfo2' ) 
-ThreadPoolSvc                                      INFO no thread init tools attached
-AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc                              INFO Found 10 algorithms
-AvalancheSchedulerSvc                              INFO Data Dependencies for Algorithms:
+MetaDataSvc                                        INFO Found MetaDataTools = PublicToolHandleArray([])
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 8611 CLIDRegistry entries for module ALL
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 67 CLIDRegistry entries for module ALL
+xAODTestAlg                                 0   WARNING Implicit circular data dependency detected for id  ( 'SG::AuxElement' , 'StoreGateSvc+cinfo2' ) 
+ThreadPoolSvc                               0      INFO no thread init tools attached
+AvalancheSchedulerSvc                       0      INFO Activating scheduler in a separate thread
+AvalancheSchedulerSvc                       0      INFO Found 10 algorithms
+AvalancheSchedulerSvc                       0      INFO Data Dependencies for Algorithms:
   BeginIncFiringAlg
       none
   IncidentProcAlg1
@@ -88,27 +88,28 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
       none
   IncidentProcAlg2
       none
-AvalancheSchedulerSvc                              INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
+AvalancheSchedulerSvc                       0      INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
    o  ( 'EventInfo' , 'StoreGateSvc+McEventInfo' )     required by Algorithm: 
        * xAODTestAlg
        * xAODTestWriteCInfo
        * xAODTestWriteCVec
        * xAODTestWriteSymlinks
-PrecedenceSvc                                      INFO Assembling CF and DF task precedence rules
-PrecedenceSvc                                      INFO PrecedenceSvc initialized successfully
-AvalancheSchedulerSvc                              INFO Concurrency level information:
-AvalancheSchedulerSvc                              INFO  o Number of events in flight: 1
-AvalancheSchedulerSvc                              INFO  o TBB thread pool size:  'ThreadPoolSize':1
-HistogramPersistencySvc                         WARNING Histograms saving not required.
-EventSelector                                      INFO  Enter McEventSelector Initialization 
-AthenaHiveEventLoopMgr                             INFO Setup EventSelector service EventSelector
-ApplicationMgr                                     INFO Application Manager Initialized successfully
-ApplicationMgr                                     INFO Application Manager Started successfully
-AthenaHiveEventLoopMgr                             INFO Starting loop on events
+PrecedenceSvc                               0      INFO Assembling CF and DF task precedence rules
+PrecedenceSvc                               0      INFO PrecedenceSvc initialized successfully
+AvalancheSchedulerSvc                       0      INFO Concurrency level information:
+AvalancheSchedulerSvc                       0      INFO  o Number of events in flight: 1
+AvalancheSchedulerSvc                       0      INFO  o TBB thread pool size:  'ThreadPoolSize':1
+HistogramPersistencySvc                     0   WARNING Histograms saving not required.
+EventSelector                               0      INFO  Enter McEventSelector Initialization 
+AthenaHiveEventLoopMgr                      0      INFO Setup EventSelector service EventSelector
+ApplicationMgr                              0      INFO Application Manager Initialized successfully
+PoolSvc                                     0      INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
+ApplicationMgr                              0      INFO Application Manager Started successfully
+AthenaHiveEventLoopMgr                      0      INFO Starting loop on events
 EventPersistencySvc                     0   0      INFO Added successfully Conversion service:McCnvSvc
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start of run 0    <<<===
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #0, run #0 on slot 0,  0 events processed so far  <<<===
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 108 CLIDRegistry entries for module ALL
 xAODTestReadSymlink                     0   0      INFO C (as AuxElement): 1000; S 0
 xAODTestAlg.xAODTestReadSymlinkTool     0   0      INFO From tool: C (as AuxElement): 1000; S 0
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #0, run #0 on slot 0,  1 events processed so far  <<<===
@@ -188,7 +189,7 @@ AthenaHiveEventLoopMgr                  19  0      INFO   ===>>>  start processi
 xAODTestReadSymlink                     19  0      INFO C (as AuxElement): 20000; S 1900
 xAODTestAlg.xAODTestReadSymlinkTool     19  0      INFO From tool: C (as AuxElement): 20000; S 1900
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.21888
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.05518
 Domain[ROOT_All]                                   INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
@@ -196,7 +197,6 @@ SGInputLoader                                      INFO Finalizing SGInputLoader
 IncidentProcAlg2                                   INFO Finalize
 EventSelector                                      INFO finalize
 AvalancheSchedulerSvc                              INFO Joining Scheduler thread
-AvalancheSchedulerSvc                   19  0      INFO Terminating thread-pool resources
 EventDataSvc                                       INFO Finalizing EventDataSvc - package version StoreGate-00-00-00
 AthDictLoaderSvc                                   INFO in finalize...
 ToolSvc                                            INFO Removing all tools created by ToolSvc
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
index d81169f440c4a764fe44d0baf5d8edf019dd037a..fb6b5642ab1b191a7cdeb4dd46da955fb0fc3122 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestSymlinks2MT.ref
@@ -1,7 +1,7 @@
-Tue Oct  9 18:42:24 CEST 2018
+Sun Jan 20 16:48:30 CET 2019
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.1] [x86_64-slc6-gcc8-dbg] [atlas-work3/eea13fb904b] -- built on [2018-10-09T1607]
+Py:Athena            INFO using release [WorkDir-22.0.1] [x86_64-slc6-gcc8-opt] [atlas-work3/7fb5304f19] -- built on [2019-01-19T2316]
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO configuring AthenaHive with [1] concurrent threads and [1] concurrent events
@@ -9,7 +9,7 @@ Py:AlgScheduler      INFO setting up AvalancheSchedulerSvc/AvalancheSchedulerSvc
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestSymlinks2MT_jo.py"
 Py:Athena            INFO including file "DataModelRunTests/xAODTestSymlinks2_jo.py"
-Py:ConfigurableDb    INFO Read module info for 5504 configurables from 72 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5455 configurables from 55 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "DataModelRunTests/loadReadDicts.py"
 Py:Athena            INFO including file "DataModelRunTests/setCatalog.py"
@@ -19,15 +19,15 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 MessageSvc           INFO Activating in a separate thread
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r3)
-                                          running on lxplus028.cern.ch on Tue Oct  9 18:42:45 2018
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r5)
+                                          running on lxplus076.cern.ch on Sun Jan 20 16:48:57 2019
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 AthDictLoaderSvc                                   INFO in initialize...
 AthDictLoaderSvc                                   INFO acquired Dso-registry
-ClassIDSvc                                         INFO  getRegistryEntries: read 3632 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 3685 CLIDRegistry entries for module ALL
 CoreDumpSvc                                        INFO install f-a-t-a-l handler... (flag = -1)
 CoreDumpSvc                                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
 AthenaHiveEventLoopMgr                             INFO Initializing AthenaHiveEventLoopMgr - package version AthenaServices-00-00-00
@@ -36,13 +36,14 @@ AthenaPoolCnvSvc                                   INFO Initializing AthenaPoolC
 PoolSvc                                            INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc                                            INFO Frontier compression level set to 5
 DBReplicaSvc                                       INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2018-10-08T2213/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-dbg/share/dbreplica.config
-DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc                                       INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-01-18T2347/Athena/22.0.1/InstallArea/x86_64-slc6-gcc8-opt/share/dbreplica.config
+DBReplicaSvc                                       INFO Total of 10 servers found for host lxplus076.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc                                            INFO Successfully setup replica sorting algorithm
 PoolSvc                                            INFO Setting up APR FileCatalog and Streams
 PoolSvc                                            INFO POOL WriteCatalog is file:xAODTestSymlinks2MT_catalog.xml
 DbSession                                          INFO     Open     DbSession    
 Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
+MetaDataSvc                                        INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool'])
 EventSelector                                      INFO Initializing EventSelector - package version EventSelectorAthenaPool-00-00-00
 EventSelector                                      INFO reinitialization...
 EventSelector                                      INFO EventSelection with query 
@@ -81,18 +82,18 @@ Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase
 Domain[ROOT_All]                                   INFO >   Deaccess DbDomain     READ      [ROOT_All] 
 DbSession                                          INFO     Open     DbSession    
 Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] 26CFC7E8-56D1-E743-B5D8-F778B489126A
+Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] 3DBE1653-BF86-AC4E-A00F-345568060F1D
 Domain[ROOT_All]                                   INFO                           xaoddata.root
 RootDatabase.open                                  INFO xaoddata.root File version:61404
-ClassIDSvc                                         INFO  getRegistryEntries: read 1996 CLIDRegistry entries for module ALL
+ClassIDSvc                                         INFO  getRegistryEntries: read 2050 CLIDRegistry entries for module ALL
 EventPersistencySvc                                INFO Added successfully Conversion service:AthenaPoolCnvSvc
-ClassIDSvc                                         INFO  getRegistryEntries: read 1080 CLIDRegistry entries for module ALL
-PyComponentMgr                                     INFO Initializing PyComponentMgr...
-LoadReadDicts                                      INFO Initializing LoadReadDicts...
-ThreadPoolSvc                                      INFO no thread init tools attached
-AvalancheSchedulerSvc                              INFO Activating scheduler in a separate thread
-AvalancheSchedulerSvc                              INFO Found 7 algorithms
-AvalancheSchedulerSvc                              INFO Data Dependencies for Algorithms:
+ClassIDSvc                                  0      INFO  getRegistryEntries: read 1139 CLIDRegistry entries for module ALL
+PyComponentMgr                              0      INFO Initializing PyComponentMgr...
+LoadReadDicts                               0      INFO Initializing LoadReadDicts...
+ThreadPoolSvc                               0      INFO no thread init tools attached
+AvalancheSchedulerSvc                       0      INFO Activating scheduler in a separate thread
+AvalancheSchedulerSvc                       0      INFO Found 7 algorithms
+AvalancheSchedulerSvc                       0      INFO Data Dependencies for Algorithms:
   BeginIncFiringAlg
       none
   IncidentProcAlg1
@@ -110,7 +111,7 @@ AvalancheSchedulerSvc                              INFO Data Dependencies for Al
       none
   IncidentProcAlg2
       none
-AvalancheSchedulerSvc                              INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
+AvalancheSchedulerSvc                       0      INFO Will attribute the following unmet INPUT dependencies to "SGInputLoader/SGInputLoader" Algorithm
    o  ( 'DMTest::S1' , 'StoreGateSvc+S2' )     required by Algorithm: 
        * xAODTestReadSymlink
    o  ( 'DMTest::S2' , 'StoreGateSvc+S2' )     required by Algorithm: 
@@ -119,26 +120,26 @@ AvalancheSchedulerSvc                              INFO Will attribute the follo
        * xAODTestReadSymlink
    o  ( 'SG::AuxElement' , 'StoreGateSvc+cinfo' )     required by Algorithm: 
        * xAODTestReadSymlink
-PrecedenceSvc                                      INFO Assembling CF and DF task precedence rules
-PrecedenceSvc                                      INFO PrecedenceSvc initialized successfully
-AvalancheSchedulerSvc                              INFO Concurrency level information:
-AvalancheSchedulerSvc                              INFO  o Number of events in flight: 1
-AvalancheSchedulerSvc                              INFO  o TBB thread pool size:  'ThreadPoolSize':1
-HistogramPersistencySvc                         WARNING Histograms saving not required.
-AthenaHiveEventLoopMgr                             INFO Setup EventSelector service EventSelector
-ApplicationMgr                                     INFO Application Manager Initialized successfully
-PoolSvc                                            INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
-xaoddata.root                                      INFO Database being retired...
-Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 26CFC7E8-56D1-E743-B5D8-F778B489126A
-Domain[ROOT_All]                                   INFO >   Deaccess DbDomain     READ      [ROOT_All] 
-DbSession                                          INFO     Open     DbSession    
-Domain[ROOT_All]                                   INFO >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All]                                   INFO ->  Access   DbDatabase   READ      [ROOT_All] 26CFC7E8-56D1-E743-B5D8-F778B489126A
-Domain[ROOT_All]                                   INFO                           xaoddata.root
-RootDatabase.open                                  INFO xaoddata.root File version:61404
-ApplicationMgr                                     INFO Application Manager Started successfully
-AthenaHiveEventLoopMgr                             INFO Starting loop on events
-ClassIDSvc                              0   0      INFO  getRegistryEntries: read 6960 CLIDRegistry entries for module ALL
+PrecedenceSvc                               0      INFO Assembling CF and DF task precedence rules
+PrecedenceSvc                               0      INFO PrecedenceSvc initialized successfully
+AvalancheSchedulerSvc                       0      INFO Concurrency level information:
+AvalancheSchedulerSvc                       0      INFO  o Number of events in flight: 1
+AvalancheSchedulerSvc                       0      INFO  o TBB thread pool size:  'ThreadPoolSize':1
+HistogramPersistencySvc                     0   WARNING Histograms saving not required.
+AthenaHiveEventLoopMgr                      0      INFO Setup EventSelector service EventSelector
+ApplicationMgr                              0      INFO Application Manager Initialized successfully
+PoolSvc                                     0      INFO Enabled implicit multithreading in ROOT via PersistencySvc to: 1
+xaoddata.root                               0      INFO Database being retired...
+Domain[ROOT_All]                            0      INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 3DBE1653-BF86-AC4E-A00F-345568060F1D
+Domain[ROOT_All]                            0      INFO >   Deaccess DbDomain     READ      [ROOT_All] 
+DbSession                                   0      INFO     Open     DbSession    
+Domain[ROOT_All]                            0      INFO >   Access   DbDomain     READ      [ROOT_All] 
+Domain[ROOT_All]                            0      INFO ->  Access   DbDatabase   READ      [ROOT_All] 3DBE1653-BF86-AC4E-A00F-345568060F1D
+Domain[ROOT_All]                            0      INFO                           xaoddata.root
+RootDatabase.open                           0      INFO xaoddata.root File version:61404
+ApplicationMgr                              0      INFO Application Manager Started successfully
+AthenaHiveEventLoopMgr                      0      INFO Starting loop on events
+ClassIDSvc                              0   0      INFO  getRegistryEntries: read 6971 CLIDRegistry entries for module ALL
 AthenaPoolConverter                     0   0      INFO massageEventInfo: unable to get OverrideRunNumberFromInput property from EventSelector 
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start of run 0    <<<===
 AthenaHiveEventLoopMgr                  0   0      INFO   ===>>>  start processing event #0, run #0 on slot 0,  0 events processed so far  <<<===
@@ -203,9 +204,9 @@ AthenaHiveEventLoopMgr                             INFO   ===>>>  done processin
 AthenaHiveEventLoopMgr                  19  0      INFO   ===>>>  start processing event #19, run #0 on slot 0,  19 events processed so far  <<<===
 xAODTestReadSymlink                     19  0      INFO C (as AuxElement): 20000; S 1900
 AthenaHiveEventLoopMgr                             INFO   ===>>>  done processing event #19, run #0 on slot 0,  20 events processed so far  <<<===
-AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 2.07953
+AthenaHiveEventLoopMgr                             INFO ---> Loop Finished (seconds): 0.186005
 xaoddata.root                                      INFO Database being retired...
-Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 26CFC7E8-56D1-E743-B5D8-F778B489126A
+Domain[ROOT_All]                                   INFO ->  Deaccess DbDatabase   READ      [ROOT_All] 3DBE1653-BF86-AC4E-A00F-345568060F1D
 ApplicationMgr                                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                                   INFO Finalize
 SGInputLoader                                      INFO Finalizing SGInputLoader...
diff --git a/Control/DataModelTest/DataModelRunTests/test/post.sh b/Control/DataModelTest/DataModelRunTests/test/post.sh
index 6e7acf37260dc978ab106e0e9ea518d1f1c59315..1ccb9e97565439d543af4091a9a23a6cf007eb52 100755
--- a/Control/DataModelTest/DataModelRunTests/test/post.sh
+++ b/Control/DataModelTest/DataModelRunTests/test/post.sh
@@ -103,7 +103,7 @@ PP="$PP"'|MetaDataSvc *ERROR MetaDataSvc::loadAddresses'
 PP="$PP"'|HistorySvc           INFO Service finalised successfully'
 PP="$PP"'|Found HelperTools = PublicToolHandleArray'
 PP="$PP"'|Py:Athena            INFO leaving with code 0: "successful run"'
-PP="$PP"'|DBReplicaSvc +INFO'
+PP="$PP"'|DBReplicaSvc[ 0]+INFO'
 PP="$PP"'|ApplicationMgr +INFO Updating ROOT::Reflex::PluginService'
 PP="$PP"'|^Py:ConfigurableDb +(WARNING|ERROR)'
 PP="$PP"'|^ClassIDSvc +ERROR processCLIDDB:'