diff --git a/AtlasTest/ControlTest/CMakeLists.txt b/AtlasTest/ControlTest/CMakeLists.txt
index f1154868abd6c071446ad716b5bdaec2aaf6ee46..b3861d46beb24cf97be8cfb46a93689e45416a30 100644
--- a/AtlasTest/ControlTest/CMakeLists.txt
+++ b/AtlasTest/ControlTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 754379 2016-06-13 03:05:17Z ssnyder $
+# $Id: CMakeLists.txt 757711 2016-06-26 13:59:12Z ssnyder $
 ################################################################################
 # Package: ControlTest
 ################################################################################
@@ -90,7 +90,7 @@ atlas_add_test( ClearStore_test
    ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
 
 atlas_add_test( StoreID
-   SOURCES test/StoreID.cxx
+   SOURCES test/StoreID_test.cxx
    LINK_LIBRARIES TestTools StoreGateLib
    EXTRA_PATTERNS "^JobOptionsSvc +INFO|Service base class initialized successfully|DEBUG Property update for OutputLevel"
    ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
diff --git a/AtlasTest/ControlTest/cmt/requirements b/AtlasTest/ControlTest/cmt/requirements
index 7baf3f56577d13249886e37e883e5169af042dfb..a9d5a709475b54394aeb6856886b1f2d48f29467 100644
--- a/AtlasTest/ControlTest/cmt/requirements
+++ b/AtlasTest/ControlTest/cmt/requirements
@@ -104,4 +104,3 @@ 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/StoreGateSvcClient_test.ref b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
index 097da413d70726b6f220a1b0f674ea4e5ee2ec43..beebb642110fa6cd2ed962b18b391606347123c3 100644
--- a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
+++ b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
@@ -2,7 +2,7 @@
 
 Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateSvcClient_test.txt
 JobOptionsSvc        INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/ControlTest/StoreGateTestCommon.txt
-JobOptionsSvc        INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore"]
+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
@@ -12,7 +12,7 @@ JobOptionsSvc        INFO Job options successfully read in from ../share/StoreGa
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
-                                          running on karma on Sun Jun 12 22:22:13 2016
+                                          running on karma on Mon Jun 20 11:32:32 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
 ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
@@ -28,100 +28,100 @@ 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 @0x17e79b0 with key pFoo1 of type Foo(CLID 8101)
- in DataObject @0x153baa0
+StoreGateSvc        DEBUG Recorded object @0xc8a740 with key pFoo1 of type Foo(CLID 8101)
+ in DataObject @0xcabaa0
  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 @0x17f2cc0 found in Store for key pFoo1 with clid 8101
+ Pre-existing valid DataProxy @0xf63000 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
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xcab400
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0xca3d60
 <<---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 @0x17e79b0 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0xc8a740 already in store with key=pFoo1. Will not record a duplicate! 
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x151eb00 with key pFoo2 of type Foo(CLID 8101)
- in DataObject @0x17ed010
+StoreGateSvc        DEBUG Recorded object @0xf57d10 with key pFoo2 of type Foo(CLID 8101)
+ in DataObject @0xf70a90
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x187db00 with key cpFoo of type Foo(CLID 8101)
- in DataObject @0x17f2430
+StoreGateSvc        DEBUG Recorded object @0xcaac20 with key cpFoo of type Foo(CLID 8101)
+ in DataObject @0xca0c20
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x18035c0 with key silly of type Foo(CLID 8101)
- in DataObject @0x187ec30
+StoreGateSvc        DEBUG Recorded object @0xf70ae0 with key silly of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  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 @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
+ Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xfcd4e0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xfcd450
 <<---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 @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
+ Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xcab020
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5d370
 <<---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 @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
+ Pre-existing valid DataProxy @0xff0770 found in Store for key silly with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf6f6c0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5d3c0
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x1538d70 with key UnLocked of type Foo(CLID 8101)
- in DataObject @0x1876c60
+StoreGateSvc        DEBUG Recorded object @0xca8d70 with key UnLocked of type Foo(CLID 8101)
+ in DataObject @0xfcfd70
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x18700d0 with key Locked of type Foo(CLID 8101)
- in DataObject @0x1870020
+StoreGateSvc        DEBUG Recorded object @0xca8950 with key Locked of type Foo(CLID 8101)
+ in DataObject @0xf752e0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17e7ab0 with key LockedReset of type Foo(CLID 8101)
- in DataObject @0x18050e0
+StoreGateSvc        DEBUG Recorded object @0xca27d0 with key LockedReset of type Foo(CLID 8101)
+ in DataObject @0xf60b80
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17ebbc0 with key UnLockedReset of type Foo(CLID 8101)
- in DataObject @0x17f0980
+StoreGateSvc        DEBUG Recorded object @0xf70680 with key UnLockedReset of type Foo(CLID 8101)
+ in DataObject @0xf705d0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17eac20 with key LockedDelete of type Foo(CLID 8101)
- in DataObject @0x17eab90
+StoreGateSvc        DEBUG Recorded object @0xf64810 with key LockedDelete of type Foo(CLID 8101)
+ in DataObject @0xf64760
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1533a60 with key UnLockedDelete of type Foo(CLID 8101)
- in DataObject @0x17eadb0
+StoreGateSvc        DEBUG Recorded object @0xcb13b0 with key UnLockedDelete of type Foo(CLID 8101)
+ in DataObject @0xf648b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17ed6d0 with key Const of type Foo(CLID 8101)
- in DataObject @0x17ed6f0
+StoreGateSvc        DEBUG Recorded object @0xf5cb30 with key Const of type Foo(CLID 8101)
+ in DataObject @0xf5b700
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1535ed0 with key Const2 of type Foo(CLID 8101)
- in DataObject @0x1535e20
+StoreGateSvc        DEBUG Recorded object @0xca5f20 with key Const2 of type Foo(CLID 8101)
+ in DataObject @0xca5e70
  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 @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
+ Pre-existing valid DataProxy @0xf60380 found in Store for key Const with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf5d8f0
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0xf5d820
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x15413b0 with key ow of type Foo(CLID 8101)
- in DataObject @0x17eb1e0
+StoreGateSvc        DEBUG Recorded object @0xf757b0 with key ow of type Foo(CLID 8101)
+ in DataObject @0xf5d910
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x17eff70 with key ow of type Foo(CLID 8101)
- in DataObject @0x17efec0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xca4360 with key ow of type Foo(CLID 8101)
+ in DataObject @0xca4430
  object modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x15413b0 with key ow of type Foo(CLID 8101)
- in DataObject @0x17eb1e0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xca4480 with key ow of type Foo(CLID 8101)
+ in DataObject @0xf5d910
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17eff70 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x17efec0
+StoreGateSvc        DEBUG Recorded object @0xca4340 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0xca4430
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x15343a0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x15343c0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xf64010 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0xf63760
  object not modifiable when retrieved
-StoreGateSvc        DEBUG overwrite: Recorded object @0x1534310 with key ow2 of type Foo(CLID 8101)
- in DataObject @0x17efec0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xf63ff0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0xca4430
  object not modifiable when retrieved
 *** StoreGateSvcClient_test records OK ***
 
@@ -223,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 @0x1534450 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x187ec30
+StoreGateSvc        DEBUG Recorded object @0xf63910 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  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 @0x17eff70 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x187ec30
+StoreGateSvc        DEBUG Recorded object @0xca4340 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17eff70 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x187ec30
+StoreGateSvc        DEBUG Recorded object @0xca4340 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  object modifiable when retrieved
 *** StoreGateSvcClient_test removes OK ***
 
 
 
 *** StoreGateSvcClient_test testCreate BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x17eff70 with key pCreateFooDefault of type Foo(CLID 8101)
- in DataObject @0x187ec30
+StoreGateSvc        DEBUG Recorded object @0xca4340 with key pCreateFooDefault of type Foo(CLID 8101)
+ in DataObject @0xf63fa0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x18037a0 with key pCreateFoo1 of type Foo(CLID 8101)
- in DataObject @0x17ff8f0
+StoreGateSvc        DEBUG Recorded object @0xf645a0 with key pCreateFoo1 of type Foo(CLID 8101)
+ in DataObject @0xf72cb0
  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 @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
+ Pre-existing valid DataProxy @0xf6fb40 found in Store for key pCreateFoo1 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf72d00
+ recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0xf72f00
+StoreGateSvc        ERROR create: problem recording created object @0xf72d00 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 @0x1802ba0 with key fooKey of type Foo(CLID 8101)
- in DataObject @0x15390c0
+StoreGateSvc        DEBUG Recorded object @0xca9160 with key fooKey of type Foo(CLID 8101)
+ in DataObject @0xf79970
  object modifiable when retrieved
-StoreGateSvc        DEBUG  Bound handle 0x7ffe8debf8a0 to proxy 0x1802bf0
+StoreGateSvc        DEBUG  Bound handle 0x7fff1094f1e0 to proxy 0xf79b40
 *** StoreGateSvcClient_test bind OK ***
 
 
@@ -272,57 +272,57 @@ Testing dump:
 <<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>> 
 SGImplSvc(StoreGateSvc)::dump():
 Found 1 proxy for ClassID 8100 (Base): 
- flags: (  valid, UNLOCKED,  reset) --- data:  0x1876c60 --- key: UnLocked
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xfcfd70 --- key: UnLocked
 Found 17 proxies for ClassID 8101 (Foo): 
- 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: (  valid,   locked,  reset) --- data:   0xf5b700 --- key: Const
+ flags: (  valid,   locked,  reset) --- data:   0xca5e70 --- key: Const2
+ flags: (  valid,   locked,  reset) --- data:   0xf752e0 --- key: Locked
+ flags: (  valid,   locked, DELETE) --- data:   0xf64760 --- key: LockedDelete
+ flags: (  valid,   locked,  reset) --- data:   0xf60b80 --- key: LockedReset
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xfcfd70 --- key: UnLocked
+ flags: (  valid, UNLOCKED, DELETE) --- data:   0xf648b0 --- key: UnLockedDelete
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf705d0 --- key: UnLockedReset
+ flags: (  valid,   locked,  reset) --- data:   0xca0c20 --- key: cpFoo
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf79970 --- key: fooKey
+ flags: (  valid, UNLOCKED, DELETE) --- data:   0xf5d910 --- key: ow
+ flags: (  valid,   locked, DELETE) --- data:   0xca4430 --- key: ow2
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf72cb0 --- key: pCreateFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf63fa0 --- key: pCreateFooDefault
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xcabaa0 --- key: pFoo1
+ flags: (  valid, UNLOCKED,  reset) --- data:   0xf70a90 --- 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 @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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe8810, recorded with key=UnLocked, CLID=8101, containing data object @0xfcfd70  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf60380, recorded with key=Const, CLID=8101, containing data object @0xf5b700  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca38c0, recorded with key=Const2, CLID=8101, containing data object @0xca5e70  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf60ab0, recorded with key=Locked, CLID=8101, containing data object @0xf752e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca4ad0, recorded with key=LockedDelete, CLID=8101, containing data object @0xf64760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfef5b0, recorded with key=LockedReset, CLID=8101, containing data object @0xf60b80  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe8810, recorded with key=UnLocked, CLID=8101, containing data object @0xfcfd70  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5b610, recorded with key=UnLockedDelete, CLID=8101, containing data object @0xf648b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf64670, recorded with key=UnLockedReset, CLID=8101, containing data object @0xf705d0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xfe3b80, recorded with key=cpFoo, CLID=8101, containing data object @0xca0c20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79b40, recorded with key=fooKey, CLID=8101, containing data object @0xf79970  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca41f0, recorded with key=ow, CLID=8101, containing data object @0xf5d910  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42c0, recorded with key=ow2, CLID=8101, containing data object @0xca4430  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf6fb40, recorded with key=pCreateFoo1, CLID=8101, containing data object @0xf72cb0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca43b0, recorded with key=pCreateFooDefault, CLID=8101, containing data object @0xf63fa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=pFoo1, CLID=8101, containing data object @0xcabaa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=pFoo2, CLID=8101, containing data object @0xf70a90  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xff0770, recorded with key=silly, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0xfee4a0 with key d1 of type D1(CLID 8112)
+ in DataObject @0xff2600
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object d1  of type B1(CLID 8111)
-0x1804980
-0x1804770StoreGateSvc
+0xf74cc0
+0xf74ab0StoreGateSvc
 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 @0x1534470 with key d2 of type D1(CLID 8112)
- in DataObject @0x17eb320
+StoreGateSvc        DEBUG Recorded object @0xc8ecc0 with key d2 of type D1(CLID 8112)
+ in DataObject @0xff7550
  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)
@@ -331,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 @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      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=dd, CLID=8112, containing data object @0xff8280  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=d2, CLID=8112, containing data object @0xff7550  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xc9ff20, recorded with key=dd, CLID=8112, containing data object @0xf70a90  ... -> 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 @0x1827ea0 with key pSwapFoo1 of type Foo(CLID 8101)
- in DataObject @0x18096f0
+StoreGateSvc        DEBUG Recorded object @0xf645a0 with key pSwapFoo1 of type Foo(CLID 8101)
+ in DataObject @0xf5d9b0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x153c7b0 with key pSwapFoo2 of type Foo(CLID 8101)
- in DataObject @0x17ff8f0
+StoreGateSvc        DEBUG Recorded object @0xf72f90 with key pSwapFoo2 of type Foo(CLID 8101)
+ in DataObject @0xf6fc10
  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)
