diff --git a/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
index 1b218ebb97965a961fd4f671077982d20e86c0ab..2ca1927d4282cfa903249231f04854837eb76ef0 100644
--- a/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
@@ -1,13 +1,13 @@
-Wed Dec  6 20:09:07 CET 2017
+Wed Dec 13 13:37:55 CET 2017
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/b8b99ab992] -- built on [2017-12-06T1522]
+Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/5c32a9a2b2] -- built on [2017-12-13T1129]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_BasicJobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 5437 configurables from 59 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5439 configurables from 37 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO Can't set int to string property (this is correct)
 Py:Athena            INFO Can't set non-existing property (this is correct)
@@ -46,7 +46,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 |-StopOverride               = False
 |-TimeOut                    = 0.0
 |-Timeline                   = True
-|-UserStore                  = ServiceHandle('UserDataSvc/UserDataSvc')
 |=/***** Algorithm TopAlgorithm/TopAlgorithm *********************************************************
 | |-AuditAlgorithms            = False
 | |-AuditBeginRun              = False
@@ -85,7 +84,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | |-TheTool                    = PrivateToolHandle('ToolSpace::TemplatedTool<double>/TSTT')
 | |                            (default: 'ToolUsingTool')
 | |-Timeline                   = True
-| |-UserStore                  = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/TSTT ***************************************
 | | |-AuditFinalize     = False
 | | |-AuditInitialize   = False
@@ -102,7 +100,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-Factor            = 1.0
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 2  (default: 0)
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/TSTT) ------------------------------
 | |=/***** Private AlgTool ConcreteTool/Tool1 **********************************************************
 | | |-AuditFinalize     = False
@@ -120,7 +117,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-Factor            = 1.0
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 2  (default: 0)
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/Tool1) -------------------------------------------------
 | |=/***** Private AlgTool ToolUsingTool/Tool2 *********************************************************
 | | |-AuditFinalize     = False
@@ -141,7 +137,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
 | | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
 | | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/ConcreteTool ***************************************************
 | | | |-AuditFinalize     = False
 | | | |-AuditInitialize   = False
@@ -158,7 +153,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 2  (default: 0)
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ConcreteTool) ------------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
 | | | |-AuditFinalize     = False
@@ -176,7 +170,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 2  (default: 0)
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/Tool2) ------------------------------------------------
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/Tool3 **************************************
@@ -195,7 +188,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-Factor            = 1.0
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 2  (default: 0)
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/Tool3) -----------------------------
 | \----- (End of Algorithm TopAlgorithm/TopAlgorithm) ------------------------------------------------
 |=/***** Algorithm TopAlgorithm/MyAlg ****************************************************************
@@ -237,7 +229,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | |-TheSvc                     = ServiceHandle('QotdSvc')  (default: 'ConcreteSvc')
 | |-TheTool                    = PrivateToolHandle('ToolUsingTool/ToolUsingTool')  (default: 'ToolUsingTool')
 | |-Timeline                   = True
-| |-UserStore                  = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ConcreteTool/PyCT1 **********************************************************
 | | |-AuditFinalize     = False
 | | |-AuditInitialize   = False
@@ -254,7 +245,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-Factor            = 1.0
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 2  (default: 0)
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/PyCT1) -------------------------------------------------
 | |=/***** Private AlgTool ConcreteTool/PyCT2 **********************************************************
 | | |-AuditFinalize     = False
@@ -272,7 +262,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-Factor            = 1.0
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 2  (default: 0)
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/PyCT2) -------------------------------------------------
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTT3 ************************************
 | | |-AuditFinalize     = False
@@ -290,7 +279,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-Factor            = 30  (default: 1.0)
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 2  (default: 0)
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTT3) ---------------------------
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTT4 ************************************
 | | |-AuditFinalize     = False
@@ -308,7 +296,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-Factor            = 40  (default: 1.0)
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 2  (default: 0)
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTT4) ---------------------------
 | |=/***** Private AlgTool ToolUsingTool/Special *******************************************************
 | | |-AuditFinalize     = False
@@ -331,7 +318,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |                   (default: 'ConcreteTool')
 | | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/PySpSubTool'])
 | | |                   (default: "['ConcreteTool/CxxDefaultTool']")
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/PySpSubTool ****************************************************
 | | | |-AuditFinalize     = False
 | | | |-AuditInitialize   = False
@@ -348,7 +334,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | | |-Factor            = 3.1415  (default: 1.0)
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 2  (default: 0)
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/PySpSubTool) -------------------------------------------
 | | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTTSp1 **********************************
 | | | |-AuditFinalize     = False
@@ -366,7 +351,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | | |-Factor            = 6.283  (default: 1.0)
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 2  (default: 0)
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTTSp1) -------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/Special) ----------------------------------------------
 | |=/***** Private AlgTool ToolUsingTool/ToolUsingTool *************************************************
@@ -388,7 +372,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
 | | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
 | | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/ConcreteTool ***************************************************
 | | | |-AuditFinalize     = False
 | | | |-AuditInitialize   = False
@@ -405,7 +388,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 2  (default: 0)
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ConcreteTool) ------------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
 | | | |-AuditFinalize     = False
@@ -423,7 +405,6 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 2  (default: 0)
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/ToolUsingTool) ----------------------------------------
 | \----- (End of Algorithm TopAlgorithm/MyAlg) -------------------------------------------------------
@@ -432,8 +413,8 @@ Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 [?1034hApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v29r0)
-                                          running on lxplus021.cern.ch on Wed Dec  6 20:09:25 2017
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r0)
+                                          running on lxplus048.cern.ch on Wed Dec 13 13:38:17 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -441,11 +422,11 @@ ApplicationMgr                     INFO Updating Gaudi::PluginService::SetDebug(
 StatusCodeSvc                      INFO initialize
 AthDictLoaderSvc                   INFO in initialize...
 AthDictLoaderSvc                   INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 2398 CLIDRegistry entries for module ALL
+ClassIDSvc                         INFO  getRegistryEntries: read 2318 CLIDRegistry entries for module ALL
 ChronoStatSvc                      INFO  Number of skipped events for MemStat-1
 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
+AthenaEventLoopMgr                 INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
 TopAlgorithm                      DEBUG Property update for OutputLevel : new value = 2
 TopAlgorithm.TSTT                 DEBUG Property update for OutputLevel : new value = 2
 TopAlgorithm                       INFO Retrieved TheTool = PrivateToolHandle('ToolSpace::TemplatedTool<double>/TSTT')
@@ -537,9 +518,9 @@ MyAlg                             DEBUG Data Deps for MyAlg
 HistogramPersistencySvc         WARNING Histograms saving not required.
 ApplicationMgr                     INFO Application Manager Initialized successfully
 ApplicationMgr                     INFO Application Manager Started successfully
-ClassIDSvc           INFO  getRegistryEntries: read 1330 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
+ClassIDSvc                         INFO  getRegistryEntries: read 1358 CLIDRegistry entries for module ALL
+AthenaEventLoopMgr                 INFO   ===>>>  start of run 1    <<<===
+AthenaEventLoopMgr                 INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 TopAlgorithm                       INFO got this quote [Your day will be somewhat dictated by authority].
 TopAlgorithm                      DEBUG no reading requested
 TopAlgorithm                       INFO doing my work ...
@@ -628,8 +609,8 @@ ToolSvc.PyTSTT7                    INFO performing templated task factor ( 1) ..
 ToolSvc.PyTSTT7                    INFO ... templated task is done
 MyAlg                              INFO ... my work is done! 
 MyAlg                             DEBUG wrote data: 1.2957e+59 for key: BBB
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
-AthenaEventLoopMgr   INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
+AthenaEventLoopMgr                 INFO   ===>>>  done processing event #1, run #1 1 events processed so far  <<<===
+AthenaEventLoopMgr                 INFO   ===>>>  start processing event #2, run #1 1 events processed so far  <<<===
 TopAlgorithm                       INFO got this quote [Your day will be somewhat dictated by authority].
 TopAlgorithm                      DEBUG no reading requested
 TopAlgorithm                       INFO doing my work ...
@@ -715,7 +696,7 @@ ToolSvc.PyTSTT7                    INFO performing templated task factor ( 1) ..
 ToolSvc.PyTSTT7                    INFO ... templated task is done
 MyAlg                              INFO ... my work is done! 
 MyAlg                             DEBUG wrote data: 1.00913e+59 for key: BBB
-AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
+AthenaEventLoopMgr                 INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
 ApplicationMgr                     INFO Application Manager Stopped successfully
 IncidentProcAlg1                   INFO Finalize
 IncidentProcAlg2                   INFO Finalize
@@ -726,7 +707,7 @@ ToolSvc                            INFO Removing all tools created by ToolSvc
 *****Chrono*****                   INFO ****************************************************************************************************
 *****Chrono*****                   INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****                   INFO ****************************************************************************************************
-ChronoStatSvc                      INFO Time User   : Tot=  220 [ms]                                             #=  1
+ChronoStatSvc                      INFO Time User   : Tot=  260 [ms]                                             #=  1
 *****Chrono*****                   INFO ****************************************************************************************************
 ChronoStatSvc.finalize()           INFO  Service finalized successfully 
 ApplicationMgr                     INFO Application Manager Finalized successfully
diff --git a/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
index 35c436a81684593804e80b7495e0f58df0c584ae..9a4aad8cc41b4e6b3545285d91654ce2ac360c9e 100644
--- a/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
@@ -1,15 +1,15 @@
-Wed Dec  6 20:16:34 CET 2017
+Wed Dec 13 13:37:55 CET 2017
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/b8b99ab992] -- built on [2017-12-06T1522]
+Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/5c32a9a2b2] -- built on [2017-12-13T1129]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_CustomToolJobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 5437 configurables from 59 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5439 configurables from 37 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
-{'TheTool': <ToolUsingTool/YourTopAlg.ToolUsingTool at 0x7f69c81ccd10>, 'ErrorMax': '<no value>', 'RndmFactor': '<no value>', 'PublicToolList': PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6']), 'AuditExecute': '<no value>', 'EmptyPublicTool': PublicToolHandle(''), 'AuditReinitialize': '<no value>', 'EmptyPrivateTool': PrivateToolHandle(''), 'InputKey': '<no value>', 'AuditRestart': '<no value>', 'OutputKey': '<no value>', 'MonitorService': '<no value>', 'Enable': '<no value>', 'Timeline': '<no value>', 'UserStore': ServiceHandle('UserDataSvc/UserDataSvc'), 'AuditFinalize': '<no value>', 'PrivateToolList': PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3']), 'AuditEndRun': '<no value>', 'NeededResources': [], 'AuditBeginRun': '<no value>', 'AutoRetrieveTools': '<no value>', 'FilterCircularDependencies': '<no value>', 'ExtraOutputs': [], 'IsIOBound': '<no value>', 'AuditInitialize': '<no value>', 'OutputLevel': '<no value>', 'ExtraInputs': [], 'AuditStop': '<no value>', 'DetStore': ServiceHandle('StoreGateSvc/DetectorStore'), 'TheSvc': ServiceHandle('ConcreteSvc'), 'Cardinality': '<no value>', 'EvtStore': ServiceHandle('StoreGateSvc'), 'AuditStart': '<no value>', 'RegisterForContextService': '<no value>', 'AuditAlgorithms': '<no value>', 'ThePublicTool': PublicToolHandle('ConcreteTool'), 'ErrorCounter': '<no value>'}
+{'TheTool': <ToolUsingTool/YourTopAlg.ToolUsingTool at 0x7f4ff0064470>, 'ErrorMax': '<no value>', 'RndmFactor': '<no value>', 'PublicToolList': PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6']), 'AuditExecute': '<no value>', 'EmptyPublicTool': PublicToolHandle(''), 'AuditReinitialize': '<no value>', 'EmptyPrivateTool': PrivateToolHandle(''), 'InputKey': '<no value>', 'AuditRestart': '<no value>', 'OutputKey': '<no value>', 'MonitorService': '<no value>', 'Enable': '<no value>', 'Timeline': '<no value>', 'AuditFinalize': '<no value>', 'PrivateToolList': PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3']), 'AuditEndRun': '<no value>', 'NeededResources': [], 'AuditBeginRun': '<no value>', 'AutoRetrieveTools': '<no value>', 'FilterCircularDependencies': '<no value>', 'ExtraOutputs': [], 'IsIOBound': '<no value>', 'AuditInitialize': '<no value>', 'OutputLevel': '<no value>', 'ExtraInputs': [], 'AuditStop': '<no value>', 'DetStore': ServiceHandle('StoreGateSvc/DetectorStore'), 'TheSvc': ServiceHandle('ConcreteSvc'), 'Cardinality': '<no value>', 'EvtStore': ServiceHandle('StoreGateSvc'), 'AuditStart': '<no value>', 'RegisterForContextService': '<no value>', 'AuditAlgorithms': '<no value>', 'ThePublicTool': PublicToolHandle('ConcreteTool'), 'ErrorCounter': '<no value>'}
 /***** Algorithm AthSequencer/TopAlg ***************************************************************
 |-Atomic                     = False
 |-AuditAlgorithms            = False
@@ -45,7 +45,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 |-StopOverride               = False
 |-TimeOut                    = 0.0
 |-Timeline                   = True
-|-UserStore                  = ServiceHandle('UserDataSvc/UserDataSvc')
 |=/***** Algorithm TopAlgorithm/MyTopAlg *************************************************************
 | |-AuditAlgorithms            = False
 | |-AuditBeginRun              = False
@@ -83,7 +82,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | |-TheSvc                     = ServiceHandle('ConcreteSvc')
 | |-TheTool                    = PrivateToolHandle('ToolUsingTool/CustomTool')  (default: 'ToolUsingTool')
 | |-Timeline                   = True
-| |-UserStore                  = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ToolUsingTool/CustomTool ****************************************************
 | | |-AuditFinalize     = False
 | | |-AuditInitialize   = False
@@ -103,7 +101,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
 | | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ToolTool')
 | | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
 | | | |-AuditFinalize     = False
 | | | |-AuditInitialize   = False
@@ -120,7 +117,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 0
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/ToolTool *******************************************************
 | | | |-AuditFinalize     = False
@@ -138,7 +134,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 0
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ToolTool) ----------------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/CustomTool) -------------------------------------------
 | \----- (End of Algorithm TopAlgorithm/MyTopAlg) ----------------------------------------------------
@@ -179,7 +174,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | |-TheSvc                     = ServiceHandle('ConcreteSvc')
 | |-TheTool                    = PrivateToolHandle('ToolUsingTool/CustomTool2')  (default: 'ToolUsingTool')
 | |-Timeline                   = True
-| |-UserStore                  = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ToolUsingTool/CustomTool2 ***************************************************
 | | |-AuditFinalize     = False
 | | |-AuditInitialize   = False
@@ -199,7 +193,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
 | | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ToolTool')  (default: 'ConcreteTool')
 | | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
 | | | |-AuditFinalize     = False
 | | | |-AuditInitialize   = False
@@ -216,7 +209,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 0
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/ToolTool *******************************************************
 | | | |-AuditFinalize     = False
@@ -234,7 +226,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 0
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ToolTool) ----------------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/CustomTool2) ------------------------------------------
 | |=/***** Private AlgTool ConcreteTool/Tool1 **********************************************************
@@ -253,7 +244,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | |-Factor            = 1.0
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 0
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/Tool1) -------------------------------------------------
 | |=/***** Private AlgTool ToolUsingTool/Tool2 *********************************************************
 | | |-AuditFinalize     = False
@@ -274,7 +264,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
 | | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
 | | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/ConcreteTool ***************************************************
 | | | |-AuditFinalize     = False
 | | | |-AuditInitialize   = False
@@ -291,7 +280,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 0
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ConcreteTool) ------------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
 | | | |-AuditFinalize     = False
@@ -309,7 +297,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | | |-Factor            = 1.0
 | | | |-MonitorService    = 'MonitorSvc'
 | | | |-OutputLevel       = 0
-| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/Tool2) ------------------------------------------------
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/Tool3 **************************************
@@ -328,7 +315,6 @@ Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 | | |-Factor            = 1.0
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 0
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/Tool3) -----------------------------
 | \----- (End of Algorithm TopAlgorithm/YourTopAlg) --------------------------------------------------
 \----- (End of Algorithm AthSequencer/TopAlg) ------------------------------------------------------
@@ -336,8 +322,8 @@ Py:Athena            INFO including file "AthenaCommon/runbatch.py"
 [?1034hApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v29r0)
-                                          running on lxplus021.cern.ch on Wed Dec  6 20:16:51 2017
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r0)
+                                          running on lxplus048.cern.ch on Wed Dec 13 13:38:17 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -345,7 +331,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 2398 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2318 CLIDRegistry entries for module ALL
 ChronoStatSvc        INFO  Number of skipped events for MemStat-1
 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) 
@@ -382,7 +368,7 @@ YourTopAlg           INFO Empty public tool is empty (OK)
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr       INFO Application Manager Started successfully
-ClassIDSvc           INFO  getRegistryEntries: read 1330 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1358 CLIDRegistry entries for module ALL
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 MyTopAlg             INFO got this quote [Your day will be somewhat dictated by authority].
@@ -540,7 +526,7 @@ ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-ChronoStatSvc        INFO Time User   : Tot=  190 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  280 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
index eab831e43a500423f33eaede2f447f15d2b8d14b..329e51fd2bbd9f6d07adef67fbd2f82c5f727711 100644
--- a/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
@@ -1,7 +1,7 @@
-Wed Dec  6 20:23:10 CET 2017
+Wed Dec 13 13:37:55 CET 2017
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/b8b99ab992] -- built on [2017-12-06T1522]
+Py:Athena            INFO using release [AthenaWorkDir-22.0.0] [x86_64-slc6-gcc62-dbg] [atlas-work3/5c32a9a2b2] -- built on [2017-12-13T1129]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
@@ -42,7 +42,6 @@ Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_Custom
 |-StopOverride               = False
 |-TimeOut                    = 0.0
 |-Timeline                   = True
-|-UserStore                  = ServiceHandle('UserDataSvc/UserDataSvc')
 |=/***** Algorithm TopAlgorithm/MyCustomAlg **********************************************************
 | |-AuditAlgorithms            = False
 | |-AuditBeginRun              = False
@@ -80,7 +79,6 @@ Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_Custom
 | |-TheSvc                     = ServiceHandle('ConcreteSvc')
 | |-TheTool                    = PrivateToolHandle('ConcreteTool/ConcreteTool')
 | |-Timeline                   = True
-| |-UserStore                  = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ConcreteTool/ConcreteTool ***************************************************
 | | |-AuditFinalize     = False
 | | |-AuditInitialize   = False
@@ -97,18 +95,17 @@ Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_Custom
 | | |-Factor            = 1.0
 | | |-MonitorService    = 'MonitorSvc'
 | | |-OutputLevel       = 0
-| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/ConcreteTool) ------------------------------------------
 | \----- (End of Algorithm TopAlgorithm/MyCustomAlg) -------------------------------------------------
 \----- (End of Algorithm AthSequencer/TopAlg) ------------------------------------------------------
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-Py:ConfigurableDb    INFO Read module info for 5437 configurables from 59 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5439 configurables from 37 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 [?1034hApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v29r0)
-                                          running on lxplus021.cern.ch on Wed Dec  6 20:23:31 2017
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v30r0)
+                                          running on lxplus048.cern.ch on Wed Dec 13 13:38:18 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -116,7 +113,7 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 2398 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2318 CLIDRegistry entries for module ALL
 ChronoStatSvc        INFO  Number of skipped events for MemStat-1
 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) 
@@ -138,7 +135,7 @@ MyCustomAlg          INFO Empty public tool is empty (OK)
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr       INFO Application Manager Started successfully
-ClassIDSvc           INFO  getRegistryEntries: read 1330 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1358 CLIDRegistry entries for module ALL
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
 MyCustomAlg          INFO got this quote [Your day will be somewhat dictated by authority].
@@ -214,7 +211,7 @@ ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-ChronoStatSvc        INFO Time User   : Tot=  250 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  270 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully