diff --git a/FWCore/Framework/interface/DataProxy.h b/FWCore/Framework/interface/DataProxy.h
index 9832bb4a759cf..b98c227687289 100644
--- a/FWCore/Framework/interface/DataProxy.h
+++ b/FWCore/Framework/interface/DataProxy.h
@@ -20,6 +20,7 @@
 //
 
 // system include files
+#include <atomic>
 
 // user include files
 
@@ -37,7 +38,7 @@ namespace edm {
          virtual ~DataProxy();
 
          // ---------- const member functions ---------------------
-         bool cacheIsValid() const { return cacheIsValid_; }
+         bool cacheIsValid() const { return cacheIsValid_.load(std::memory_order_acquire); }
 
          void doGet(EventSetupRecord const& iRecord, DataKey const& iKey, bool iTransiently) const;
          void const* get(EventSetupRecord const&, DataKey const& iKey, bool iTransiently) const;
@@ -85,12 +86,11 @@ namespace edm {
          DataProxy(DataProxy const&); // stop default
 
          DataProxy const& operator=(DataProxy const&); // stop default
-         void setCacheIsValidAndAccessType(bool iTransientAccessOnly) const;
 
          // ---------- member data --------------------------------
-         mutable void const* cache_;
-         mutable bool cacheIsValid_;
-         mutable bool nonTransientAccessRequested_;
+         mutable void const* cache_; //protected by a global mutex
+         mutable std::atomic<bool> cacheIsValid_;
+         mutable std::atomic<bool> nonTransientAccessRequested_;
          ComponentDescription const* description_;
       };
    }
diff --git a/FWCore/Framework/interface/EDAnalyzer.h b/FWCore/Framework/interface/EDAnalyzer.h
index 4721777a62f65..5200cb6e13158 100644
--- a/FWCore/Framework/interface/EDAnalyzer.h
+++ b/FWCore/Framework/interface/EDAnalyzer.h
@@ -5,8 +5,10 @@
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 
 #include <string>
+#include <mutex>
 
 // EDAnalyzer is the base class for all analyzer "modules".
 
@@ -25,7 +27,7 @@ namespace edm {
     template <typename T> friend class WorkerT;
     typedef EDAnalyzer ModuleType;
 
-    EDAnalyzer() : moduleDescription_() {}
+    EDAnalyzer();
     virtual ~EDAnalyzer();
     
     std::string workerType() const {return "WorkerT<EDAnalyzer>";}
@@ -75,6 +77,8 @@ namespace edm {
       moduleDescription_ = md;
     }
     ModuleDescription moduleDescription_;
+    SharedResourcesAcquirer resourceAcquirer_;
+    std::mutex mutex_;
 
     std::function<void(BranchDescription const&)> callWhenNewProductsRegistered_;
   };
diff --git a/FWCore/Framework/interface/EDFilter.h b/FWCore/Framework/interface/EDFilter.h
index 4159119270556..d9813990d4a43 100644
--- a/FWCore/Framework/interface/EDFilter.h
+++ b/FWCore/Framework/interface/EDFilter.h
@@ -14,11 +14,14 @@ These products should be informational products about the filter decision.
 #include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
+
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 
 #include <string>
 #include <vector>
+#include <mutex>
 
 namespace edm {
   namespace maker {
@@ -34,9 +37,7 @@ namespace edm {
     template <typename T> friend class WorkerT;
     typedef EDFilter ModuleType;
     
-     EDFilter() : ProducerBase() , moduleDescription_(),
-     previousParentage_(), previousParentageId_() {
-    }
+    EDFilter();
     virtual ~EDFilter();
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
@@ -90,6 +91,8 @@ namespace edm {
     }
     ModuleDescription moduleDescription_;
     std::vector<BranchID> previousParentage_;
+    SharedResourcesAcquirer resourceAcquirer_;
+    std::mutex mutex_;
     ParentageID previousParentageId_;
   };
 }
diff --git a/FWCore/Framework/interface/EDProducer.h b/FWCore/Framework/interface/EDProducer.h
index 27b016b705d2d..5bad51b5ffd1c 100644
--- a/FWCore/Framework/interface/EDProducer.h
+++ b/FWCore/Framework/interface/EDProducer.h
@@ -11,12 +11,14 @@ EDProducts into an Event.
 
 #include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 
 #include <string>
 #include <vector>
+#include <mutex>
 
 namespace edm {
 
@@ -85,6 +87,8 @@ namespace edm {
     }
     ModuleDescription moduleDescription_;
     std::vector<BranchID> previousParentage_;
+    SharedResourcesAcquirer resourceAcquirer_;
+    std::mutex mutex_;
     ParentageID previousParentageId_;
   };
 }
diff --git a/FWCore/Framework/interface/EventProcessor.h b/FWCore/Framework/interface/EventProcessor.h
index 7fabd8dbada79..d8f406f107619 100644
--- a/FWCore/Framework/interface/EventProcessor.h
+++ b/FWCore/Framework/interface/EventProcessor.h
@@ -34,6 +34,8 @@ configured in the user's main() function, and is set running.
 #include <set>
 #include <string>
 #include <vector>
