diff --git a/Source/Csla.Shared/ApplicationContext.cs b/Source/Csla.Shared/ApplicationContext.cs
index 29375e9664..f4a756b2e8 100644
--- a/Source/Csla.Shared/ApplicationContext.cs
+++ b/Source/Csla.Shared/ApplicationContext.cs
@@ -814,9 +814,33 @@ internal static void SetLogicalExecutionLocation(LogicalExecutionLocations locat
     {
       LocalContext["__logicalExecutionLocation"] = location;
     }
-#endregion
+    #endregion
+
+    #region ServiceProvider
+
+    /// <summary>
+    /// Gets or sets the default service provider
+    /// for this application.
+    /// </summary>
+    public static IServiceProvider DefaultServiceProvider
+    {
+      get => _contextManager.GetDefaultServiceProvider();
+      set => _contextManager.SetDefaultServiceProvider(value);
+    }
+
+    /// <summary>
+    /// Gets or sets the service provider
+    /// for this application context.
+    /// </summary>
+    public static IServiceProvider ScopedServiceProvider
+    {
+      get => _contextManager.GetScopedServiceProvider();
+      set => _contextManager.SetScopedServiceProvider(value);
+    }
+
+    #endregion
 
-#region Default context manager
+    #region Default context manager
 
     /// <summary>
     /// Default context manager for the user property
@@ -951,8 +975,48 @@ public void SetGlobalContext(ContextDictionary globalContext)
         LocalDataStoreSlot slot = Thread.GetNamedDataSlot(_globalContextName);
         Thread.SetData(slot, globalContext);
       }
+
+      private static IServiceProvider _provider;
+
+      /// <summary>
+      /// Gets the default IServiceProvider
+      /// </summary>
+      public IServiceProvider GetDefaultServiceProvider()
+      {
+        return _provider;
+      }
+
+      /// <summary>
+      /// Sets the default IServiceProvider
+      /// </summary>
+      /// <param name="serviceProvider">IServiceProvider instance</param>
+      public void SetDefaultServiceProvider(IServiceProvider serviceProvider)
+      {
+        _provider = serviceProvider;
+      }
+
+      /// <summary>
+      /// Gets the scoped IServiceProvider
+      /// </summary>
+      public IServiceProvider GetScopedServiceProvider()
+      {
+        IServiceProvider result;
+        result = (IServiceProvider)GetLocalContext().GetValueOrNull("__ssp");
+        if (result == null)
+          result = GetDefaultServiceProvider();
+        return result;
+      }
+
+      /// <summary>
+      /// Sets the scoped IServiceProvider
+      /// </summary>
+      /// <param name="serviceProvider">IServiceProvider instance</param>
+      public void SetScopedServiceProvider(IServiceProvider serviceProvider)
+      {
+        GetLocalContext()["__ssp"] = serviceProvider;
+      }
     }
 
-#endregion
+    #endregion
   }
 }
\ No newline at end of file
diff --git a/Source/Csla.Shared/Configuration/CslaConfiguration.cs b/Source/Csla.Shared/Configuration/CslaConfiguration.cs
index e901f905ea..091fc76cfc 100644
--- a/Source/Csla.Shared/Configuration/CslaConfiguration.cs
+++ b/Source/Csla.Shared/Configuration/CslaConfiguration.cs
@@ -17,7 +17,6 @@ namespace Csla.Configuration
   /// </summary>
   public class CslaConfiguration : ICslaConfiguration
   {
-#if !NETSTANDARD2_0
     /// <summary>
     /// Sets the web context manager.
     /// </summary>
@@ -32,7 +31,6 @@ public ICslaConfiguration WebContextManager(IContextManager contextManager)
       ApplicationContext.WebContextManager = contextManager;
       return this;
     }
-#endif
 
     /// <summary>
     /// Sets the context manager.
@@ -115,6 +113,16 @@ public ICslaConfiguration PropertyInfoFactory(string typeName)
       return this;
     }
 
+    /// <summary>
+    /// Sets the default IServiceProvider for the application.
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    public ICslaConfiguration DefaultServiceProvider(IServiceProvider serviceProvider)
+    {
+      ApplicationContext.DefaultServiceProvider = serviceProvider;
+      return this;
+    }
+
     /// <summary>
     /// Resets any ApplicationContext settings so they 
     /// re-read their configuration from AppSettings
diff --git a/Source/Csla.Shared/Core/IContextManager.cs b/Source/Csla.Shared/Core/IContextManager.cs
index 6738162a87..7430a6c307 100644
--- a/Source/Csla.Shared/Core/IContextManager.cs
+++ b/Source/Csla.Shared/Core/IContextManager.cs
@@ -58,5 +58,23 @@ public interface IContextManager
     /// </summary>
     /// <param name="globalContext">Global context.</param>
     void SetGlobalContext(ContextDictionary globalContext);
+    /// <summary>
+    /// Gets the default IServiceProvider
+    /// </summary>
+    IServiceProvider GetDefaultServiceProvider();
+    /// <summary>
+    /// Sets the default IServiceProvider
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    void SetDefaultServiceProvider(IServiceProvider serviceProvider);
+    /// <summary>
+    /// Gets the scoped IServiceProvider
+    /// </summary>
+    IServiceProvider GetScopedServiceProvider();
+    /// <summary>
+    /// Sets the scoped IServiceProvider
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    void SetScopedServiceProvider(IServiceProvider serviceProvider);
   }
 }