@@ -354,81 +354,81 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object pSwapFoo2  of typ
 
 
 *** StoreGateSvcClient_test VersionedKey BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x1530580 with key aVersObj of type Foo(CLID 8101)
- in DataObject @0x17ff760
+StoreGateSvc        DEBUG Recorded object @0xca0580 with key aVersObj of type Foo(CLID 8101)
+ in DataObject @0xf78df0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved non-const handle to object aVersObj  of type Foo(CLID 8101)
-StoreGateSvc        DEBUG Recorded object @0x1534820 with key ;77;aVersObj of type Foo(CLID 8101)
- in DataObject @0x1533d60
+StoreGateSvc        DEBUG Recorded object @0xca9b00 with key ;77;aVersObj of type Foo(CLID 8101)
+ in DataObject @0xf5bc40
  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 @0x17f3cb0 with key ;88;aVersObj of type Foo(CLID 8101)
- in DataObject @0x17f0010
+StoreGateSvc        DEBUG Recorded object @0xcaac20 with key ;88;aVersObj of type Foo(CLID 8101)
+ in DataObject @0xcab300
  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 @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
+ Pre-existing valid DataProxy @0xca3910 found in Store for key ;88;aVersObj with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf77d60
+ recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0xf5d3c0
 <<---Error Message Ends-------