+#include <mutex>
+#include <exception>
 
 namespace statemachine {
   class Machine;
@@ -230,6 +232,11 @@ namespace edm {
 
     void possiblyContinueAfterForkChildFailure();
     
+    friend class StreamProcessingTask;
+    void processEventsForStreamAsync(unsigned int iStreamIndex,
+                                     std::atomic<bool>* finishedProcessingEvents);
+    
+    
     //read the next event using Stream iStreamIndex
     void readEvent(unsigned int iStreamIndex);
 
@@ -262,6 +269,11 @@ namespace edm {
     std::unique_ptr<FileBlock>                    fb_;
     boost::shared_ptr<EDLooperBase>               looper_;
 
+    //The atomic protects concurrent access of deferredExceptionPtr_
+    std::atomic<bool>                             deferredExceptionPtrIsSet_;
+    std::exception_ptr                            deferredExceptionPtr_;
+    
+    std::mutex                                    nextTransitionMutex_;
     PrincipalCache                                principalCache_;
     bool                                          beginJobCalled_;
     bool                                          shouldWeStop_;
diff --git a/FWCore/Framework/interface/OutputModule.h b/FWCore/Framework/interface/OutputModule.h
index 3acd20bf01a44..bd27d2564d6f8 100644
--- a/FWCore/Framework/interface/OutputModule.h
+++ b/FWCore/Framework/interface/OutputModule.h
@@ -21,12 +21,16 @@ output stream.
 #include "FWCore/Framework/interface/ProductSelector.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/getAllTriggerNames.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
+
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 
 #include <array>
 #include <string>
 #include <vector>
 #include <map>
+#include <atomic>
+#include <mutex>
 
 namespace edm {
 
@@ -119,7 +123,7 @@ namespace edm {
   private:
 
     int maxEvents_;
-    int remainingEvents_;
+    std::atomic<int> remainingEvents_;
 
     // TODO: Give OutputModule
     // an interface (protected?) that supplies client code with the
@@ -161,6 +165,9 @@ namespace edm {
 
     BranchChildren branchChildren_;
 
+    SharedResourcesAcquirer resourceAcquirer_;
+    std::mutex mutex_;
+
     //------------------------------------------------------------------
     // private member functions
     //------------------------------------------------------------------
diff --git a/FWCore/Framework/interface/SharedResourcesAcquirer.h b/FWCore/Framework/interface/SharedResourcesAcquirer.h
new file mode 100644
index 0000000000000..f509d74323126
--- /dev/null
+++ b/FWCore/Framework/interface/SharedResourcesAcquirer.h
@@ -0,0 +1,69 @@
+#ifndef Subsystem_Package_SharedResourcesAcquirer_h
+#define Subsystem_Package_SharedResourcesAcquirer_h
+// -*- C++ -*-
+//
+// Package:     Subsystem/Package
+// Class  :     SharedResourcesAcquirer
+// 
+/**\class SharedResourcesAcquirer SharedResourcesAcquirer.h "SharedResourcesAcquirer.h"
+
+ Description: Handles acquiring and releasing a group of resources shared between modules
+
+ Usage:
+    <usage>
+
+*/
+//
+// Original Author:  Chris Jones
+//         Created:  Sun, 06 Oct 2013 19:43:26 GMT
+//
+
+// system include files
+
+// user include files
+#include <vector>
+#include <mutex>
+#include <memory>
+
+// forward declarations
+class testSharedResourcesRegistry;
+namespace edm {
+  class SharedResourcesAcquirer
+  {
+  public:
+    friend class ::testSharedResourcesRegistry;
+    
+    SharedResourcesAcquirer() = default;
+    explicit SharedResourcesAcquirer(std::vector<std::recursive_mutex*>&& iResources):
+    m_resources(iResources){}
+    
+    SharedResourcesAcquirer(SharedResourcesAcquirer&&) = default;
+    SharedResourcesAcquirer(const SharedResourcesAcquirer&) = default;
+    SharedResourcesAcquirer& operator=(const SharedResourcesAcquirer&) = default;
+    
+    ~SharedResourcesAcquirer() = default;
+    
+    // ---------- member functions ---------------------------
+    void lock();
+    void unlock();
+    
+    ///Used by the framework to temporarily unlock a resource in the case where a module is temporarily suspended,
+    /// e.g. when a Event::getByLabel call launches a Producer via unscheduled processing
+    template<typename FUNC>
+    void temporaryUnlock(FUNC iFunc) {
+      std::shared_ptr<SharedResourcesAcquirer*> guard(this,[](SharedResourcesAcquirer* iThis) {iThis->lock();});
+      this->unlock();
+      iFunc();
+    }
+    
+    ///The number returned may be less than the number of resources requested if a resource is only used by one module and therefore is not being shared.
+    size_t numberOfResources() const { return m_resources.size();}
+  private:
+    
+    // ---------- member data --------------------------------
+    std::vector<std::recursive_mutex*> m_resources;
+  };
+}
+
+
+#endif
diff --git a/FWCore/Framework/interface/one/EDAnalyzerBase.h b/FWCore/Framework/interface/one/EDAnalyzerBase.h
index 4e47fd0c1d969..78b6b587e8477 100644
--- a/FWCore/Framework/interface/one/EDAnalyzerBase.h
+++ b/FWCore/Framework/interface/one/EDAnalyzerBase.h
@@ -19,10 +19,12 @@
 //
 
 // system include files
+#include <mutex>
 
 // user include files
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 
@@ -97,11 +99,16 @@ namespace edm {
       virtual void doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c);
       virtual void doEndLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c);
 
+      virtual SharedResourcesAcquirer createAcquirer();
+
       void setModuleDescription(ModuleDescription const& md) {
         moduleDescription_ = md;
       }
       ModuleDescription moduleDescription_;
       std::function<void(BranchDescription const&)> callWhenNewProductsRegistered_;
+      
+      SharedResourcesAcquirer resourcesAcquirer_;
+      std::mutex mutex_;
     };
   }
 }
diff --git a/FWCore/Framework/interface/one/EDFilterBase.h b/FWCore/Framework/interface/one/EDFilterBase.h
index 3244e1173f1a2..259b28bbb9685 100644
--- a/FWCore/Framework/interface/one/EDFilterBase.h
+++ b/FWCore/Framework/interface/one/EDFilterBase.h
@@ -19,11 +19,13 @@
 //
 
 // system include files
+#include <mutex>
 
 // user include files
 #include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 
@@ -99,8 +101,9 @@ namespace edm {
       virtual void doEndRunProduce_(Run& rp, EventSetup const& c);
       virtual void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c);
       virtual void doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c);
-
       
+      virtual SharedResourcesAcquirer createAcquirer();
+
       void setModuleDescription(ModuleDescription const& md) {
         moduleDescription_ = md;
       }
@@ -108,6 +111,8 @@ namespace edm {
       std::vector<BranchID> previousParentage_;
       ParentageID previousParentageId_;
 
+      SharedResourcesAcquirer resourcesAcquirer_;
+      std::mutex mutex_;
     };
     
   }
diff --git a/FWCore/Framework/interface/one/EDProducerBase.h b/FWCore/Framework/interface/one/EDProducerBase.h
index 058144bc7ff7d..6a5da792b703d 100644
--- a/FWCore/Framework/interface/one/EDProducerBase.h
+++ b/FWCore/Framework/interface/one/EDProducerBase.h
@@ -19,11 +19,13 @@
 //
 
 // system include files
+#include <mutex>
 
 // user include files
 #include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 
@@ -99,6 +101,7 @@ namespace edm {
       virtual void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c);
       virtual void doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c);
 
+      virtual SharedResourcesAcquirer createAcquirer();
       
       void setModuleDescription(ModuleDescription const& md) {
         moduleDescription_ = md;
@@ -107,6 +110,8 @@ namespace edm {
       std::vector<BranchID> previousParentage_;
       ParentageID previousParentageId_;
 
+      SharedResourcesAcquirer resourcesAcquirer_;
+      std::mutex mutex_;
     };
     
   }
diff --git a/FWCore/Framework/interface/one/OutputModuleBase.h b/FWCore/Framework/interface/one/OutputModuleBase.h
index 47d5d944e172d..d043a4f48bfa3 100644
--- a/FWCore/Framework/interface/one/OutputModuleBase.h
+++ b/FWCore/Framework/interface/one/OutputModuleBase.h
@@ -23,7 +23,8 @@
 #include <string>
 #include <vector>
 #include <map>
-
+#include <atomic>
+#include <mutex>
 
 // user include files
 #include "DataFormats/Provenance/interface/BranchChildren.h"
@@ -39,6 +40,7 @@
 #include "FWCore/Framework/interface/ProductSelector.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/getAllTriggerNames.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 
 // forward declarations