\ No newline at end of file
diff --git a/Source/Csla.Web.Mvc.Shared/ApplicationContextManager.cs b/Source/Csla.Web.Mvc.Shared/ApplicationContextManager.cs
index 70f5a981ee..9e73f61366 100644
--- a/Source/Csla.Web.Mvc.Shared/ApplicationContextManager.cs
+++ b/Source/Csla.Web.Mvc.Shared/ApplicationContextManager.cs
@@ -138,6 +138,40 @@ public void SetGlobalContext(ContextDictionary globalContext)
     {
       HttpContext.Items[_globalContextName] = globalContext;
     }
+
+    /// <summary>
+    /// Gets the default IServiceProvider
+    /// </summary>
+    public IServiceProvider GetDefaultServiceProvider()
+    {
+      return HttpContext?.RequestServices;
+    }
+
+    /// <summary>
+    /// Sets the default IServiceProvider
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    public void SetDefaultServiceProvider(IServiceProvider serviceProvider)
+    {
+      throw new InvalidOperationException();
+    }
+
+    /// <summary>
+    /// Gets the scoped IServiceProvider
+    /// </summary>
+    public IServiceProvider GetScopedServiceProvider()
+    {
+      return HttpContext?.RequestServices;
+    }
+
+    /// <summary>
+    /// Sets the scoped IServiceProvider
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    public void SetScopedServiceProvider(IServiceProvider serviceProvider)
+    {
+      throw new InvalidOperationException();
+    }
   }
 }
 #endif
\ No newline at end of file
diff --git a/Source/Csla.Web.Shared/ApplicationContextManager.cs b/Source/Csla.Web.Shared/ApplicationContextManager.cs
index 06a6a03888..63f6e33403 100644
--- a/Source/Csla.Web.Shared/ApplicationContextManager.cs
+++ b/Source/Csla.Web.Shared/ApplicationContextManager.cs
@@ -107,5 +107,47 @@ public void SetGlobalContext(ContextDictionary globalContext)
     {
       HttpContext.Current.Items[_globalContextName] = globalContext;
     }
+
+    /// <summary>
+    /// Gets the default IServiceProvider
+    /// </summary>
+    public IServiceProvider GetDefaultServiceProvider()
+    {
+      IServiceProvider result;
+      result = (IServiceProvider)GetLocalContext().GetValueOrNull("__dsp");
+      if (result == null)
+        result = GetDefaultServiceProvider();
+      return result;
+    }
+
+    /// <summary>
+    /// Sets the default IServiceProvider
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    public void SetDefaultServiceProvider(IServiceProvider serviceProvider)
+    {
+      GetLocalContext()["__dsp"] = serviceProvider;
+    }
+
+    /// <summary>
+    /// Gets the scoped IServiceProvider
+    /// </summary>
+    public IServiceProvider GetScopedServiceProvider()
+    {
+      IServiceProvider result;
+      result = (IServiceProvider)GetLocalContext().GetValueOrNull("__ssp");
+      if (result == null)
+        result = GetDefaultServiceProvider();
+      return result;
+    }
+
+    /// <summary>
+    /// Sets the scoped IServiceProvider
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    public void SetScopedServiceProvider(IServiceProvider serviceProvider)
+    {
+      GetLocalContext()["__ssp"] = serviceProvider;
+    }
   }
 }
\ No newline at end of file
diff --git a/Source/Csla.test/AppContext/TestContext.cs b/Source/Csla.test/AppContext/TestContext.cs
index fa938460e5..bdb326cddb 100644
--- a/Source/Csla.test/AppContext/TestContext.cs
+++ b/Source/Csla.test/AppContext/TestContext.cs
@@ -74,5 +74,45 @@ public void SetGlobalContext(ContextDictionary globalContext)
     {
       _myContext[_globalContextName] = globalContext;
     }
+
+    private static IServiceProvider _provider;
+
+    /// <summary>
+    /// Gets the default IServiceProvider
+    /// </summary>
+    public IServiceProvider GetDefaultServiceProvider()
+    {
+      return _provider;
+    }
+
+    /// <summary>
+    /// Sets the default IServiceProvider
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    public void SetDefaultServiceProvider(IServiceProvider serviceProvider)
+    {
+      _provider = serviceProvider;
+    }
+
+    /// <summary>
+    /// Gets the scoped IServiceProvider
+    /// </summary>
+    public IServiceProvider GetScopedServiceProvider()
+    {
+      IServiceProvider result;
+      result = (IServiceProvider)GetLocalContext().GetValueOrNull("__ssp");
+      if (result == null)
+        result = GetDefaultServiceProvider();
+      return result;
+    }
+
+    /// <summary>
+    /// Sets the scoped IServiceProvider
+    /// </summary>
+    /// <param name="serviceProvider">IServiceProvider instance</param>
+    public void SetScopedServiceProvider(IServiceProvider serviceProvider)
+    {
+      GetLocalContext()["__ssp"] = serviceProvider;
+    }
   }
 }