-StoreGateSvc        DEBUG Recorded object @0x17eb370 with key ;66;aVersObj of type Foo(CLID 8101)
- in DataObject @0x188bc20
+StoreGateSvc        DEBUG Recorded object @0xca4c60 with key ;66;aVersObj of type Foo(CLID 8101)
+ in DataObject @0xf5d410
  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 @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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=aVersObj, CLID=8101, containing data object @0xf78df0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=;66;aVersObj, CLID=8101, containing data object @0xf5d410  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=;77;aVersObj, CLID=8101, containing data object @0xf5bc40  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=;88;aVersObj, CLID=8101, containing data object @0xcab300  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=;66;aVersObj, CLID=8101, containing data object @0xf5d410  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=pSwapFoo1, CLID=8101, containing data object @0xf6fc10  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=pSwapFoo2, CLID=8101, containing data object @0xf5d9b0  ... -> DONE
 *** test_DVL_conversions
-StoreGateSvc        DEBUG Recorded object @0x18097f0 with key contd of type CV(CLID 82734625)
- in DataObject @0x1541200
+StoreGateSvc        DEBUG Recorded object @0xf70560 with key contd of type CV(CLID 82734625)
+ in DataObject @0xc9ff20
  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 @0x1802410 with key contd of type CL(CLID 82734626)