@@ -133,7 +135,7 @@ namespace edm {
     private:
       
       int maxEvents_;
-      int remainingEvents_;
+      std::atomic<int> remainingEvents_;
       
       // TODO: Give OutputModule
       // an interface (protected?) that supplies client code with the
@@ -175,9 +177,14 @@ namespace edm {
       
       BranchChildren branchChildren_;
       
+      SharedResourcesAcquirer resourcesAcquirer_;
+      std::mutex mutex_;
       //------------------------------------------------------------------
       // private member functions
       //------------------------------------------------------------------
+      
+      virtual SharedResourcesAcquirer createAcquirer();
+      
       void doWriteRun(RunPrincipal const& rp, ModuleCallingContext const*);
       void doWriteLuminosityBlock(LuminosityBlockPrincipal const& lbp, ModuleCallingContext const*);
       void doOpenFile(FileBlock const& fb);
diff --git a/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h b/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h
index 60102a8b62cc7..6de56c259712a 100644
--- a/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h
+++ b/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h
@@ -35,7 +35,7 @@ namespace edm {
       
       template<>
       struct AbilityToImplementor<edm::one::SharedResources> {
-        typedef edm::one::impl::SharedResourcesUser Type;
+        typedef edm::one::impl::SharedResourcesUser<edm::one::EDAnalyzerBase> Type;
       };
       
       template<>
diff --git a/FWCore/Framework/interface/one/filterAbilityToImplementor.h b/FWCore/Framework/interface/one/filterAbilityToImplementor.h
index 160e9c3fd7c7b..ca851ebb5386f 100644
--- a/FWCore/Framework/interface/one/filterAbilityToImplementor.h
+++ b/FWCore/Framework/interface/one/filterAbilityToImplementor.h
@@ -35,7 +35,7 @@ namespace edm {
       
       template<>
       struct AbilityToImplementor<edm::one::SharedResources> {
-        typedef edm::one::impl::SharedResourcesUser Type;
+        typedef edm::one::impl::SharedResourcesUser<edm::one::EDFilterBase> Type;
       };
       
       template<>
diff --git a/FWCore/Framework/interface/one/implementors.h b/FWCore/Framework/interface/one/implementors.h
index 0750408850d7f..e87d0398a1bcc 100644
--- a/FWCore/Framework/interface/one/implementors.h
+++ b/FWCore/Framework/interface/one/implementors.h
@@ -20,6 +20,7 @@
 
 // system include files
 #include <string>
+#include <set>
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
@@ -27,22 +28,28 @@
 // forward declarations
 
 namespace edm {
+   class SharedResourcesAcquirer;
+   
    namespace one {
       namespace impl {
          
-         class SharedResourcesUser {
+         template<typename T>
+         class SharedResourcesUser : public virtual T {
          public:
             template< typename... Args>
-            SharedResourcesUser(Args...) {}
+            SharedResourcesUser(Args... args) : T(args...) {}
             SharedResourcesUser(SharedResourcesUser const&) = delete;
             SharedResourcesUser& operator=(SharedResourcesUser const&) = delete;
             
             virtual ~SharedResourcesUser() {}
             
          protected:
-            static const std::string kUnknownResource;
             
-            void usesResource(std::string const& iName = kUnknownResource);
+            void usesResource(std::string const& iName);
+            void usesResource();
+         private:
+            SharedResourcesAcquirer createAcquirer() override;
+            std::set<std::string> resourceNames_;
          };
          
          template <typename T>
diff --git a/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h b/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h
index 8f7fe4a9cf876..033f965da7eb8 100644
--- a/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h
+++ b/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h
@@ -81,7 +81,7 @@ namespace edm {
       
       template<>
       struct AbilityToImplementor<edm::one::SharedResources> {
-        typedef edm::one::impl::SharedResourcesUser Type;
+        typedef edm::one::impl::SharedResourcesUser<edm::one::OutputModuleBase> Type;
       };
       
       template<>
diff --git a/FWCore/Framework/interface/one/producerAbilityToImplementor.h b/FWCore/Framework/interface/one/producerAbilityToImplementor.h
index 0311834f475f6..4a5cce2c08f61 100644
--- a/FWCore/Framework/interface/one/producerAbilityToImplementor.h
+++ b/FWCore/Framework/interface/one/producerAbilityToImplementor.h
@@ -35,7 +35,7 @@ namespace edm {
       
       template<>
       struct AbilityToImplementor<edm::one::SharedResources> {
-        typedef edm::one::impl::SharedResourcesUser Type;
+        typedef edm::one::impl::SharedResourcesUser<edm::one::EDProducerBase> Type;
       };
       
       template<>
diff --git a/FWCore/Framework/src/DataProxy.cc b/FWCore/Framework/src/DataProxy.cc
index 1291305edf25f..da8cf022902cc 100644
--- a/FWCore/Framework/src/DataProxy.cc
+++ b/FWCore/Framework/src/DataProxy.cc
@@ -11,6 +11,7 @@
 //
 
 // system include files
+#include <mutex>
 
 // user include files
 #include "FWCore/Framework/interface/DataProxy.h"
@@ -24,6 +25,7 @@
 //
 namespace edm {
    namespace eventsetup {
+     static std::recursive_mutex s_esGlobalMutex;
 //
 // static data member definitions
 //
@@ -69,23 +71,15 @@ DataProxy::~DataProxy()
 //
 // member functions
 //
-void 
-DataProxy::setCacheIsValidAndAccessType(bool iTransientAccessOnly) const { 
-   cacheIsValid_ = true;
-   if(!iTransientAccessOnly) {
-      nonTransientAccessRequested_ = true;
-   }
-}
-      
-void DataProxy::clearCacheIsValid() { 
-   cacheIsValid_ = false;
-   nonTransientAccessRequested_ = false;
+void DataProxy::clearCacheIsValid() {
+   cacheIsValid_.store(false, std::memory_order_release);
+   nonTransientAccessRequested_.store(false, std::memory_order_release);
    cache_ = 0;
 }
       
 void 
 DataProxy::resetIfTransient() {
-   if (!nonTransientAccessRequested_) {
+   if (!nonTransientAccessRequested_.load(std::memory_order_acquire)) {
       clearCacheIsValid();
       invalidateTransientCache();
    }
@@ -110,13 +104,19 @@ const void*
 DataProxy::get(const EventSetupRecord& iRecord, const DataKey& iKey, bool iTransiently) const
 {
    if(!cacheIsValid()) {
-      cache_ = const_cast<DataProxy*>(this)->getImpl(iRecord, iKey);
+      std::lock_guard<std::recursive_mutex> guard(s_esGlobalMutex);
+      if(!cacheIsValid()) {
+         cache_ = const_cast<DataProxy*>(this)->getImpl(iRecord, iKey);
+         cacheIsValid_.store(true,std::memory_order_release);
+      }
    }
-   //It is safe to always set cache to valid.
    //We need to set the AccessType for each request so this can't be called in the if block above.
    //This also must be before the cache_ check since we want to setCacheIsValid before a possible
    // exception throw. If we don't, 'getImpl' will be called again on a second request for the data.
-   setCacheIsValidAndAccessType(iTransiently);
+   if(!iTransiently) {
+      nonTransientAccessRequested_.store(true, std::memory_order_release);
+   }
+
    if(0 == cache_) {
       throwMakeException(iRecord, iKey);
    }
diff --git a/FWCore/Framework/src/EDAnalyzer.cc b/FWCore/Framework/src/EDAnalyzer.cc
index 2f0fd31bfda3d..fc8f5a47aaba2 100644
--- a/FWCore/Framework/src/EDAnalyzer.cc
+++ b/FWCore/Framework/src/EDAnalyzer.cc
@@ -8,6 +8,9 @@
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/src/edmodule_mightGet_config.h"
+#include "FWCore/Framework/interface/ConstProductRegistry.h"
+
+#include "SharedResourcesRegistry.h"
 
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
@@ -15,23 +18,34 @@
 #include "DataFormats/Provenance/interface/ProductRegistry.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Framework/interface/ConstProductRegistry.h"
 
 namespace edm {
   EDAnalyzer::~EDAnalyzer() {
   }
+  EDAnalyzer::EDAnalyzer() : moduleDescription_() {
+    SharedResourcesRegistry::instance()->registerSharedResource(
+                                                                SharedResourcesRegistry::kLegacyModuleResourceName);
+  }
+
 
   bool
   EDAnalyzer::doEvent(EventPrincipal const& ep, EventSetup const& c,
                       ModuleCallingContext const* mcc) {
     Event e(const_cast<EventPrincipal&>(ep), moduleDescription_, mcc);
     e.setConsumer(this);
-    this->analyze(e, c);
+    {
+      std::lock_guard<std::mutex> guard(mutex_);
+      std::lock_guard<SharedResourcesAcquirer> guardAcq(resourceAcquirer_);
+      this->analyze(e, c);
+    }
     return true;
   }
 
   void
   EDAnalyzer::doBeginJob() {
+    std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
+    resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
+
     this->beginJob();
   }
 
diff --git a/FWCore/Framework/src/EDFilter.cc b/FWCore/Framework/src/EDFilter.cc
index c66f8afeabef7..a352ab08c6cbe 100644
--- a/FWCore/Framework/src/EDFilter.cc
+++ b/FWCore/Framework/src/EDFilter.cc
@@ -9,10 +9,19 @@
 #include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/src/edmodule_mightGet_config.h"
 
+#include "SharedResourcesRegistry.h"
+
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
+  
+  EDFilter::EDFilter() : ProducerBase() , moduleDescription_(),
+  previousParentage_(), previousParentageId_() {
+    SharedResourcesRegistry::instance()->registerSharedResource(
+                                                                SharedResourcesRegistry::kLegacyModuleResourceName);
+  }
+
   EDFilter::~EDFilter() {
   }
 
@@ -22,13 +31,22 @@ namespace edm {
     bool rc = false;
     Event e(ep, moduleDescription_, mcc);
     e.setConsumer(this);
-    rc = this->filter(e, c);
-    commit_(e,&previousParentage_, &previousParentageId_);
+    {
+      std::lock_guard<std::mutex> guard(mutex_);
+      {
+        std::lock_guard<SharedResourcesAcquirer> guardAcq(resourceAcquirer_);
+        rc = this->filter(e, c);
+      }
+      commit_(e,&previousParentage_, &previousParentageId_);
+    }
     return rc;
   }
 
   void 
-  EDFilter::doBeginJob() { 
+  EDFilter::doBeginJob() {
+    std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
+    resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
+
     this->beginJob();
   }
    
diff --git a/FWCore/Framework/src/EDProducer.cc b/FWCore/Framework/src/EDProducer.cc
index 966b02030d53c..57dd29315666f 100644
--- a/FWCore/Framework/src/EDProducer.cc
+++ b/FWCore/Framework/src/EDProducer.cc
@@ -12,12 +12,17 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
+#include "SharedResourcesRegistry.h"
+
 namespace edm {
   EDProducer::EDProducer() :
       ProducerBase(),
       moduleDescription_(),
       previousParentage_(),
-      previousParentageId_() { }
+      previousParentageId_() {
+        SharedResourcesRegistry::instance()->registerSharedResource(
+                                                                    SharedResourcesRegistry::kLegacyModuleResourceName);
+      }
 
   EDProducer::~EDProducer() { }
 
@@ -26,13 +31,21 @@ namespace edm {
                       ModuleCallingContext const* mcc) {
     Event e(ep, moduleDescription_, mcc);
     e.setConsumer(this);
-    this->produce(e, c);
-    commit_(e, &previousParentage_, &previousParentageId_);
+    {
+      std::lock_guard<std::mutex> guard(mutex_);
+      {
+        std::lock_guard<SharedResourcesAcquirer> guardAcq(resourceAcquirer_);
+        this->produce(e, c);
+      }
+      commit_(e, &previousParentage_, &previousParentageId_);
+    }
     return true;
   }
 
   void 
   EDProducer::doBeginJob() {
+    std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
+    resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
     this->beginJob();
   }
   
diff --git a/FWCore/Framework/src/EventProcessor.cc b/FWCore/Framework/src/EventProcessor.cc
index a91820ac66b44..95d54fac1ecd1 100644
--- a/FWCore/Framework/src/EventProcessor.cc
+++ b/FWCore/Framework/src/EventProcessor.cc
@@ -71,6 +71,8 @@
 #include <sys/ipc.h>
 #include <sys/msg.h>
 
+#include "tbb/task.h"
+
 //Used for forking
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -218,6 +220,7 @@ namespace edm {
     historyAppender_(new HistoryAppender),
     fb_(),
     looper_(),
+    deferredExceptionPtrIsSet_(false),
     principalCache_(),
     beginJobCalled_(false),
     shouldWeStop_(false),
@@ -258,6 +261,7 @@ namespace edm {
     historyAppender_(new HistoryAppender),
     fb_(),
     looper_(),
+    deferredExceptionPtrIsSet_(false),
     principalCache_(),
     beginJobCalled_(false),
     shouldWeStop_(false),
@@ -301,6 +305,7 @@ namespace edm {
     historyAppender_(new HistoryAppender),
     fb_(),
     looper_(),
+    deferredExceptionPtrIsSet_(false),
     principalCache_(),
     beginJobCalled_(false),
     shouldWeStop_(false),
@@ -340,6 +345,7 @@ namespace edm {
     historyAppender_(new HistoryAppender),
     fb_(),
     looper_(),
+    deferredExceptionPtrIsSet_(false),
     principalCache_(),
     beginJobCalled_(false),
     shouldWeStop_(false),
@@ -1245,7 +1251,7 @@ namespace edm {
     bool returnValue = false;
     
     // Look for a shutdown signal
-    if(shutdown_flag.load(std::memory_order_relaxed)) {
+    if(shutdown_flag.load(std::memory_order_acquire)) {
       returnValue = true;
       returnCode = epSignal;
     }
@@ -1773,34 +1779,117 @@ namespace edm {
     FDEBUG(1) << "\tdeleteLumiFromCache " << run << "/" << lumi << "\n";
   }
 
+  class StreamProcessingTask : public tbb::task {
+  public:
+    StreamProcessingTask(EventProcessor* iProc,
+                         unsigned int iStreamIndex,
+                         std::atomic<bool>* iFinishedProcessingEvents,
+                         tbb::task* iWaitTask):
+    m_proc(iProc),
+    m_streamID(iStreamIndex),
+    m_finishedProcessingEvents(iFinishedProcessingEvents),
+    m_waitTask(iWaitTask){}
+    
+    tbb::task* execute() {
+      m_proc->processEventsForStreamAsync(m_streamID,m_finishedProcessingEvents);
+      m_waitTask->decrement_ref_count();
+      return nullptr;
+    }
+  private:
+    EventProcessor* m_proc;
+    unsigned int m_streamID;
+    std::atomic<bool>* m_finishedProcessingEvents;
+    tbb::task* m_waitTask;
+  };
+  
+  void EventProcessor::processEventsForStreamAsync(unsigned int iStreamIndex,
+                                                   std::atomic<bool>* finishedProcessingEvents) {
+    try {
+      // make the services available
+      ServiceRegistry::Operate operate(serviceToken_);
+
+      if(iStreamIndex==0) {
+        processEvent(0);
+      }
+      do {
+        if(shouldWeStop()) {
+          break;
+        }
+        if(deferredExceptionPtrIsSet_.load(std::memory_order_acquire)) {
+          //another thread hit an exception
+          //std::cerr<<"another thread saw an exception\n";
+          break;
+        }
+        {
+          //nextItemType and readEvent need to be in same critical section
+          std::lock_guard<std::mutex> sourceGuard(nextTransitionMutex_);
+          
+          if(finishedProcessingEvents->load(std::memory_order_acquire)) {
+            //std::cerr<<"finishedProcessingEvents\n";
+            break;
+          }
+          InputSource::ItemType itemType = input_->nextItemType();
+          if (InputSource::IsEvent !=itemType) {
+            nextItemTypeFromProcessingEvents_ = itemType;
+            finishedProcessingEvents->store(true,std::memory_order_release);
+            //std::cerr<<"next item type "<<itemType<<"\n";
+            break;
+          }
+          if((asyncStopRequestedWhileProcessingEvents_=checkForAsyncStopRequest(asyncStopStatusCodeFromProcessingEvents_))) {
+            //std::cerr<<"task told to async stop\n";
+            break;
+          }
+          readEvent(iStreamIndex);
+        }
+        if(deferredExceptionPtrIsSet_.load(std::memory_order_acquire)) {
+          //another thread hit an exception
+          //std::cerr<<"another thread saw an exception\n";
+          break;
+        }
+        processEvent(iStreamIndex);
+      }while(true);
+    } catch (...) {
+      bool expected =false;
+      if(deferredExceptionPtrIsSet_.compare_exchange_strong(expected,true)) {
+        deferredExceptionPtr_ = std::current_exception();
+      }
+      //std::cerr<<"task caught exception\n";
+    }
+  }
+  
   void EventProcessor::readAndProcessEvent() {
     if(numberOfForkedChildren_>0) {
       readEvent(0);
       processEvent(0);
       return;
     }
-    InputSource::ItemType itemType = InputSource::IsEvent;
-
-    //While all the following item types are isEvent, process them right here
+    nextItemTypeFromProcessingEvents_ = InputSource::IsEvent; //needed for looper
     asyncStopRequestedWhileProcessingEvents_ = false;
+
+    std::atomic<bool> finishedProcessingEvents{false};
+
+    //Task assumes Stream 0 has already read the event that caused us to go here
+    readEvent(0);
+    
+    //To wait, the ref count has to b 1+#streams
+    tbb::task* eventLoopWaitTask{new (tbb::task::allocate_root()) tbb::empty_task{}};
+    eventLoopWaitTask->increment_ref_count();
     
-    //We will round-robin which stream to use
-    unsigned int nextStreamIndex=0;
     const unsigned int kNumStreams = preallocations_.numberOfStreams();
-    do {
-      readEvent(nextStreamIndex);
-      processEvent(nextStreamIndex);
-      nextStreamIndex = (nextStreamIndex+1) % kNumStreams;
-      
-      if(shouldWeStop()) {
-        break;
-      }
-      itemType = input_->nextItemType();
-      if((asyncStopRequestedWhileProcessingEvents_=checkForAsyncStopRequest(asyncStopStatusCodeFromProcessingEvents_))) {
-        break;
-      }
-    } while (itemType == InputSource::IsEvent);
-    nextItemTypeFromProcessingEvents_ = itemType;
+    unsigned int iStreamIndex = 0;
+    for(; iStreamIndex<kNumStreams-1; ++iStreamIndex) {
+      eventLoopWaitTask->increment_ref_count();
+      tbb::task::enqueue( *(new (tbb::task::allocate_root()) StreamProcessingTask{this,iStreamIndex, &finishedProcessingEvents, eventLoopWaitTask}));
+
+    }
+    eventLoopWaitTask->increment_ref_count();
+    eventLoopWaitTask->spawn_and_wait_for_all(*(new (tbb::task::allocate_root()) StreamProcessingTask{this,iStreamIndex,&finishedProcessingEvents,eventLoopWaitTask}));
+    tbb::task::destroy(*eventLoopWaitTask);
+    
+    //One of the processing threads saw an exception
+    if(deferredExceptionPtrIsSet_) {
+      std::rethrow_exception(deferredExceptionPtr_);
+    }
   }
   void EventProcessor::readEvent(unsigned int iStreamIndex) {
     //TODO this will have to become per stream
diff --git a/FWCore/Framework/src/OutputModule.cc b/FWCore/Framework/src/OutputModule.cc
index 300da1164fb79..25f4e049fa634 100644
--- a/FWCore/Framework/src/OutputModule.cc
+++ b/FWCore/Framework/src/OutputModule.cc
@@ -19,6 +19,8 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/DebugMacros.h"
 
+#include "SharedResourcesRegistry.h"
+
 #include <cassert>
 
 namespace edm {
@@ -57,6 +59,9 @@ namespace edm {
                                                     process_name_,
                                                     getAllTriggerNames(),
                                                     selectors_);
+    SharedResourcesRegistry::instance()->registerSharedResource(
+                                                                SharedResourcesRegistry::kLegacyModuleResourceName);
+
   }
 
   void OutputModule::configure(OutputModuleDescription const& desc) {
@@ -154,6 +159,9 @@ namespace edm {
   OutputModule::~OutputModule() { }
 
   void OutputModule::doBeginJob() {
+    std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
+    resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
+
     this->beginJob();
   }
 
@@ -176,13 +184,20 @@ namespace edm {
 
     FDEBUG(2) << "writeEvent called\n";
 
-    if(!wantAllEvents_) {
-      if(!selectors_.wantEvent(ep, mcc)) {
-        return true;
+    {
+      std::lock_guard<std::mutex> guard(mutex_);
+      if(!wantAllEvents_) {
+        if(!selectors_.wantEvent(ep, mcc)) {
+          return true;
+        }
+      }
+      
+      {
+        std::lock_guard<SharedResourcesAcquirer> guardAcq(resourceAcquirer_);
+        write(ep, mcc);
       }
+      updateBranchParents(ep);
     }
-    write(ep, mcc);
-    updateBranchParents(ep);
     if(remainingEvents_ > 0) {
       --remainingEvents_;
     }
diff --git a/FWCore/Framework/src/SharedResourcesAcquirer.cc b/FWCore/Framework/src/SharedResourcesAcquirer.cc
new file mode 100644
index 0000000000000..f1310454a2d1f
--- /dev/null
+++ b/FWCore/Framework/src/SharedResourcesAcquirer.cc
@@ -0,0 +1,32 @@
+// -*- C++ -*-
+//
+// Package:     Subsystem/Package
+// Class  :     SharedResourcesAcquirer
+// 
+// Implementation:
+//     [Notes on implementation]
+//
+// Original Author:  Chris Jones
+//         Created:  Sun, 06 Oct 2013 19:43:28 GMT
+//
+
+// system include files
+
+// user include files
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
+
+
+namespace edm {
+  void SharedResourcesAcquirer::lock() {
+    for(auto m : m_resources) {
+      m->lock();
+    }
+  }
+  
+  void SharedResourcesAcquirer::unlock() {
+    for(auto it = m_resources.rbegin(), itEnd = m_resources.rend();
+        it != itEnd; ++it) {
+      (*it)->unlock();
+    }
+  }
+}
\ No newline at end of file
diff --git a/FWCore/Framework/src/SharedResourcesRegistry.cc b/FWCore/Framework/src/SharedResourcesRegistry.cc
new file mode 100644
index 0000000000000..bef8fbfde9486
--- /dev/null
+++ b/FWCore/Framework/src/SharedResourcesRegistry.cc
@@ -0,0 +1,63 @@
+// -*- C++ -*-
+//
+// Package:     FWCore/Framework
+// Class  :     SharedResourcesRegistry
+// 
+// Implementation:
+//     [Notes on implementation]
+//
+// Original Author:  Chris Jones
+//         Created:  Sun, 06 Oct 2013 15:48:50 GMT
+//
+
+// system include files
+#include <cassert>
+
+// user include files
+#include "SharedResourcesRegistry.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
+
+namespace edm {
+
+  const std::string SharedResourcesRegistry::kLegacyModuleResourceName{"__legacy__"};
+  
+  SharedResourcesRegistry*
+  SharedResourcesRegistry::instance() {
+    static SharedResourcesRegistry s_instance;
+    return &s_instance;
+  }
+  
+  void
+  SharedResourcesRegistry::registerSharedResource(const std::string& iString){
+    auto& values = resourceMap_[iString];
+    
+    if(values.second ==1) {
+      //only need to make the resource if more than 1 module wants it
+      values.first = std::shared_ptr<std::recursive_mutex>( new std::recursive_mutex );
+    }
+    ++(values.second);
+  }
+  
+  SharedResourcesAcquirer
+  SharedResourcesRegistry::createAcquirer(std::vector<std::string> const &  iNames) const {
+    //Sort by how often used and then by name
+    std::map<std::pair<unsigned int, std::string>, std::recursive_mutex*> sortedResources;
+    
+    for(auto const& name: iNames) {
+      auto itFound = resourceMap_.find(name);
+      assert(itFound != resourceMap_.end());
+      //If only one module wants it, it really isn't shared
+      if(itFound->second.second>1) {
+        sortedResources.insert(std::make_pair(std::make_pair(itFound->second.second, itFound->first),itFound->second.first.get()));
+      }
+    }
+    std::vector<std::recursive_mutex*> mutexes;
+    mutexes.reserve(sortedResources.size());
+    for(auto const& resource: sortedResources) {
+      mutexes.push_back(resource.second);
+    }
+    
+    return SharedResourcesAcquirer(std::move(mutexes));
+  }
+  
+}
diff --git a/FWCore/Framework/src/SharedResourcesRegistry.h b/FWCore/Framework/src/SharedResourcesRegistry.h
new file mode 100644
index 0000000000000..650b86133347b
--- /dev/null
+++ b/FWCore/Framework/src/SharedResourcesRegistry.h
@@ -0,0 +1,70 @@
+#ifndef FWCore_Framework_SharedResourcesRegistry_h
+#define FWCore_Framework_SharedResourcesRegistry_h
+// -*- C++ -*-
+//
+// Package:     FWCore/Framework
+// Class  :     SharedResourcesRegistry
+// 
+/**\class SharedResourcesRegistry SharedResourcesRegistry.h "SharedResourcesRegistry.h"
+
+ Description: Manages the Acquirers used to take temporary control of a resource shared between modules
+
+ Usage:
+    <usage>
+
+*/
+//
+// Original Author:  Chris Jones
+//         Created:  Sun, 06 Oct 2013 15:48:44 GMT
+//
+
+// system include files
+#include <vector>
+#include <string>
+#include <map>
+#include <mutex>
+#include <memory>
+
+// user include files
+
+// forward declarations
+class testSharedResourcesRegistry;
+
+namespace edm {
+  class SharedResourcesAcquirer;
+  
+  class SharedResourcesRegistry
+  {
+    
+  public:
+    //needed for testing
+    friend class ::testSharedResourcesRegistry;
+    
+    // ---------- const member functions ---------------------
+    SharedResourcesAcquirer createAcquirer(std::vector<std::string> const&) const;
+    
+    // ---------- static member functions --------------------
+    static SharedResourcesRegistry* instance();
+    
+    ///All legacy modules share this resource
+    static const std::string kLegacyModuleResourceName;
+    
+    // ---------- member functions ---------------------------
+    ///A resource name must be registered before it can be used in the createAcquirer call
+    void registerSharedResource(const std::string&);
+    
+  private:
+    SharedResourcesRegistry()=default;
+    ~SharedResourcesRegistry()=default;
+
+    SharedResourcesRegistry(const SharedResourcesRegistry&) = delete; // stop default
+    
+    const SharedResourcesRegistry& operator=(const SharedResourcesRegistry&) = delete; // stop default
+    
+    // ---------- member data --------------------------------
+    std::map<std::string, std::pair<std::shared_ptr<std::recursive_mutex>,unsigned int>> resourceMap_;
+    
+  };
+}
+
+#endif
diff --git a/FWCore/Framework/src/one/EDAnalyzerBase.cc b/FWCore/Framework/src/one/EDAnalyzerBase.cc
index e7fe9441cc72f..a44e0d3bebfec 100644
--- a/FWCore/Framework/src/one/EDAnalyzerBase.cc
+++ b/FWCore/Framework/src/one/EDAnalyzerBase.cc
@@ -50,12 +50,22 @@ namespace edm {
                             ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      this->analyze(e, c);
+      {
+        std::lock_guard<std::mutex> guard(mutex_);
+        std::lock_guard<SharedResourcesAcquirer> guardResources(resourcesAcquirer_);
+        this->analyze(e, c);
+      }
       return true;
     }
     
+    SharedResourcesAcquirer EDAnalyzerBase::createAcquirer() {
+      return SharedResourcesAcquirer{};
+    }
+
     void
     EDAnalyzerBase::doBeginJob() {
+      resourcesAcquirer_ = createAcquirer();
+      
       this->beginJob();
     }
     
diff --git a/FWCore/Framework/src/one/EDFilterBase.cc b/FWCore/Framework/src/one/EDFilterBase.cc
index 63705c302b218..1b3a2efddd30e 100644
--- a/FWCore/Framework/src/one/EDFilterBase.cc
+++ b/FWCore/Framework/src/one/EDFilterBase.cc
@@ -52,13 +52,26 @@ namespace edm {
                           ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      bool returnValue = this->filter(e, c);
-      commit_(e,&previousParentage_, &previousParentageId_);
+      bool returnValue =true;
+      {
+        std::lock_guard<std::mutex> guard(mutex_);
+        {
+          std::lock_guard<SharedResourcesAcquirer> guard(resourcesAcquirer_);
+          returnValue = this->filter(e, c);
+        }
+        commit_(e,&previousParentage_, &previousParentageId_);
+      }
       return returnValue;
     }
     
+    SharedResourcesAcquirer EDFilterBase::createAcquirer() {
+      return SharedResourcesAcquirer{};
+    }
+
     void
     EDFilterBase::doBeginJob() {
+      resourcesAcquirer_ = createAcquirer();
+
       this->beginJob();
     }
     
diff --git a/FWCore/Framework/src/one/EDProducerBase.cc b/FWCore/Framework/src/one/EDProducerBase.cc
index 0cd3208d4c817..718d593cf90ed 100644
--- a/FWCore/Framework/src/one/EDProducerBase.cc
+++ b/FWCore/Framework/src/one/EDProducerBase.cc
@@ -51,13 +51,25 @@ namespace edm {
                             ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      this->produce(e, c);
-      commit_(e,&previousParentage_, &previousParentageId_);
+      {
+        std::lock_guard<std::mutex> guard(mutex_);
+        {
+          std::lock_guard<SharedResourcesAcquirer> guard(resourcesAcquirer_);
+          this->produce(e, c);
+        }
+        commit_(e,&previousParentage_, &previousParentageId_);
+      }
       return true;
     }
     
+    SharedResourcesAcquirer EDProducerBase::createAcquirer() {
+      return SharedResourcesAcquirer{};
+    }
+
     void
     EDProducerBase::doBeginJob() {
+      resourcesAcquirer_ = createAcquirer();
+      
       this->beginJob();
     }
     
diff --git a/FWCore/Framework/src/one/OutputModuleBase.cc b/FWCore/Framework/src/one/OutputModuleBase.cc
index b8fedd2bf6e6a..fd5c7687cbfcc 100644
--- a/FWCore/Framework/src/one/OutputModuleBase.cc
+++ b/FWCore/Framework/src/one/OutputModuleBase.cc
@@ -165,7 +165,12 @@ namespace edm {
     
     OutputModuleBase::~OutputModuleBase() { }
     
+    SharedResourcesAcquirer OutputModuleBase::createAcquirer() {
+      return SharedResourcesAcquirer{};
+    }
+    
     void OutputModuleBase::doBeginJob() {
+      resourcesAcquirer_ = createAcquirer();
       this->beginJob();
     }
     
@@ -184,13 +189,19 @@ namespace edm {
                               ModuleCallingContext const* mcc) {
       detail::TRBESSentry products_sentry(selectors_);
       
-      if(!wantAllEvents_) {
-        if(!selectors_.wantEvent(ep, mcc)) {
-          return true;
+      {
+        std::lock_guard<std::mutex> guard(mutex_);
+        if(!wantAllEvents_) {
+          if(!selectors_.wantEvent(ep, mcc)) {
+            return true;
+          }
+        }
+        {
+          std::lock_guard<SharedResourcesAcquirer> guard(resourcesAcquirer_);
+          write(ep, mcc);
         }
+        updateBranchParents(ep);
       }
-      write(ep, mcc);
-      updateBranchParents(ep);
       if(remainingEvents_ > 0) {
         --remainingEvents_;
       }
diff --git a/FWCore/Framework/src/one/SharedResourcesUser.cc b/FWCore/Framework/src/one/SharedResourcesUser.cc
deleted file mode 100644
index 32322f28a2439..0000000000000
--- a/FWCore/Framework/src/one/SharedResourcesUser.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// Package:     Package
-// Class  :     SharedResourcesUser
-// 
-// Implementation:
-//     [Notes on implementation]
-//
-// Original Author:  Chris Jones
-//         Created:  Thu, 09 May 2013 20:39:03 GMT
-//
-
-// system include files
-
-// user include files
-#include "FWCore/Framework/interface/one/implementors.h"
-
-
-const std::string
-edm::one::impl::SharedResourcesUser::kUnknownResource;
-
-void
-edm::one::impl::SharedResourcesUser::usesResource(std::string const& iName)
-{
-  //Don't do anything yet
-}
\ No newline at end of file
diff --git a/FWCore/Framework/src/one/analyzerImplementors.cc b/FWCore/Framework/src/one/analyzerImplementors.cc
index 7398edd1e8632..2a55dc4325503 100644
--- a/FWCore/Framework/src/one/analyzerImplementors.cc
+++ b/FWCore/Framework/src/one/analyzerImplementors.cc
@@ -19,6 +19,7 @@
 namespace edm {
   namespace one {
     namespace impl {
+      template class SharedResourcesUser<edm::one::EDAnalyzerBase>;
       template class RunWatcher<edm::one::EDAnalyzerBase>;
       template class LuminosityBlockWatcher<edm::one::EDAnalyzerBase>;
     }
diff --git a/FWCore/Framework/src/one/filterImplementors.cc b/FWCore/Framework/src/one/filterImplementors.cc
index c322c51c1c36e..fbd21a91fe8b2 100644
--- a/FWCore/Framework/src/one/filterImplementors.cc
+++ b/FWCore/Framework/src/one/filterImplementors.cc
@@ -19,6 +19,7 @@
 namespace edm {
   namespace one {
     namespace impl {
+      template class SharedResourcesUser<edm::one::EDFilterBase>;
       template class RunWatcher<edm::one::EDFilterBase>;
       template class LuminosityBlockWatcher<edm::one::EDFilterBase>;
       template class BeginRunProducer<edm::one::EDFilterBase>;
diff --git a/FWCore/Framework/src/one/implementorsMethods.h b/FWCore/Framework/src/one/implementorsMethods.h
index 037961815c6c3..8998dfbdfe220 100644
--- a/FWCore/Framework/src/one/implementorsMethods.h
+++ b/FWCore/Framework/src/one/implementorsMethods.h
@@ -22,12 +22,32 @@
 
 // user include files
 #include "FWCore/Framework/interface/one/implementors.h"
+#include "FWCore/Framework/src/SharedResourcesRegistry.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 
 // forward declarations
 
 namespace edm {
   namespace one {
     namespace impl {
+      template<typename T>
+      void SharedResourcesUser<T>::usesResource(std::string const& iName) {
+        resourceNames_.insert(iName);
+        SharedResourcesRegistry::instance()->registerSharedResource(iName);
+      }
+      template<typename T>
+      void SharedResourcesUser<T>::usesResource() {
+        this->usesResource(SharedResourcesRegistry::kLegacyModuleResourceName);
+
+      }
+      
+      template<typename T>
+      SharedResourcesAcquirer SharedResourcesUser<T>::createAcquirer() {
+        std::vector<std::string> v(resourceNames_.begin(),resourceNames_.end());
+        return SharedResourcesRegistry::instance()->createAcquirer(v);
+      }
+      
+      
       template< typename T>
       void RunWatcher<T>::doBeginRun_(Run const& rp, EventSetup const& c) {
         this->beginRun(rp,c);
diff --git a/FWCore/Framework/src/one/outputmoduleImplementors.cc b/FWCore/Framework/src/one/outputmoduleImplementors.cc
index 4b140936432fc..6c4300170acd8 100644
--- a/FWCore/Framework/src/one/outputmoduleImplementors.cc
+++ b/FWCore/Framework/src/one/outputmoduleImplementors.cc
@@ -21,6 +21,9 @@ namespace edm {
   class ModuleCallingContext;
 
   namespace one {
+    namespace impl {
+      template class SharedResourcesUser<edm::one::OutputModuleBase>;
+    }
     namespace outputmodule {
       void RunWatcher::doBeginRun_(RunPrincipal const& rp, ModuleCallingContext const* mcc) {
         beginRun(rp, mcc);
diff --git a/FWCore/Framework/src/one/producerImplementors.cc b/FWCore/Framework/src/one/producerImplementors.cc
index 5bdc3835782ee..324f3fbd441af 100644
--- a/FWCore/Framework/src/one/producerImplementors.cc
+++ b/FWCore/Framework/src/one/producerImplementors.cc
@@ -19,6 +19,7 @@
 namespace edm {
   namespace one {
     namespace impl {
+      template class SharedResourcesUser<edm::one::EDProducerBase>;
       template class RunWatcher<edm::one::EDProducerBase>;
       template class LuminosityBlockWatcher<edm::one::EDProducerBase>;
       template class BeginRunProducer<edm::one::EDProducerBase>;
diff --git a/FWCore/Framework/test/BuildFile.xml b/FWCore/Framework/test/BuildFile.xml
index 2f50443bde50a..468ec3da176c9 100644
--- a/FWCore/Framework/test/BuildFile.xml
+++ b/FWCore/Framework/test/BuildFile.xml
@@ -175,7 +175,7 @@
   <use   name="FWCore/Utilities"/>
   <use   name="cppunit"/>
 </bin>
-<bin   name="TestFWCoreFrameworkeventprincipal" file="testRunner.cpp,eventprincipal_t.cppunit.cc">
+<bin   name="TestFWCoreFrameworkeventprincipal" file="testRunner.cpp,eventprincipal_t.cppunit.cc,sharedresourcesregistry_t.cppunit.cc">
   <use   name="DataFormats/Common"/>
   <use   name="DataFormats/Provenance"/>
   <use   name="DataFormats/TestObjects"/>
diff --git a/FWCore/Framework/test/sharedresourcesregistry_t.cppunit.cc b/FWCore/Framework/test/sharedresourcesregistry_t.cppunit.cc
new file mode 100644
index 0000000000000..4ac10c1a5e252
--- /dev/null
+++ b/FWCore/Framework/test/sharedresourcesregistry_t.cppunit.cc
@@ -0,0 +1,114 @@
+/*
+ *  sharedresourcesregistry_t.cppunit.cc
+ *  CMSSW
+ *
+ *  Created by Chris Jones on 8/8/05.
+ *
+ */
+
+#include "cppunit/extensions/HelperMacros.h"
+
+#include "FWCore/Framework/src/SharedResourcesRegistry.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
+
+using namespace edm;
+
+class testSharedResourcesRegistry: public CppUnit::TestFixture
+{
+   CPPUNIT_TEST_SUITE(testSharedResourcesRegistry);
+   
+   CPPUNIT_TEST(oneTest);
+   CPPUNIT_TEST(legacyTest);
+   CPPUNIT_TEST(multipleTest);
+  
+   CPPUNIT_TEST_SUITE_END();
+public:
+      void setUp(){}
+   void tearDown(){}
+   
+   void oneTest();
+   void legacyTest();
+   void multipleTest();
+};
+
+///registration of the test so that the runner can find it
+CPPUNIT_TEST_SUITE_REGISTRATION(testSharedResourcesRegistry);
+
+
+void testSharedResourcesRegistry::oneTest()
+{
+  edm::SharedResourcesRegistry reg;
+  
+  reg.registerSharedResource("foo");
+  reg.registerSharedResource("bar");
+  reg.registerSharedResource("zoo");
+
+  {
+    std::vector<std::string> res{"foo","bar","zoo"};
+    auto tester = reg.createAcquirer(res);
+    
+    CPPUNIT_ASSERT(0 == tester.numberOfResources());
+  }
+  {
+    std::vector<std::string> res{"foo"};
+    auto tester = reg.createAcquirer(res);
+    
+    CPPUNIT_ASSERT(0 == tester.numberOfResources());
+  }
+}
+
+void testSharedResourcesRegistry::legacyTest()
+{
+  std::vector<std::string> res{edm::SharedResourcesRegistry::kLegacyModuleResourceName};
+  {
+    edm::SharedResourcesRegistry reg;
+    
+    reg.registerSharedResource(edm::SharedResourcesRegistry::kLegacyModuleResourceName);
+    auto tester = reg.createAcquirer(res);
+    
+    CPPUNIT_ASSERT(0 == tester.numberOfResources());
+  }
+  {
+    edm::SharedResourcesRegistry reg;
+    
+    reg.registerSharedResource(edm::SharedResourcesRegistry::kLegacyModuleResourceName);
+    reg.registerSharedResource(edm::SharedResourcesRegistry::kLegacyModuleResourceName);
+
+    auto tester = reg.createAcquirer(res);
+    
+    CPPUNIT_ASSERT(1 == tester.numberOfResources());
+    
+  }
+}
+
+void testSharedResourcesRegistry::multipleTest()
+{
+  edm::SharedResourcesRegistry reg;
+  
+  reg.registerSharedResource("foo");
+  reg.registerSharedResource("bar");
+  reg.registerSharedResource("zoo");
+  reg.registerSharedResource("zoo");
+  reg.registerSharedResource("bar");
+  reg.registerSharedResource("zoo");
+  
+  {
+    std::vector<std::string> res{"foo","bar","zoo"};
+    auto tester = reg.createAcquirer(res);
+    
+    CPPUNIT_ASSERT(2 == tester.numberOfResources());
+  }
+  {
+    std::vector<std::string> res{"foo"};
+    auto tester = reg.createAcquirer(res);
+    
+    CPPUNIT_ASSERT(0 == tester.numberOfResources());
+  }
+  {
+    std::vector<std::string> res{"bar"};
+    auto tester = reg.createAcquirer(res);
+    
+    CPPUNIT_ASSERT(1 == tester.numberOfResources());
+  }
+
+}