diff --git a/AtlasTest/ControlTest/CMakeLists.txt b/AtlasTest/ControlTest/CMakeLists.txt
index 2496277368220cc150b5a24cc11d11e5cbaff8be..f1154868abd6c071446ad716b5bdaec2aaf6ee46 100644
--- a/AtlasTest/ControlTest/CMakeLists.txt
+++ b/AtlasTest/ControlTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 750131 2016-05-26 21:19:06Z ssnyder $
+# $Id: CMakeLists.txt 754379 2016-06-13 03:05:17Z ssnyder $
 ################################################################################
 # Package: ControlTest
 ################################################################################
@@ -89,9 +89,16 @@ atlas_add_test( ClearStore_test
    EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
    ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
 
+atlas_add_test( StoreID
+   SOURCES test/StoreID.cxx
+   LINK_LIBRARIES TestTools StoreGateLib
+   EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
+   ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
+
 atlas_add_test( FortranAlgorithm
    SCRIPT test/FortranAlgorithm.sh
-   EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc" )
+   EXTRA_PATTERNS "^Py:ConfigurableDb +(WARNING|INFO|ERROR)|Py:Athena +INFO including file |Warning in .TEnvRec::ChangeValue.: duplicate entry|calling initialize_|ToolSvc.finalize.. +INFO| [A-Z]+ 2[0-9][0-9][0-9]$$|^Py:Athena +INFO|[Rr]oo[Ff]it|NIKHEF|DeprecationWarning: object.__new__|^  newobj =|^\*+$$|drop-and-reload|^ *$$|we will keep the configuration around|ApplicationMgr +INFO|Start StoreGateSvc" 
+   PROPERTIES TIMEOUT 300 )
 
 if( "${CMAKE_BUILD_TYPE}" STREQUAL "Release" OR
       "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" )
diff --git a/AtlasTest/ControlTest/cmt/requirements b/AtlasTest/ControlTest/cmt/requirements
index 587287eb7e6de68005e4dd10bd5ac91a7fce60bc..7baf3f56577d13249886e37e883e5169af042dfb 100644
--- a/AtlasTest/ControlTest/cmt/requirements
+++ b/AtlasTest/ControlTest/cmt/requirements
@@ -57,6 +57,9 @@ apply_pattern UnitTest_run unit_test=ClearStore \
 macro_append ClearStore_testlinkopts " -lSGtests"
 #macro ClearStore_test_cppflags " -D __PROXYDEBUG"
 
+apply_pattern UnitTest_run unit_test=StoreID \
+  extrapatterns="^JobOptionsSvc +INFO|Service base class initialized successfully"
+
 #integration tests
 apply_pattern install_applications
 apply_pattern install_xmls
@@ -101,3 +104,4 @@ apply_pattern athenarun_test name="test_interactive_athena" \
 
 ## AthenaCommon/python unit-test
 apply_pattern declare_python_modules files="*.py"
+
diff --git a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
index d816a786781856b77fca623c7c2d82efb4c5372d..7c20160960dc2a899d20069bd94f71302b9b9b66 100644
--- a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
+++ b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
@@ -1,17 +1,16 @@
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Root.ErrorIgnoreLevel=Print> for level 1; ignored
 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/ProxyProviderSvc_test.txt
-JobOptionsSvc        INFO # =======> /afs/cern.ch/work/c/calaf/public/fixOverwrite/InstallArea/jobOptions/ControlTest/StoreGateTestCommon.txt
-JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
+JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build-clang/joboptions/ControlTest/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
 JobOptionsSvc        INFO # (8,1): StoreGateSvc.ActivateHistory = 0
 JobOptionsSvc        INFO # (9,1): CLIDSvc.OutputLevel = 2
 JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
-JobOptionsSvc        INFO # =======> /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasCore/rel_1/InstallArea/jobOptions/ToyConversion/ToyConversionOpts.txt
+JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build-clang/joboptions/ToyConversion/ToyConversionOpts.txt
 JobOptionsSvc        INFO # (5,1): EventPersistencySvc.CnvServices += ["ToyConversionSvc"]
-JobOptionsSvc        INFO # =======> /afs/cern.ch/work/c/calaf/public/fixOverwrite/AtlasTest/ControlTest/run/../share/ProxyProviderSvc_test.txt
+JobOptionsSvc        INFO # =======> /home/sss/nobackup/atlas/build-clang/../tests/../share/ProxyProviderSvc_test.txt
 JobOptionsSvc        INFO # (7,1): ProxyProviderSvc.OutputLevel = 1
 JobOptionsSvc        INFO # (9,1): ClassIDSvc.OutputLevel = 2
 JobOptionsSvc        INFO # (10,1): MessageSvc.setVerbose = ["DataProxy", "EventPersistencySvc", "ToyConversionSvc", "StoreGateSvc", "EventDataSvc", "HistogramDataSvc", "ServiceManager", "HistogramPersistencySvc", "HistoryStore", "DetectorStore", "ApplicationMgr", "ProxyProviderSvc"]
@@ -20,63 +19,65 @@ JobOptionsSvc        INFO Job options successfully read in from ../share/ProxyPr
 ApplicationMgr      DEBUG Getting my own properties
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r3)
-                                          running on lxplus0045.cern.ch on Wed Mar 18 02:12:43 2015
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Sun Jun 12 23:05:49 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 ServiceManager      DEBUG Initializing service DetectorStore
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-03-01-09
+DetectorStore     VERBOSE Initializing DetectorStore - package version StoreGate-00-00-00
+DetectorStore       DEBUG Property update for OutputLevel : new value = 1
 DetectorStore       DEBUG Service base class initialized successfully
+EventPersistenc...  DEBUG Property update for OutputLevel : new value = 1
 EventPersistenc...  DEBUG  'CnvServices':[ 'ToyConversionSvc' ]
 EventPersistenc...  DEBUG Service base class initialized successfully
 DetectorStore     VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-18
+ClassIDSvc          DEBUG Property update for OutputLevel : new value = 2
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
 ClassIDSvc          DEBUG Service base class initialized successfully
-ClassIDSvc           INFO  getRegistryEntries: read 201 CLIDRegistry entries for module ALL
-ClassIDSvc          DEBUG processCLIDDB: read 1246 entries from CLIDDB file: /afs/cern.ch/work/c/calaf/public/fixOverwrite/InstallArea/share/clid.db
-ClassIDSvc          DEBUG processCLIDDB: read 1246 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasOffline/rel_1/InstallArea/share/clid.db
-ClassIDSvc          DEBUG processCLIDDB: read 1223 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasAnalysis/rel_1/InstallArea/share/clid.db
-ClassIDSvc          DEBUG processCLIDDB: read 1065 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasSimulation/rel_1/InstallArea/share/clid.db
-ClassIDSvc          DEBUG processCLIDDB: read 1204 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasTrigger/rel_1/InstallArea/share/clid.db
-ClassIDSvc          DEBUG processCLIDDB: read 1136 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasReconstruction/rel_1/InstallArea/share/clid.db
-ClassIDSvc          DEBUG processCLIDDB: read 1042 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasEvent/rel_1/InstallArea/share/clid.db
-ClassIDSvc          DEBUG processCLIDDB: read 251 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasConditions/rel_1/InstallArea/share/clid.db
-ClassIDSvc          DEBUG processCLIDDB: read 92 entries from CLIDDB file: /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasCore/rel_1/InstallArea/share/clid.db
+ClassIDSvc           INFO  getRegistryEntries: read 1045 CLIDRegistry entries for module ALL
+ClassIDSvc          DEBUG processCLIDDB: read 1345 entries from CLIDDB file: /home/sss/atlas/rootaccess/build-clang/share/clid.db
 DetectorStore     VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-01-10
+ProxyProviderSvc    DEBUG Property update for OutputLevel : new value = 1
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
 ProxyProviderSvc  VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 ServiceManager      DEBUG Initializing service HistoryStore
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-03-01-09
+HistoryStore      VERBOSE Initializing HistoryStore - package version StoreGate-00-00-00
+HistoryStore        DEBUG Property update for OutputLevel : new value = 1
 HistoryStore        DEBUG Service base class initialized successfully
 HistoryStore      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 HistoryStore      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
+ServiceManager      DEBUG Initializing service ConditionsStore
 ServiceManager      DEBUG Initializing service AppMgrRunable
 ServiceManager      DEBUG Initializing service EventLoopMgr
+EventDataSvc        DEBUG Property update for OutputLevel : new value = 1
 EventDataSvc        DEBUG Service base class initialized successfully
 EventDataSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
+HistogramDataSvc    DEBUG Property update for OutputLevel : new value = 1
 HistogramDataSvc    DEBUG Service base class initialized successfully
 HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
+HistogramPersis...  DEBUG  'CnvServices':[ 'RootHistSvc' ]
 HistogramPersis...  DEBUG Service base class initialized successfully
 HistogramPersis...WARNING Histograms saving not required.
 HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-01-09
+StoreGateSvc      VERBOSE Initializing StoreGateSvc - package version StoreGate-00-00-00
+StoreGateSvc        DEBUG Property update for OutputLevel : new value = 1
 StoreGateSvc        DEBUG Service base class initialized successfully
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
-StoreGateSvc        DEBUG  Bound handle 0x7fff5f6e0000 to proxy 0xe352e0
-building toy 0xe35c80
+StoreGateSvc        DEBUG  Bound handle 0x7ffd6b33e6a8 to proxy 0x29e5c60
+ToyConversionSvc    DEBUG Property update for OutputLevel : new value = 1
 ToyConversionSvc    DEBUG Service base class initialized successfully
 EventPersistenc...VERBOSE ServiceLocatorHelper::service: found service ToyConversionSvc
 EventPersistenc...   INFO Added successfully Conversion service:ToyConversionSvc
-ClassIDSvc           INFO  getRegistryEntries: read 722 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 345 CLIDRegistry entries for module ALL
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 1 proxy for ClassID 8107 (Bar): 
- flags: (  valid,   locked,  reset) --- data:   0xe365b0 --- key: aBar
+ flags: (  valid,   locked,  reset) --- data:  0x29e8190 --- key: aBar
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 StoreGateSvc        DEBUG Retrieved const handle to object aFoo  of type Foo(CLID 8101)
@@ -86,21 +87,21 @@ StoreGateSvc        DEBUG Retrieved const handle to object aFooBar  of type FooB
 ToyConversionSvc     INFO No converter for object   CLID= 8109
 DataProxy         WARNING accessData: conversion failed for data object 8109/aFooBar
  Returning NULL DataObject pointer  
-SG::DataProxy_castWARNING this proxy 0xdf3a00 has a NULL data object ptr
+SG::DataProxy_castWARNING this proxy 0x29599c0 has a NULL data object ptr
 <<---Error Message Ends-------
 *** ProxyProviderSvc_test OK ***
 *** ProxyProviderSvc_test RecordBeforeRead BEGINS ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  reset object aFoo CLID 8101 address 0xd528d0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde50d0, recorded with key=aFoo, CLID=8101, containing data object @0xd528d0  ... -> DONE
-DataProxy         VERBOSE requestRelease():  reset object aBar CLID 8107 address 0xe365b0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xe352e0, recorded with key=aBar, CLID=8107, containing data object @0xe365b0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  reset object aFoo CLID 8101 address 0x2985ad0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=aFoo, CLID=8101, containing data object @0x2985ad0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  reset object aBar CLID 8107 address 0x29e8190
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x29e5c60, recorded with key=aBar, CLID=8107, containing data object @0x29e8190  ... -> DONE
 DataProxy         VERBOSE requestRelease():  reset object aFooBar CLID 8109 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdf3a00, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x29599c0, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
 StoreGateSvc      WARNING record_impl: you are recording an object with key existingFoo, type Foo (CLID 8101)
  There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated. Use SGImplSvc::overwrite method instead
-StoreGateSvc        DEBUG Recorded object @0xe2a140 with key existingFoo of type Foo(CLID 8101)
- in DataObject @0xd89e10
+StoreGateSvc        DEBUG Recorded object @0x28e9080 with key existingFoo of type Foo(CLID 8101)
+ in DataObject @0x29e8190
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object existingFoo  of type Foo(CLID 8101)
 6.28
@@ -115,15 +116,15 @@ Now we expect to see an error message:
 <<---Error Message Ends-------
 StoreGateSvc      WARNING record_impl: you are recording an object with key privFoo, type Foo (CLID 8101)
  There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated. Use SGImplSvc::overwrite method instead
-StoreGateSvc        DEBUG Recorded object @0xe293c0 with key privFoo of type Foo(CLID 8101)
- in DataObject @0xd8d500
+StoreGateSvc        DEBUG Recorded object @0x28c2670 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0x29405b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0xe0d840 with key privFoo of type Foo(CLID 8101)
- in DataObject @0xdf0170
+StoreGateSvc        DEBUG overwrite: Recorded object @0x277a020 with key privFoo of type Foo(CLID 8101)
+ in DataObject @0x2985ad0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object privFoo  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0xe2bb10 with key silly33 of type Foo(CLID 8101)
- in DataObject @0xdf9950
+StoreGateSvc        DEBUG Recorded object @0x28c7350 with key silly33 of type Foo(CLID 8101)
+ in DataObject @0x2943400
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object silly33  of type Foo(CLID 8101)
 Now we expect to see an error message:
@@ -144,28 +145,28 @@ Now we expect to see an error message:
 *** ProxyProviderSvc_test HLTAutoKeyReset BEGINS ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 DataProxy         VERBOSE requestRelease():  release  object aFoo CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde50d0, recorded with key=aFoo, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x2986650, recorded with key=aFoo, CLID=8101, containing data object @0  ... -> DONE
 DataProxy         VERBOSE requestRelease():  release  object diskFoo CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdf3420, recorded with key=diskFoo, CLID=8101, containing data object @0  ... -> DONE
-DataProxy         VERBOSE requestRelease():  release  object existingFoo CLID 8101 address 0xd89e10
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xde6d20, recorded with key=existingFoo, CLID=8101, containing data object @0xd89e10  ... -> DONE
-DataProxy         VERBOSE requestRelease():  release  object privFoo CLID 8101 address 0xdf0170
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdf3cb0, recorded with key=privFoo, CLID=8101, containing data object @0xdf0170  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x29e81e0, recorded with key=diskFoo, CLID=8101, containing data object @0  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object existingFoo CLID 8101 address 0x29e8190
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x2942e60, recorded with key=existingFoo, CLID=8101, containing data object @0x29e8190  ... -> DONE
+DataProxy         VERBOSE requestRelease():  release  object privFoo CLID 8101 address 0x2985ad0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x2985fa0, recorded with key=privFoo, CLID=8101, containing data object @0x2985ad0  ... -> DONE
 DataProxy         VERBOSE requestRelease():  release  object silly33 CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xded920, recorded with key=silly33, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x296ebf0, recorded with key=silly33, CLID=8101, containing data object @0  ... -> DONE
 DataProxy         VERBOSE requestRelease():  release  object aBar CLID 8107 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xe352e0, recorded with key=aBar, CLID=8107, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x29e5c60, recorded with key=aBar, CLID=8107, containing data object @0  ... -> DONE
 DataProxy         VERBOSE requestRelease():  release  object aFooBar CLID 8109 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdf3a00, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x29599c0, recorded with key=aFooBar, CLID=8109, containing data object @0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
 DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_1 CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde50d0, recorded with key=HLTAutoKey_1, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x29599c0, recorded with key=HLTAutoKey_1, CLID=8101, containing data object @0  ... -> DONE
 DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_2 CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde6d20, recorded with key=HLTAutoKey_2, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2942e60, recorded with key=HLTAutoKey_2, CLID=8101, containing data object @0  ... -> DONE
 DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_3 CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdf3a00, recorded with key=HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x29e81e0, recorded with key=HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
 DataProxy         VERBOSE requestRelease():  reset object NOT_HLTAutoKey_3 CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xe350b0, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
 *** ProxyProviderSvc_test HLTAutoKeyReset OK ***
 
 
@@ -174,36 +175,36 @@ StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProx
 
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 DataProxy         VERBOSE requestRelease():  release  object HLTAutoKey_1 CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xdf3a00, recorded with key=HLTAutoKey_1, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x29e81e0, recorded with key=HLTAutoKey_1, CLID=8101, containing data object @0  ... -> DONE
 DataProxy         VERBOSE requestRelease():  release  object NOT_HLTAutoKey_3 CLID 8101 address 0
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xe350b0, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x2986650, recorded with key=NOT_HLTAutoKey_3, CLID=8101, containing data object @0  ... -> DONE
 =============Event #0 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0xe26b60 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0xd528d0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x28c93a0 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x29e8190
  object modifiable when retrieved
 Overwritten FooBar i=0
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0xd528d0
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x29e8190
 FooBar i=0 deleted
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xdf3a00, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=toOverwrite, CLID=8109, containing data object @0x29e8190  ... -> DONE
 =============Event #1 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0xd7c320 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0xd528d0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x28c2130 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x29e8190
  object modifiable when retrieved
 Overwritten FooBar i=1
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0xd528d0
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x29e8190
 FooBar i=1 deleted
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xde50d0, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=toOverwrite, CLID=8109, containing data object @0x29e8190  ... -> DONE
 =============Event #2 starts
-StoreGateSvc        DEBUG overwrite: Recorded object @0xe2bb10 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0xd528d0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x28c2670 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x29e8190
  object modifiable when retrieved
 Overwritten FooBar i=2
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0xd528d0
+DataProxy         VERBOSE requestRelease():  release  object toOverwrite CLID 8109 address 0x29e8190
 FooBar i=2 deleted
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xe350b0, recorded with key=toOverwrite, CLID=8109, containing data object @0xd528d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x2986650, recorded with key=toOverwrite, CLID=8109, containing data object @0x29e8190  ... -> DONE
 *** ProxyProviderSvc_test Overwrite OK ***
 
 
diff --git a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
index 0ff1ccacedbc76d841532707e6580ed09335b150..097da413d70726b6f220a1b0f674ea4e5ee2ec43 100644
--- a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
+++ b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
@@ -1,7 +1,7 @@
 
 
 Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateSvcClient_test.txt
-JobOptionsSvc        INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ControlTest/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/ControlTest/StoreGateTestCommon.txt
 JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
 JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
 JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
@@ -11,119 +11,117 @@ JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
 JobOptionsSvc        INFO Job options successfully read in from ../share/StoreGateSvcClient_test.txt
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
-                                          running on karma on Mon Nov 30 23:44:08 2015
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Sun Jun 12 22:22:13 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
-DetectorStore        INFO Initializing DetectorStore - package version StoreGate-00-00-00
 ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 941 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1007 CLIDRegistry entries for module ALL
 ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
-HistoryStore         INFO Initializing HistoryStore - package version StoreGate-00-00-00
 EventLoopMgr      WARNING Unable to locate service "EventSelector" 
 EventLoopMgr      WARNING No events will be processed from external input.
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr Ready
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-00-00-00
+StoreGateSvc        DEBUG Property update for OutputLevel : new value = 1
 StoreGateSvc        DEBUG Service base class initialized successfully
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
 StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
 *** StoreGateSvcClient_test record BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x17eac20 with key pFoo1 of type Foo(CLID 8101)
- in DataObject @0x17f3580
+StoreGateSvc        DEBUG Recorded object @0x17e79b0 with key pFoo1 of type Foo(CLID 8101)
+ in DataObject @0x153baa0
  object modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key pFoo1 and clid 8101
- Pre-existing valid DataProxy @0x17ead90 found in Store for key pFoo1 with clid 8101
-ClassIDSvc           INFO  getRegistryEntries: read 336 CLIDRegistry entries for module ALL
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x17e6e40
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x17e6d50
+ Pre-existing valid DataProxy @0x17f2cc0 found in Store for key pFoo1 with clid 8101
+ClassIDSvc           INFO  getRegistryEntries: read 343 CLIDRegistry entries for module ALL
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x151eca0
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x15329b0
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING record_impl: failed for key=pFoo2, type Foo (CLID 8101)
- object @0x17eac20 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0x17e79b0 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1844cd0 with key pFoo2 of type Foo(CLID 8101)
- in DataObject @0x17e31d0
+StoreGateSvc        DEBUG Recorded object @0x151eb00 with key pFoo2 of type Foo(CLID 8101)
+ in DataObject @0x17ed010
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e6e00 with key cpFoo of type Foo(CLID 8101)
- in DataObject @0x185cc70
+StoreGateSvc        DEBUG Recorded object @0x187db00 with key cpFoo of type Foo(CLID 8101)
+ in DataObject @0x17f2430
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key silly of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0x18035c0 with key silly of type Foo(CLID 8101)
+ in DataObject @0x187ec30
  object modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0x1862bb0 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1862c30
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x185e700
+ Pre-existing valid DataProxy @0x1880a70 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x188bcd0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x185b850
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0x1862bb0 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x18639f0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x185e7b0
+ Pre-existing valid DataProxy @0x1880a70 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x17ff540
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1876d50
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0x1862bb0 found in Store for key silly with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x18633e0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1863330
+ Pre-existing valid DataProxy @0x1880a70 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x17ff1a0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x188bc20
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1863310 with key UnLocked of type Foo(CLID 8101)
- in DataObject @0x1861b10
+StoreGateSvc        DEBUG Recorded object @0x1538d70 with key UnLocked of type Foo(CLID 8101)
+ in DataObject @0x1876c60
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e3fc0 with key Locked of type Foo(CLID 8101)
- in DataObject @0x17e4000
+StoreGateSvc        DEBUG Recorded object @0x18700d0 with key Locked of type Foo(CLID 8101)
+ in DataObject @0x1870020
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e4050 with key LockedReset of type Foo(CLID 8101)
- in DataObject @0x17e35c0
+StoreGateSvc        DEBUG Recorded object @0x17e7ab0 with key LockedReset of type Foo(CLID 8101)
+ in DataObject @0x18050e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e3870 with key UnLockedReset of type Foo(CLID 8101)
- in DataObject @0x17e38c0
+StoreGateSvc        DEBUG Recorded object @0x17ebbc0 with key UnLockedReset of type Foo(CLID 8101)
+ in DataObject @0x17f0980
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d93c0 with key LockedDelete of type Foo(CLID 8101)
- in DataObject @0x17d93e0
+StoreGateSvc        DEBUG Recorded object @0x17eac20 with key LockedDelete of type Foo(CLID 8101)
+ in DataObject @0x17eab90
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e39a0 with key UnLockedDelete of type Foo(CLID 8101)
- in DataObject @0x17d96b0
+StoreGateSvc        DEBUG Recorded object @0x1533a60 with key UnLockedDelete of type Foo(CLID 8101)
+ in DataObject @0x17eadb0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d9960 with key Const of type Foo(CLID 8101)
- in DataObject @0x17d99b0
+StoreGateSvc        DEBUG Recorded object @0x17ed6d0 with key Const of type Foo(CLID 8101)
+ in DataObject @0x17ed6f0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d9760 with key Const2 of type Foo(CLID 8101)
- in DataObject @0x17d9c80
+StoreGateSvc        DEBUG Recorded object @0x1535ed0 with key Const2 of type Foo(CLID 8101)
+ in DataObject @0x1535e20
  object not modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key Const and clid 8101
- Pre-existing valid DataProxy @0x17d9bb0 found in Store for key Const with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x17d9f80
- recorded with key Const of type Foo (CLID 8101) in DataObject @0x17eba20
+ Pre-existing valid DataProxy @0x17f44e0 found in Store for key Const with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x17eb2b0
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x1536060
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x17eb9d0 with key ow of type Foo(CLID 8101)
- in DataObject @0x17ebae0
+StoreGateSvc        DEBUG Recorded object @0x15413b0 with key ow of type Foo(CLID 8101)
+ in DataObject @0x17eb1e0
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17ebd30 with key ow of type Foo(CLID 8101)
- in DataObject @0x17ebda0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x17eff70 with key ow of type Foo(CLID 8101)
+ in DataObject @0x17efec0
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17eb9d0 with key ow of type Foo(CLID 8101)
- in DataObject @0x17ebae0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x15413b0 with key ow of type Foo(CLID 8101)
+ in DataObject @0x17eb1e0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17ebd30 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x17ebda0
+StoreGateSvc        DEBUG Recorded object @0x17eff70 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x17efec0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17ec0c0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x17ebef0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x15343a0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x15343c0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17ebd30 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x17ebda0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x1534310 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x17efec0
  object not modifiable when retrieved
 *** StoreGateSvcClient_test records OK ***
 
@@ -225,47 +223,47 @@ Now we expect to see an error message:
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object   of type Foo(CLID 8101) 
  Try to use a const DataHandle
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0x1534450 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x187ec30
  object modifiable when retrieved
  Now we expect to see an error for invalid proxy >>> 
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object pFooKey  of type Foo(CLID 8101) 
  Try to use a const DataHandle
  end of error >>>>>>>>>>>>> 
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0x17eff70 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x187ec30
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0x17eff70 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x187ec30
  object modifiable when retrieved
 *** StoreGateSvcClient_test removes OK ***
 
 
 
 *** StoreGateSvcClient_test testCreate BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x185c7f0 with key pCreateFooDefault of type Foo(CLID 8101)
- in DataObject @0x185c760
+StoreGateSvc        DEBUG Recorded object @0x17eff70 with key pCreateFooDefault of type Foo(CLID 8101)
+ in DataObject @0x187ec30
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e4970 with key pCreateFoo1 of type Foo(CLID 8101)
- in DataObject @0x17ec440
+StoreGateSvc        DEBUG Recorded object @0x18037a0 with key pCreateFoo1 of type Foo(CLID 8101)
+ in DataObject @0x17ff8f0
  object modifiable when retrieved
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key pCreateFoo1 and clid 8101
- Pre-existing valid DataProxy @0x17ec550 found in Store for key pCreateFoo1 with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x181a410
- recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0x181a5d0
-StoreGateSvc        ERROR create: problem recording created object @0x181a410 using key pCreateFoo1
+ Pre-existing valid DataProxy @0x17f33d0 found in Store for key pCreateFoo1 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x1539070
+ recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0x1538fc0
+StoreGateSvc        ERROR create: problem recording created object @0x1539070 using key pCreateFoo1
 <<---Error Message Ends-------
 StoreGateSvc        DEBUG Retrieved non-const handle to object pCreateFoo1  of type Foo(CLID 8101)
 *** StoreGateSvcClient_test testCreate OK ***
 
 
 *** StoreGateSvcClient_test bind BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x181a840 with key fooKey of type Foo(CLID 8101)
- in DataObject @0x181a640
+StoreGateSvc        DEBUG Recorded object @0x1802ba0 with key fooKey of type Foo(CLID 8101)
+ in DataObject @0x15390c0
  object modifiable when retrieved
-StoreGateSvc        DEBUG  Bound handle 0x7ffd16461f40 to proxy 0x17ec220
+StoreGateSvc        DEBUG  Bound handle 0x7ffe8debf8a0 to proxy 0x1802bf0
 *** StoreGateSvcClient_test bind OK ***
 
 
@@ -274,57 +272,57 @@ Testing dump:
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 1 proxy for ClassID 8100 (Base): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1861b10 --- key: UnLocked
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x1876c60 --- key: UnLocked
 Found 17 proxies for ClassID 8101 (Foo): 
- flags: (  valid,   locked,  reset) --- data:  0x17d99b0 --- key: Const
- flags: (  valid,   locked,  reset) --- data:  0x17d9c80 --- key: Const2
- flags: (  valid,   locked,  reset) --- data:  0x17e4000 --- key: Locked
- flags: (  valid,   locked, DELETE) --- data:  0x17d93e0 --- key: LockedDelete
- flags: (  valid,   locked,  reset) --- data:  0x17e35c0 --- key: LockedReset
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1861b10 --- key: UnLocked
- flags: (  valid, UNLOCKED, DELETE) --- data:  0x17d96b0 --- key: UnLockedDelete
- flags: (  valid, UNLOCKED,  reset) --- data:  0x17e38c0 --- key: UnLockedReset
- flags: (  valid,   locked,  reset) --- data:  0x185cc70 --- key: cpFoo
- flags: (  valid, UNLOCKED,  reset) --- data:  0x181a640 --- key: fooKey
- flags: (  valid, UNLOCKED, DELETE) --- data:  0x17ebae0 --- key: ow
- flags: (  valid,   locked, DELETE) --- data:  0x17ebda0 --- key: ow2
- flags: (  valid, UNLOCKED,  reset) --- data:  0x17ec440 --- key: pCreateFoo1
- flags: (  valid, UNLOCKED,  reset) --- data:  0x185c760 --- key: pCreateFooDefault
- flags: (  valid, UNLOCKED,  reset) --- data:  0x17f3580 --- key: pFoo1
- flags: (  valid, UNLOCKED,  reset) --- data:  0x17e31d0 --- key: pFoo2
+ flags: (  valid,   locked,  reset) --- data:  0x17ed6f0 --- key: Const
+ flags: (  valid,   locked,  reset) --- data:  0x1535e20 --- key: Const2
+ flags: (  valid,   locked,  reset) --- data:  0x1870020 --- key: Locked
+ flags: (  valid,   locked, DELETE) --- data:  0x17eab90 --- key: LockedDelete
+ flags: (  valid,   locked,  reset) --- data:  0x18050e0 --- key: LockedReset
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x1876c60 --- key: UnLocked
+ flags: (  valid, UNLOCKED, DELETE) --- data:  0x17eadb0 --- key: UnLockedDelete
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x17f0980 --- key: UnLockedReset
+ flags: (  valid,   locked,  reset) --- data:  0x17f2430 --- key: cpFoo
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x15390c0 --- key: fooKey
+ flags: (  valid, UNLOCKED, DELETE) --- data:  0x17eb1e0 --- key: ow
+ flags: (  valid,   locked, DELETE) --- data:  0x17efec0 --- key: ow2
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x17ff8f0 --- key: pCreateFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x187ec30 --- key: pCreateFooDefault
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x153baa0 --- key: pFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:  0x17ed010 --- key: pFoo2
  flags: (INVALID, UNLOCKED,  reset) --- data:          0 --- key: silly
 <<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>> 
 
 <<--------
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3ed0, recorded with key=UnLocked, CLID=8101, containing data object @0x1861b10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9bb0, recorded with key=Const, CLID=8101, containing data object @0x17d99b0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9d00, recorded with key=Const2, CLID=8101, containing data object @0x17d9c80  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e34a0, recorded with key=Locked, CLID=8101, containing data object @0x17e4000  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9470, recorded with key=LockedDelete, CLID=8101, containing data object @0x17d93e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e37a0, recorded with key=LockedReset, CLID=8101, containing data object @0x17e35c0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3ed0, recorded with key=UnLocked, CLID=8101, containing data object @0x1861b10  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9890, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x17d96b0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d92f0, recorded with key=UnLockedReset, CLID=8101, containing data object @0x17e38c0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x18519a0, recorded with key=cpFoo, CLID=8101, containing data object @0x185cc70  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec220, recorded with key=fooKey, CLID=8101, containing data object @0x181a640  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebc60, recorded with key=ow, CLID=8101, containing data object @0x17ebae0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebdf0, recorded with key=ow2, CLID=8101, containing data object @0x17ebda0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec550, recorded with key=pCreateFoo1, CLID=8101, containing data object @0x17ec440  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec0e0, recorded with key=pCreateFooDefault, CLID=8101, containing data object @0x185c760  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead90, recorded with key=pFoo1, CLID=8101, containing data object @0x17f3580  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=pFoo2, CLID=8101, containing data object @0x17e31d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1862bb0, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x185dcc0 with key d1 of type D1(CLID 8112)
- in DataObject @0x18632c0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x185c310, recorded with key=UnLocked, CLID=8101, containing data object @0x1876c60  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f44e0, recorded with key=Const, CLID=8101, containing data object @0x17ed6f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15349e0, recorded with key=Const2, CLID=8101, containing data object @0x1535e20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1805040, recorded with key=Locked, CLID=8101, containing data object @0x1870020  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15338c0, recorded with key=LockedDelete, CLID=8101, containing data object @0x17eab90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f08b0, recorded with key=LockedReset, CLID=8101, containing data object @0x18050e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x185c310, recorded with key=UnLocked, CLID=8101, containing data object @0x1876c60  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1533ab0, recorded with key=UnLockedDelete, CLID=8101, containing data object @0x17eadb0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebcd0, recorded with key=UnLockedReset, CLID=8101, containing data object @0x17f0980  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1872090, recorded with key=cpFoo, CLID=8101, containing data object @0x17f2430  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1802bf0, recorded with key=fooKey, CLID=8101, containing data object @0x15390c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17efe40, recorded with key=ow, CLID=8101, containing data object @0x17eb1e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15341f0, recorded with key=ow2, CLID=8101, containing data object @0x17efec0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f33d0, recorded with key=pCreateFoo1, CLID=8101, containing data object @0x17ff8f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3490, recorded with key=pCreateFooDefault, CLID=8101, containing data object @0x187ec30  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f2cc0, recorded with key=pFoo1, CLID=8101, containing data object @0x153baa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1541200, recorded with key=pFoo2, CLID=8101, containing data object @0x17ed010  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1880a70, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x187c960 with key d1 of type D1(CLID 8112)
+ in DataObject @0x185b800
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1  of type B1(CLID 8111)
-0x17f2f40
-0x17f2dc0StoreGateSvc
+0x1804980
+0x1804770StoreGateSvc
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1Alias  of type D1(CLID 8112)
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1AnotherAlias  of type D1(CLID 8112)
-StoreGateSvc        DEBUG Recorded object @0x18615e0 with key d2 of type D1(CLID 8112)
- in DataObject @0x181a2a0
+StoreGateSvc        DEBUG Recorded object @0x1534470 with key d2 of type D1(CLID 8112)
+ in DataObject @0x17eb320
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object d2  of type D1(CLID 8112)
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1Alias  of type D1(CLID 8112)
@@ -333,21 +331,21 @@ Found key = d2 for object D1 in StoreGate
 StoreGateSvc        DEBUG Retrieved non-const handle to object dd  of type D1(CLID 8112)
 StoreGateSvc        DEBUG Retrieved non-const handle to object dd  of type B1(CLID 8111)
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead90, recorded with key=d2, CLID=8112, containing data object @0x181a2a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ec0e0, recorded with key=dd, CLID=8112, containing data object @0x185a1d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead90, recorded with key=d2, CLID=8112, containing data object @0x181a2a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead90, recorded with key=d2, CLID=8112, containing data object @0x181a2a0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=dd, CLID=8112, containing data object @0x17e31d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f2cc0, recorded with key=d2, CLID=8112, containing data object @0x17eb320  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=dd, CLID=8112, containing data object @0x1534330  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f2cc0, recorded with key=d2, CLID=8112, containing data object @0x17eb320  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f2cc0, recorded with key=d2, CLID=8112, containing data object @0x17eb320  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1541200, recorded with key=dd, CLID=8112, containing data object @0x17ed010  ... -> DONE
 StoreGateSvc        DEBUG Retrieved non-const handle to object dd  of type D1(CLID 8112)
 StoreGateSvc        DEBUG Retrieved non-const handle to object dd  of type B1(CLID 8111)
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 
 *** StoreGateSvcClient_test transientSwap BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x17ebd50 with key pSwapFoo1 of type Foo(CLID 8101)
- in DataObject @0x17f3580
+StoreGateSvc        DEBUG Recorded object @0x1827ea0 with key pSwapFoo1 of type Foo(CLID 8101)
+ in DataObject @0x18096f0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e3570 with key pSwapFoo2 of type Foo(CLID 8101)
- in DataObject @0x17ec440
+StoreGateSvc        DEBUG Recorded object @0x153c7b0 with key pSwapFoo2 of type Foo(CLID 8101)
+ in DataObject @0x17ff8f0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo1  of type Foo(CLID 8101)
 StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo2  of type Foo(CLID 8101)
@@ -356,81 +354,81 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo2  of typ
 
 
 *** StoreGateSvcClient_test VersionedKey BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x17d6520 with key aVersObj of type Foo(CLID 8101)
- in DataObject @0x17e31d0
+StoreGateSvc        DEBUG Recorded object @0x1530580 with key aVersObj of type Foo(CLID 8101)
+ in DataObject @0x17ff760
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0x17e3670 with key ;77;aVersObj of type Foo(CLID 8101)
- in DataObject @0x185a1d0
+StoreGateSvc        DEBUG Recorded object @0x1534820 with key ;77;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x1533d60
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object ;77;aVersObj  of type Foo(CLID 8101)
 StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
 StoreGateSvc        DEBUG Retrieved non-const handle to object ;00;aVersObj  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0x181a490 with key ;88;aVersObj of type Foo(CLID 8101)
- in DataObject @0x17ebae0
+StoreGateSvc        DEBUG Recorded object @0x17f3cb0 with key ;88;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x17f0010
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object ;88;aVersObj  of type Foo(CLID 8101)
 Now we expect to see an error message:
 ----Error Message Starts--->>
 StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key ;88;aVersObj and clid 8101
- Pre-existing valid DataProxy @0x17ebdf0 found in Store for key ;88;aVersObj with clid 8101
-StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x181a820
- recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0x181a720
+ Pre-existing valid DataProxy @0x17efe40 found in Store for key ;88;aVersObj with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x17f0060
+ recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0x1872090
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1860810 with key ;66;aVersObj of type Foo(CLID 8101)
- in DataObject @0x181a640
+StoreGateSvc        DEBUG Recorded object @0x17eb370 with key ;66;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x188bc20
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
 *** StoreGateSvcClient_test VersionedKey OK ***
 
 
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead90, recorded with key=aVersObj, CLID=8101, containing data object @0x17e31d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebc60, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x181a640  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec550, recorded with key=;77;aVersObj, CLID=8101, containing data object @0x185a1d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebdf0, recorded with key=;88;aVersObj, CLID=8101, containing data object @0x17ebae0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebc60, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x181a640  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ec0e0, recorded with key=pSwapFoo1, CLID=8101, containing data object @0x17ec440  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=pSwapFoo2, CLID=8101, containing data object @0x17f3580  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f2cc0, recorded with key=aVersObj, CLID=8101, containing data object @0x17ff760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1534410, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x188bc20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15341f0, recorded with key=;77;aVersObj, CLID=8101, containing data object @0x1533d60  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17efe40, recorded with key=;88;aVersObj, CLID=8101, containing data object @0x17f0010  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1534410, recorded with key=;66;aVersObj, CLID=8101, containing data object @0x188bc20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3490, recorded with key=pSwapFoo1, CLID=8101, containing data object @0x17ff8f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1541200, recorded with key=pSwapFoo2, CLID=8101, containing data object @0x18096f0  ... -> DONE
 *** test_DVL_conversions
-StoreGateSvc        DEBUG Recorded object @0x17eac60 with key contd of type CV(CLID 82734625)
- in DataObject @0x186d850
+StoreGateSvc        DEBUG Recorded object @0x18097f0 with key contd of type CV(CLID 82734625)
+ in DataObject @0x1541200
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataVector<C>(CLID 82734623)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataVector<B>(CLID 82734621)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataVector<A>(CLID 82734619)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataVector<A>(CLID 82734619)
-StoreGateSvc        DEBUG Recorded object @0x17eb7e0 with key contd of type CL(CLID 82734626)
- in DataObject @0x17e3950
+StoreGateSvc        DEBUG Recorded object @0x1802410 with key contd of type CL(CLID 82734626)
+ in DataObject @0x17efe40
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataList<C>(CLID 82734624)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataList<B>(CLID 82734622)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataList<A>(CLID 82734620)
 StoreGateSvc        DEBUG Retrieved non-const handle to object contd  of type DataList<A>(CLID 82734620)
 *** test_const_DVL
-StoreGateSvc        DEBUG Recorded object @0x1861b70 with key dvl of type CV(CLID 82734625)
- in DataObject @0x181a7f0
+StoreGateSvc        DEBUG Recorded object @0x17eacc0 with key dvl of type CV(CLID 82734625)
+ in DataObject @0x17f2cc0
  object not modifiable when retrieved
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object dvl  of type CV(CLID 82734625) 
  Try to use a const DataHandle
 StoreGateSvc        DEBUG Retrieved const handle to object dvl  of type CV(CLID 82734625)
-StoreGateSvc        DEBUG Recorded object @0x17e3420 with key dvl2 of type CV(CLID 82734625)
- in DataObject @0x17e33b0
+StoreGateSvc        DEBUG Recorded object @0x185c250 with key dvl2 of type CV(CLID 82734625)
+ in DataObject @0x185c360
  object not modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object dvl2  of type CV(CLID 82734625)
-StoreGateSvc        DEBUG Recorded object @0x181aff0 with key dvl of type CL(CLID 82734626)
- in DataObject @0x17e81e0
+StoreGateSvc        DEBUG Recorded object @0x15310b0 with key dvl of type CL(CLID 82734626)
+ in DataObject @0x17f4400
  object not modifiable when retrieved
 StoreGateSvc      WARNING retrieve(non-const): No valid proxy for object dvl  of type CL(CLID 82734626) 
  Try to use a const DataHandle
 StoreGateSvc        DEBUG Retrieved const handle to object dvl  of type CL(CLID 82734626)
-StoreGateSvc        DEBUG Recorded object @0x17e8a60 with key dvl2 of type CL(CLID 82734626)
- in DataObject @0x17e89f0
+StoreGateSvc        DEBUG Recorded object @0x17e7ab0 with key dvl2 of type CL(CLID 82734626)
+ in DataObject @0x153ccc0
  object not modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object dvl2  of type CL(CLID 82734626)
 *** test_copy_conversions
-StoreGateSvc        DEBUG Recorded object @0x17e8f40 with key x of type Athena_test::X(CLID 82734627)
- in DataObject @0x17e8ef0
+StoreGateSvc        DEBUG Recorded object @0x17f2ea0 with key x of type Athena_test::X(CLID 82734627)
+ in DataObject @0x153be00
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object x  of type Athena_test::Y(CLID 82734628)
 SG::DataProxy_castWARNING Request for a non-const object via copying conversion; requested CLID = 82734628, proxy primary ID is 82734627
@@ -439,135 +437,135 @@ StoreGateSvc        DEBUG Retrieved const handle to object x  of type Athena_tes
 
 *** StoreGateSvcClient_test Keys BEGINS ***
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0x186d850  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0x17e3950  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0x181a7f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0x17e33b0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0x17e81e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0x17e89f0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0x17e8ef0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x17e3830 with key LockReset of type Foo(CLID 8101)
- in DataObject @0x17e8ef0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0x1541200  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0x17efe40  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0x17f2cc0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0x185c360  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0x17f4400  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0x153ccc0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3000, recorded with key=x, CLID=82734627, containing data object @0x153be00  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3000, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x185e1c0 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0x153be00
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e49e0 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x17eadf0
+StoreGateSvc        DEBUG Recorded object @0x1809cb0 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0x17f07c0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e4b20 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x17e34e0
+StoreGateSvc        DEBUG Recorded object @0x17f30f0 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0x1535540
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d9860 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x17ebc60
+StoreGateSvc        DEBUG Recorded object @0x17f3130 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0x17eff10
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9310, recorded with key=LockDelete, CLID=8101, containing data object @0x17e34e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e4f00, recorded with key=LockReset, CLID=8101, containing data object @0x17e8ef0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17eac60, recorded with key=UnLockDelete, CLID=8101, containing data object @0x17ebc60  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e4e80, recorded with key=UnLockReset, CLID=8101, containing data object @0x17eadf0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17eac60, recorded with key=UnLockDelete, CLID=8101, containing data object @0x17ebc60  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x185c360, recorded with key=LockDelete, CLID=8101, containing data object @0x1535540  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ccc0, recorded with key=LockReset, CLID=8101, containing data object @0x153be00  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f2cc0, recorded with key=UnLockDelete, CLID=8101, containing data object @0x17eff10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f4400, recorded with key=UnLockReset, CLID=8101, containing data object @0x17f07c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f2cc0, recorded with key=UnLockDelete, CLID=8101, containing data object @0x17eff10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3000, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3000, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e4f00, recorded with key=LockReset, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e4e80, recorded with key=UnLockReset, CLID=8101, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead70, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3710, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3850, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8920, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8830, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x17e4a20 with key LockReset of type Foo(CLID 8101)
- in DataObject @0x17e4ad0
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x153ccc0, recorded with key=LockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f4400, recorded with key=UnLockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3490, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15338c0, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebcb0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15341f0, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1802970, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x153ce30, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3000, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3000, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x153be70 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0x17f52b0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e8610 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x17e89a0
+StoreGateSvc        DEBUG Recorded object @0x184d530 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0x153cbc0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17d98b0 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x18519d0
+StoreGateSvc        DEBUG Recorded object @0x1802c50 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0x17ff760
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e86e0 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x17d9990
+StoreGateSvc        DEBUG Recorded object @0x17ebd80 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0x184d4e0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=LockDelete, CLID=8101, containing data object @0x18519d0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=LockReset, CLID=8101, containing data object @0x17e4ad0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=UnLockDelete, CLID=8101, containing data object @0x17d9990  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=UnLockReset, CLID=8101, containing data object @0x17e89a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=LockDelete, CLID=8101, containing data object @0x17ff760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3000, recorded with key=LockReset, CLID=8101, containing data object @0x17f52b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=UnLockDelete, CLID=8101, containing data object @0x184d4e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=UnLockReset, CLID=8101, containing data object @0x153cbc0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 
 *** StoreGateSvcClient_test Keys ENDS ***
 
 *** StoreGateSvcClient_test retrieveAux BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x17e8ca0 with key BVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x17e8190
+StoreGateSvc        DEBUG Recorded object @0x153ceb0 with key BVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x17f0850
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x18607f0 with key BVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x17ebda0
+StoreGateSvc        DEBUG Recorded object @0x17ff1a0 with key BVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x184d4e0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e49b0 with key CVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x17e8ea0
+StoreGateSvc        DEBUG Recorded object @0x17f2fd0 with key CVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x1870090
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x181afb0 with key CVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x17e37e0
+StoreGateSvc        DEBUG Recorded object @0x1538d70 with key CVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x1802aa0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e6d70 with key ErrorVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x17e88b0
+StoreGateSvc        DEBUG Recorded object @0x1804ff0 with key ErrorVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x1535e50
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x181ae00 with key BBVec of type TestVector<BBX>(CLID 125040193)
- in DataObject @0x17e3790
+StoreGateSvc        DEBUG Recorded object @0x184d4b0 with key BBVec of type TestVector<BBX>(CLID 125040193)
+ in DataObject @0x1802b90
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17eb9d0 with key BBVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x17f3580
+StoreGateSvc        DEBUG Recorded object @0x182bb60 with key BBVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x1538fc0
  object modifiable when retrieved
 StoreGateSvc      VERBOSE called associateAux_impl non const for key BVec
 StoreGateSvc        DEBUG Retrieved non-const handle to object BVec  of type TestVector<BX>(CLID 82735621)
@@ -586,11 +584,11 @@ StoreGateSvc      VERBOSE called associateAux_impl const for key ErrorVec
  to object of type TestVector<BX>(CLID 82735621) with key ErrorVec
 StoreGateSvc      WARNING 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1862c30 with key BStand of type BX(CLID 82835621)
- in DataObject @0x17e8770
+StoreGateSvc        DEBUG Recorded object @0x153cc50 with key BStand of type BX(CLID 82835621)
+ in DataObject @0x1533a50
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x185e810 with key BStandAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x181aea0
+StoreGateSvc        DEBUG Recorded object @0x1539080 with key BStandAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x17f07c0
  object modifiable when retrieved
 StoreGateSvc      VERBOSE called associateAux_impl non const for key BStand
 StoreGateSvc        DEBUG Retrieved non-const handle to object BStand  of type BX(CLID 82835621)
@@ -599,88 +597,118 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object BStand  of type B
 
 
 *** StoreGateSvcClient_test testBoundReset BEGINS ***
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17e4b20 with key testBoundReset of type int(CLID 244260744)
- in DataObject @0x17eb8b0
+StoreGateSvc        DEBUG overwrite: Recorded object @0x153bd20 with key testBoundReset of type int(CLID 244260744)
+ in DataObject @0x153cdb0
  object modifiable when retrieved
 
 *** StoreGateSvcClient_test testBoundReset OK ***
 
 
+
+*** StoreGateSvcClient_test testRecordObject BEGINS ***
+>>> test duplicate record1
+StoreGateSvc      WARNING  setupProxy:: error setting up proxy for key obj101 and clid 8101
+ Pre-existing valid DataProxy @0x17f2cc0 found in Store for key obj101 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0x153bd00
+ recorded with key obj101 of type Foo (CLID 8101) in DataObject @0x1534f70
+<<< test duplicate record1
+>>> test duplicate record2
+StoreGateSvc      WARNING record_impl: failed for key=obj999, type Foo (CLID 8101)
+ object @0x1802a10 already in store with key=obj101. Will not record a duplicate! 
+<<< test duplicate record2
+StoreGateSvc        DEBUG Clearing store with forceRemove=0
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f2cc0, recorded with key=obj101, CLID=8101, containing data object @0x1535540  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17efe40, recorded with key=obj102, CLID=8101, containing data object @0x1534dc0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=BVec, CLID=82735621, containing data object @0x17f0850  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3000, recorded with key=CVec, CLID=82735621, containing data object @0x1870090  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ebcb0, recorded with key=ErrorVec, CLID=82735621, containing data object @0x1535e50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f4400, recorded with key=BStand, CLID=82835621, containing data object @0x1533a50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=BBVecAux., CLID=125030194, containing data object @0x1538fc0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ccc0, recorded with key=BStandAux., CLID=125030194, containing data object @0x17f07c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=BVecAux., CLID=125030194, containing data object @0x184d4e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=CVecAux., CLID=125030194, containing data object @0x1802aa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15338c0, recorded with key=BBVec, CLID=125040193, containing data object @0x1802b90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x185c360, recorded with key=testBoundReset, CLID=244260744, containing data object @0x153cdb0  ... -> DONE
+
+*** StoreGateSvcClient_test testRecordObject OK ***
 *** test_lock
-StoreGateSvc        DEBUG Recorded object @0x17e3fe0 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0x17e4e30
+StoreGateSvc        DEBUG Recorded object @0x1809cb0 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0x1535540
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17eac60, recorded with key=lockable1, CLID=82734636, containing data object @0x17e4e30  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8920, recorded with key=BVec, CLID=82735621, containing data object @0x17e8190  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e8830, recorded with key=CVec, CLID=82735621, containing data object @0x17e8ea0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3710, recorded with key=ErrorVec, CLID=82735621, containing data object @0x17e88b0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e4e80, recorded with key=BStand, CLID=82835621, containing data object @0x17e8770  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3150, recorded with key=BBVecAux., CLID=125030194, containing data object @0x17f3580  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e4f00, recorded with key=BStandAux., CLID=125030194, containing data object @0x181aea0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17d9680, recorded with key=BVecAux., CLID=125030194, containing data object @0x17ebda0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e3850, recorded with key=CVecAux., CLID=125030194, containing data object @0x17e37e0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ead70, recorded with key=BBVec, CLID=125040193, containing data object @0x17e3790  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17e52c0, recorded with key=testBoundReset, CLID=244260744, containing data object @0x17eb8b0  ... -> DONE
-StoreGateSvc        DEBUG Recorded object @0x17d98b0 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0x185c760
- object modifiable when retrieved
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-00-00-00
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f2cc0, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17efe40, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x185c360, recorded with key=lockable1, CLID=82734636, containing data object @0x1535540  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ce30, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3000, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17ebcb0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f4400, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x17f3490, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x153ccc0, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15341f0, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x1802970, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0x15338c0, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0x153bd70 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0x1535540
+ object modifiable when retrieved
+StoreGateSvc      VERBOSE Finalizing StoreGateSvc - package version StoreGate-00-00-00
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17eac60, recorded with key=lockable1, CLID=82734636, containing data object @0x185c760  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8920, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e8830, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3710, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e4e80, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3150, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e4f00, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17d9680, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17e3850, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
-StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ead70, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f2cc0, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17efe40, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x185c360, recorded with key=lockable1, CLID=82734636, containing data object @0x1535540  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x153ce30, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3000, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17ebcb0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f4400, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x17f3490, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x153ccc0, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15341f0, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x1802970, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0x15338c0, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
 *** StoreGateSvcClient_test record BEGINS ***
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key pFoo1 and clid 8101
- Pre-existing valid DataProxy @0x17ead70 found in Store for key pFoo1 with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17e8610
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x18519d0
+ Pre-existing valid DataProxy @0x15338c0 found in Store for key pFoo1 with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1870020
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x17ff940
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING record_impl: failed for key=pFoo2, type Foo (CLID 8101)
- object @0x1819e00 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0x187db00 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0x17e4f00 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17e6e20
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x17ec390
+ Pre-existing valid DataProxy @0x153ccc0 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x18029f0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x17eb1e0
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0x17e4f00 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17e4a40
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x185c760
+ Pre-existing valid DataProxy @0x153ccc0 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x185e1c0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x15390c0
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0x17e4f00 found in Store for key silly with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17e3130
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x17e3790
+ Pre-existing valid DataProxy @0x153ccc0 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x17eadd0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x17efec0
 <<---Error Message Ends-------
 Now we expect to see an error message:
 ----Error Message Starts--->>
 DetectorStore     WARNING  setupProxy:: error setting up proxy for key Const and clid 8101
- Pre-existing valid DataProxy @0x17e52c0 found in Store for key Const with clid 8101
-DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x181a970
- recorded with key Const of type Foo (CLID 8101) in DataObject @0x17eadf0
+ Pre-existing valid DataProxy @0x17efe40 found in Store for key Const with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0x1538ee0
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x1870120
 <<---Error Message Ends-------
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
 IOVSvcTool           INFO IOVRanges will be checked at every Event
-ClassIDSvc           INFO  getRegistryEntries: read 145 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 246 CLIDRegistry entries for module ALL
 *** StoreGateSvcClient_test records OK ***
 
 
diff --git a/AtlasTest/ControlTest/share/StoreGateTestCommon.txt b/AtlasTest/ControlTest/share/StoreGateTestCommon.txt
index 09c99ba564cf6a494606d3abfb8c6d2769d6f57b..5f764c8468bd6f9cbd2909353d09047bb4247c76 100644
--- a/AtlasTest/ControlTest/share/StoreGateTestCommon.txt
+++ b/AtlasTest/ControlTest/share/StoreGateTestCommon.txt
@@ -2,7 +2,7 @@
 
 // $Id: StoreGateTestCommon.txt,v 1.2 2008-05-30 22:53:11 calaf Exp $
 
-ApplicationMgr.ExtSvc += { "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore" };
+ApplicationMgr.ExtSvc += { "StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore" };
 AuditorSvc.Auditors  += { "AlgContextAuditor"};
 StoreGateSvc.OutputLevel = 1;
 StoreGateSvc.ActivateHistory = false;
diff --git a/AtlasTest/ControlTest/share/StoreID_test.ref b/AtlasTest/ControlTest/share/StoreID_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..1655c3f8051243009687e4004b69f3bc93f69a99
--- /dev/null
+++ b/AtlasTest/ControlTest/share/StoreID_test.ref
@@ -0,0 +1,31 @@
+*** StoreID_test BEGINS ***
+
+
+Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # =======> /home/sss/nobackup/atlas/build-clang/../tests/../share/StoreGateTestCommon.txt
+JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionsStore"]
+JobOptionsSvc        INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
+JobOptionsSvc        INFO # (7,1): StoreGateSvc.OutputLevel = 1
+JobOptionsSvc        INFO # (8,1): StoreGateSvc.ActivateHistory = 0
+JobOptionsSvc        INFO # (9,1): CLIDSvc.OutputLevel = 2
+JobOptionsSvc        INFO # (10,1): MessageSvc.useColors = 1
+JobOptionsSvc        INFO Job options successfully read in from ../share/StoreGateTestCommon.txt
+ApplicationMgr    SUCCESS 
+====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+                                          running on karma on Sun Jun 12 23:09:39 2016
+====================================================================================================================================
+ApplicationMgr       INFO Application Manager Configured successfully
+ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 995 CLIDRegistry entries for module ALL
+ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
+EventLoopMgr      WARNING Unable to locate service "EventSelector" 
+EventLoopMgr      WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr       INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+StoreGateSvc        DEBUG Property update for OutputLevel : new value = 1
+StoreGateSvc        DEBUG Service base class initialized successfully
+StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
+StoreGateSvc      VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
+*** StoreID_test OK ***
diff --git a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
index be2d64885d27791ab48ccbf4163edf95859d765b..af9aab28a53f84e510ffa964456ecc1b69f6c0c2 100644
--- a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
+++ b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
@@ -348,6 +348,8 @@ int main() {
   testRetrieveAux(*pStore);
   testBoundReset(*pStore);
 
+  testRecordObject(*pStore);
+
   test_lock (*pStore);
 
   pStore->finalize().ignore();
diff --git a/AtlasTest/ControlTest/test/StoreID_test.cxx b/AtlasTest/ControlTest/test/StoreID_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..c5d52e7eccda4c5ff8f4018eb0d89e7d8375bee2
--- /dev/null
+++ b/AtlasTest/ControlTest/test/StoreID_test.cxx
@@ -0,0 +1,68 @@
+/*
+  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/***************************************************************************
+ test the store ID setting
+ -------------------------------------------
+ ATLAS Collaboration
+ ***************************************************************************/
+
+// $Id: StoreID_test.cxx 753911 2016-06-09 13:40:32Z calaf $
+
+#include <iostream>
+
+#undef NDEBUG
+
+#include "StoreGate/StoreGateSvc.h"
+#include "StoreGate/SGtests.h"
+
+
+#ifndef NOGAUDI
+#include "TestTools/initGaudi.h"
+using namespace Athena_test;
+using namespace std;
+
+int main() {
+  cout << "*** StoreID_test BEGINS ***" <<endl;
+  ISvcLocator* pSvcLoc;
+  if (!initGaudi("StoreGateTestCommon.txt", pSvcLoc)) {
+    cerr << "This test can not be run" << endl;
+    return 0;
+  }  
+  assert(pSvcLoc);
+
+  StoreGateSvc* pStore(0);
+  static const bool CREATE(true);
+  assert((pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess());
+  assert(pStore);
+  
+  assert(pStore->storeID() == StoreID::EVENT_STORE);
+  pStore->setStoreID(StoreID::SPARE_STORE);
+  assert(pStore->storeID() == StoreID::SPARE_STORE);
+
+  assert((pSvcLoc->service("DetectorStore", pStore)).isSuccess());
+  assert(pStore);
+  assert(pStore->storeID() == StoreID::DETECTOR_STORE);
+  
+  assert((pSvcLoc->service("ConditionsStore", pStore, CREATE)).isSuccess());
+  assert(pStore);
+  assert(pStore->storeID() == StoreID::CONDITION_STORE);
+  
+  cout << "*** StoreID_test OK ***" <<endl;
+  return 0;
+}
+#endif /*NOGAUDI*/
+
+
+
+
+
+
+
+
+
+
+
+
+