- in DataObject @0x17efe40
+StoreGateSvc        DEBUG Recorded object @0xfc13b0 with key contd of type CL(CLID 82734626)
+ in DataObject @0xf5d820
  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 @0x17eacc0 with key dvl of type CV(CLID 82734625)
- in DataObject @0x17f2cc0
+StoreGateSvc        DEBUG Recorded object @0xca8f50 with key dvl of type CV(CLID 82734625)
+ in DataObject @0xf63000
  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 @0x185c250 with key dvl2 of type CV(CLID 82734625)
- in DataObject @0x185c360
+StoreGateSvc        DEBUG Recorded object @0xf79a20 with key dvl2 of type CV(CLID 82734625)
+ in DataObject @0xf64740
  object not modifiable when retrieved
 StoreGateSvc        DEBUG Retrieved const handle to object dvl2  of type CV(CLID 82734625)
-StoreGateSvc        DEBUG Recorded object @0x15310b0 with key dvl of type CL(CLID 82734626)
- in DataObject @0x17f4400
+StoreGateSvc        DEBUG Recorded object @0xf5d8f0 with key dvl of type CL(CLID 82734626)
+ in DataObject @0xca42e0
  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 @0x17e7ab0 with key dvl2 of type CL(CLID 82734626)
- in DataObject @0x153ccc0
+StoreGateSvc        DEBUG Recorded object @0xf57df0 with key dvl2 of type CL(CLID 82734626)
+ in DataObject @0xcabc20
  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 @0x17f2ea0 with key x of type Athena_test::X(CLID 82734627)
