diff --git a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
index 1ad5aba7cf8f9b10d94b4f11f5dc3afc96590006..76d0c48837be2368cbc543cb07063015408306fb 100644
--- a/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
+++ b/Reconstruction/RecExample/RecExConfig/python/AutoConfiguration.py
@@ -489,20 +489,28 @@ def ConfigureBeamBunchSpacing():
                   logAutoConfiguration.info("Run-1 data, set to 50ns.")
                   jobproperties.Beam.bunchSpacing.set_Value_and_Lock(50)
                   # could have just left default, but at least this is explicit.
-                  pass
+                  return
             #Real data collision run, try to get bunch spacing from database
             from CoolConvUtilities.BunchSpacingUtils import bunchSpacingOfRun
-            bc=bunchSpacingOfRun(runnumber,GetLBNumber())
-            if bc is not None and bc==1: 
+            
+            lb=GetLBNumber()
+            if lb is None:
+                logAutoConfiguration.info("No LB nubmer, autoconfigure to 25 ns")
+                jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25)
+                return
+
+            bc=bunchSpacingOfRun(runnumber,lb)
+            if bc is None:
+                logAutoConfiguration.info("No data, autoconfigure to 25 ns")
+                jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25)
+                return
+
+            if bc==1: 
                 jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25)
                 logAutoConfiguration.info("Autoconfigure bunch-spacing to 25 ns")
             else:
-                if bc is None:
-                  logAutoConfiguration.info("No data, autoconfigure to 25 ns")
-                  jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25)
-                else: 
-                  logAutoConfiguration.info("No data or larger bunch spacing, autoconfigure to 50 ns")
-                  pass
+                logAutoConfiguration.info("larger bunch spacing, leave default value of %i ns" % jobproperties.Beam.bunchSpacing())
+                pass
             pass
         else:
             logAutoConfiguration.info("Not a collisions run, bunch spacing not autoconfigured")
diff --git a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
index 722b15669fe6e6e519fcb62fb93cda9f0a9bd525..6488a367a95a841fefa93887304338ad9bd34e1b 100755
--- a/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
+++ b/Reconstruction/RecExample/RecExConfig/python/RecFlags.py
@@ -975,6 +975,12 @@ class doExpressProcessing(JobProperty):
     allowedTypes=['bool']
     StoredValue=False
 
+class doPersistencyOptimization(JobProperty):
+    """ Enable optimization POOL/ROOT configuration
+    """
+    statusOn=True
+    allowedTypes=['bool']
+    StoredValue=True
 
 #
 # Defines a sub-container for the algorithm switches
@@ -1006,7 +1012,7 @@ doWriteAOD, doWritexAOD, doWriteESD, doWriteBS, doWriteRDO, doWriteTAG, doWriteT
 readESD, doDetStatus, AMITag, AutoConfiguration, RunNumber, triggerStream, projectName, \
 doInDet,doLArg,doTile,doCalo,doMuon,doForwardDet,doLucid,doZdc,doAlfa,doAFP,doFwdRegion,doJetMissingETTag,doEgamma,doMuonCombined,doTau,doFTK,doTrigger,doBTagging, Production, doPhysValMonHists, \
 doHeavyIon, doHIP, doLowPt, doMinimalRec, noESDTrigger,doFileMetaData,ScopingLevel, Commissioning, oldRecExCommissionConfig, mergingStreamName, LCGCMTVersion, \
-AtlasReleaseVersion, inputFileFromAthenaVersion, doApplyAODFix, doAODSelect, doRDOTrigger, doFastPhysMonitoring, RootFastPhysMonOutput,doWriteCalibHits, doTriggerFilter, triggerFilterList, doContainerRemapping, doPhysicsValidationAugmentation, doESDReconstruction, doExpressProcessing ]
+AtlasReleaseVersion, inputFileFromAthenaVersion, doApplyAODFix, doAODSelect, doRDOTrigger, doFastPhysMonitoring, RootFastPhysMonOutput,doWriteCalibHits, doTriggerFilter, triggerFilterList, doContainerRemapping, doPhysicsValidationAugmentation, doESDReconstruction, doExpressProcessing,doPersistencyOptimization]
 for j in _list_Rec:
     jobproperties.Rec.add_JobProperty(j)
 del _list_Rec