diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 64c785b9b922a19f13a81d57646fa6ef351a68d6..a6464a2b8ab237a2995af1557b6583fea5452fbc 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -342,9 +342,11 @@ def initConfigFlags():
         acf.addFlag("IOVDb.CleanerRingSize",lambda prevFlags : 0 if prevFlags.Trigger.doHLT else 2*max(1, prevFlags.Concurrency.NumConcurrentEvents), help='size of ring-buffer for conditions cleaner')
         acf.addFlag("IOVDb.SqliteInput","",help="Folders found in this file will be used instead of the production db")
         acf.addFlag("IOVDb.SqliteFolders",(),help="Folders listed here will be taken from the IOVDb.SqliteInput file instead of the production db. If empty, all folders found in the file are used.")
+
 #PoolSvc Flags:
     acf.addFlag("PoolSvc.MaxFilesOpen", lambda prevFlags : 2 if prevFlags.MP.UseSharedReader else 0, help='maximum number of open files')
     acf.addFlag('PoolSvc.DefaultContainerType', 'ROOTTREEINDEX', help='set the underlying POOL storage technology for the default container type')
+    acf.addFlag("PoolSvc.PersSvcPerInputType", False, help='enable separate persistency service for each input type')
 
 
     def __bfield():
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolCommonConfig.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolCommonConfig.py
index fa0ba63a7b0cedb7a74d9d70adc01e5499b6db98..811c5bc89a3bb8fcf05defde6e24b803675c8a69 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolCommonConfig.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolCommonConfig.py
@@ -30,6 +30,9 @@ def PoolSvcCfg(flags, withCatalogs=False, **kwargs):
 def AthenaPoolCnvSvcCfg(flags, **kwargs):
     acc = PoolSvcCfg(flags)
 
+    if flags.PoolSvc.PersSvcPerInputType:
+        kwargs.setdefault("PersSvcPerInputType", "CollectionTree")
+
     service = CompFactory.AthenaPoolCnvSvc(**kwargs)
     acc.addService(service)
     acc.addService(CompFactory.EvtPersistencySvc("EventPersistencySvc",