- in DataObject @0x153be00
+StoreGateSvc        DEBUG Recorded object @0xf65610 with key x of type Athena_test::X(CLID 82734627)
+ in DataObject @0xf5eaa0
  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
@@ -437,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 @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
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0xc9ff20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0xf5d820  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0xf63000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0xf64740  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0xca42e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0xcabc20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0xf5eaa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0xcabbe0 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0xf5eaa0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1809cb0 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x17f07c0
+StoreGateSvc        DEBUG Recorded object @0xf5b220 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0xf5b520
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17f30f0 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x1535540
+StoreGateSvc        DEBUG Recorded object @0xcb13b0 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0xf63370
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17f3130 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x17eff10
+StoreGateSvc        DEBUG Recorded object @0xf65890 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0xca39e0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-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      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=LockDelete, CLID=8101, containing data object @0xf63370  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=LockReset, CLID=8101, containing data object @0xf5eaa0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=UnLockDelete, CLID=8101, containing data object @0xca39e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=UnLockReset, CLID=8101, containing data object @0xf5b520  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=UnLockDelete, CLID=8101, containing data object @0xca39e0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, 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 @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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabc20, recorded with key=LockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42e0, recorded with key=UnLockReset, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=contd, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, recorded with key=dvl, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=dvl2, CLID=82734625, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=contd, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=dvl, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=dvl2, CLID=82734626, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=x, CLID=82734627, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0xf655f0 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0xca53b0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x184d530 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x153cbc0
+StoreGateSvc        DEBUG Recorded object @0xfef610 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0xcabca0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1802c50 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x17ff760
+StoreGateSvc        DEBUG Recorded object @0xf5e870 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0xf5da50
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17ebd80 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x184d4e0
+StoreGateSvc        DEBUG Recorded object @0xf602a0 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0xf5d8a0
  object modifiable when retrieved
 StoreGateSvc        DEBUG Clearing store with forceRemove=0
-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      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=LockDelete, CLID=8101, containing data object @0xf5da50  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=LockReset, CLID=8101, containing data object @0xca53b0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=UnLockDelete, CLID=8101, containing data object @0xf5d8a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=UnLockReset, CLID=8101, containing data object @0xcabca0  ... -> DONE
 StoreGateSvc        DEBUG Clearing store with forceRemove=1
 
 *** StoreGateSvcClient_test Keys ENDS ***
 
 *** StoreGateSvcClient_test retrieveAux BEGINS ***
-StoreGateSvc        DEBUG Recorded object @0x153ceb0 with key BVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x17f0850
+StoreGateSvc        DEBUG Recorded object @0xcabdb0 with key BVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0xf5b620
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17ff1a0 with key BVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x184d4e0
+StoreGateSvc        DEBUG Recorded object @0xf65900 with key BVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0xf5d8a0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x17f2fd0 with key CVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x1870090
+StoreGateSvc        DEBUG Recorded object @0xf5ea50 with key CVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0xf647c0
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1538d70 with key CVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x1802aa0
+StoreGateSvc        DEBUG Recorded object @0xf9d7a0 with key CVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0xf74000
  object not modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1804ff0 with key ErrorVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x1535e50
+StoreGateSvc        DEBUG Recorded object @0xf79c20 with key ErrorVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0xca4a30
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x184d4b0 with key BBVec of type TestVector<BBX>(CLID 125040193)
- in DataObject @0x1802b90
+StoreGateSvc        DEBUG Recorded object @0xfef5e0 with key BBVec of type TestVector<BBX>(CLID 125040193)
+ in DataObject @0xf740f0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x182bb60 with key BBVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x1538fc0
+StoreGateSvc        DEBUG Recorded object @0xfeca80 with key BBVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0xca4b20
  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)
@@ -584,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 @0x153cc50 with key BStand of type BX(CLID 82835621)
- in DataObject @0x1533a50
+StoreGateSvc        DEBUG Recorded object @0xff07f0 with key BStand of type BX(CLID 82835621)
+ in DataObject @0xca8ff0
  object modifiable when retrieved
-StoreGateSvc        DEBUG Recorded object @0x1539080 with key BStandAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x17f07c0
+StoreGateSvc        DEBUG Recorded object @0xcab020 with key BStandAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0xf5b520
  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)
@@ -597,8 +597,8 @@ StoreGateSvc        DEBUG Retrieved non-const handle to object BStand  of type B
 
 
 *** StoreGateSvcClient_test testBoundReset BEGINS ***
-StoreGateSvc        DEBUG overwrite: Recorded object @0x153bd20 with key testBoundReset of type int(CLID 244260744)
- in DataObject @0x153cdb0
+StoreGateSvc        DEBUG overwrite: Recorded object @0xf5e9c0 with key testBoundReset of type int(CLID 244260744)
+ in DataObject @0xcabd60
  object modifiable when retrieved
 
 *** StoreGateSvcClient_test testBoundReset OK ***
@@ -608,103 +608,114 @@ StoreGateSvc        DEBUG overwrite: Recorded object @0x153bd20 with key testBou
 *** 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
+ Pre-existing valid DataProxy @0xf63000 found in Store for key obj101 with clid 8101
+StoreGateSvc      WARNING record_impl: Problem setting up the proxy for object @0xf5e9a0
+ recorded with key obj101 of type Foo (CLID 8101) in DataObject @0xf72a60
 <<< 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! 
+ object @0xf73f40 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
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0xf63370  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0xca50c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0xf5b620  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0xf647c0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0xca4a30  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0xca8ff0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0xca4b20  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0xf5b520  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0xf5d8a0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0xf74000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=BBVec, CLID=125040193, containing data object @0xf740f0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=testBoundReset, CLID=244260744, containing data object @0xcabd60  ... -> DONE
 
 *** StoreGateSvcClient_test testRecordObject OK ***
+
+*** StoreGateSvcClient_test testWriteAux BEGINS ***
+
+*** StoreGateSvcClient_test testWriteAux OK ***
 *** test_lock
-StoreGateSvc        DEBUG Recorded object @0x1809cb0 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0x1535540
+StoreGateSvc        DEBUG Recorded object @0xf70ae0 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0xf74000
  object modifiable when retrieved
 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 @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
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf633f0, recorded with key=lockable1, CLID=82734636, containing data object @0xf74000  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf64740, recorded with key=testWriteAux, CLID=82835621, containing data object @0xf63370  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xc9ff20, recorded with key=testWriteAuxAux., CLID=125030194, containing data object @0xf70760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() requesting release of DataProxy @0xf79940, recorded with key=BBVec, CLID=125040193, containing data object @0  ... -> DONE
+StoreGateSvc        DEBUG Recorded object @0xf5e9a0 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0xf70760
  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 @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
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf5d820, recorded with key=obj102, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf63000, recorded with key=obj101, CLID=8101, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf633f0, recorded with key=lockable1, CLID=82734636, containing data object @0xf70760  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabde0, recorded with key=BVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf65760, recorded with key=CVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf601d0, recorded with key=ErrorVec, CLID=82735621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca42e0, recorded with key=BStand, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf64740, recorded with key=testWriteAux, CLID=82835621, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca0c20, recorded with key=BBVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xcabc20, recorded with key=BStandAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xca3910, recorded with key=BVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf73ec0, recorded with key=CVecAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xc9ff20, recorded with key=testWriteAuxAux., CLID=125030194, containing data object @0  ... -> DONE
+StoreGateSvc      VERBOSE DataStore::clearStore() forcing release of DataProxy @0xf79940, 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 @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
+ Pre-existing valid DataProxy @0xf79940 found in Store for key pFoo1 with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xca4480
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0xf72d70
 <<---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 @0x187db00 already in store with key=pFoo1. Will not record a duplicate! 
+ object @0xf64700 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 @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
+ Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5e9a0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xcabaa0
 <<---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 @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
+ Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5e870
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xf5da00
 <<---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 @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
+ Pre-existing valid DataProxy @0xca3910 found in Store for key silly with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5ea10
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0xcab370
 <<---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 @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
+ Pre-existing valid DataProxy @0xcabde0 found in Store for key Const with clid 8101
+DetectorStore     WARNING record_impl: Problem setting up the proxy for object @0xf5b5b0
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0xf5e7d0
 <<---Error Message Ends-------
 IOVSvc               INFO No IOVSvcTool associated with store "StoreGateSvc"
 IOVSvcTool           INFO IOVRanges will be checked at every Event
diff --git a/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx b/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
index 00388a9e083c9fba699e20b1f0f5f1885abe9b4e..c68bfe124fc00d21aefce0ff1178058169669c13 100644
--- a/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
+++ b/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
@@ -122,7 +122,7 @@ void testReadPrivate(StoreGateSvc& rSG) {
   SGASSERTERROR((rSG.readPrivateCopy<Foo>("NotThere")).get() != 0);
   
   apFoo=rSG.readUniquePrivateCopy<Foo>("diskFoo");
-  assert(0 != &*apFoo);
+  assert(0 != apFoo.get());
   assert(floatEQ(0, static_cast<float>(apFoo->a()))); //check that our Foo is the def constr one
 
   //now test the situation in which we have a transient obj in the way
@@ -132,11 +132,11 @@ void testReadPrivate(StoreGateSvc& rSG) {
   assert(rSG.overwrite(CxxUtils::make_unique<Foo>(6.28), "privFoo").isSuccess());
   
   apFoo=rSG.readUniquePrivateCopy<Foo>("privFoo");
-  assert(0 != &*apFoo);
+  assert(0 != apFoo.get());
   assert(floatNEQ(6.28f, static_cast<float>(apFoo->a()))); //check that our Foo is a different one
   apFoo->setA(3.14);
   std::unique_ptr<Foo> bpFoo(rSG.readUniquePrivateCopy<Foo>("privFoo"));
-  assert(0 != &*bpFoo);
+  assert(0 != bpFoo.get());
   assert(&*bpFoo != &*apFoo); //two independent instances
   assert(floatNEQ(6.28f, static_cast<float>(bpFoo->a()))); 
   assert(floatNEQ(3.14f, static_cast<float>(bpFoo->a()))); 
diff --git a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
index af9aab28a53f84e510ffa964456ecc1b69f6c0c2..d669a54d4f8bacdb9a1639ccd0df1c3d78dfe4cb 100644
--- a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
+++ b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
@@ -350,6 +350,8 @@ int main() {
 
   testRecordObject(*pStore);
 
+  testWriteAux(*pStore);
+
   test_lock (*pStore);
 
   pStore->finalize().ignore();