diff --git a/.github/workflows/redfield-sanity-check.yml b/.github/workflows/redfield-sanity-check.yml
new file mode 100644
index 0000000000..d9805fdd69
--- /dev/null
+++ b/.github/workflows/redfield-sanity-check.yml
@@ -0,0 +1,39 @@
+# Syntax: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
+# .NET CLI: https://docs.microsoft.com/dotnet/core/tools/
+# Description: The purpose of this build is to build and test with redfield flag.
+
+name: Redfield Sanity Check
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    branches: [ master, develop ]
+
+jobs:
+  build-test:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        framework: [netcoreapp3.1,net5.0]
+        include: 
+            - os: ubuntu-latest
+              args: "--filter TestCategory!=WindowsOnly"
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: restore (Base sln)
+      run: dotnet restore ./BASE/Microsoft.ApplicationInsights.sln
+
+    - name: Build
+      run: dotnet build -p:Redfield=True ./BASE/Microsoft.ApplicationInsights.sln --configuration Release --no-restore
+
+    - name: Test
+      id: test1
+      continue-on-error: true
+      run: dotnet test ./BASE/Microsoft.ApplicationInsights.sln --framework ${{ matrix.framework }} --configuration Release --no-build --logger:"console;verbosity=detailed" ${{ matrix.args }}
diff --git a/.props/_GlobalStaticVersion.props b/.props/_GlobalStaticVersion.props
index 9cc616c89d..dfb498f35c 100644
--- a/.props/_GlobalStaticVersion.props
+++ b/.props/_GlobalStaticVersion.props
@@ -14,6 +14,7 @@
     <SemanticVersionMinor>18</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
     <SemanticVersionPatch>0</SemanticVersionPatch>
     <PreReleaseMilestone></PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
+    <PreReleaseMilestone Condition="'$(Redfield)' == 'True'">redfield</PreReleaseMilestone>
     <PreReleaseMilestone Condition="'$(NightlyBuild)' == 'True'">nightly</PreReleaseMilestone> <!-- Overwrite this property for nightly builds from the DEVELOP branch. -->
     <!-- 
       Date when Semantic Version was changed. 
diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/ActivityExtensionsTests.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/ActivityExtensionsTests.cs
index 2534920847..36ed428c46 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/ActivityExtensionsTests.cs
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/ActivityExtensionsTests.cs
@@ -34,8 +34,9 @@ public void GetOperationNameReturnsFirstAddedOperationName()
             var activity = new Activity("test");
             activity.AddTag("OperationName", "test me 1");
             activity.AddTag("OperationName", "test me 2");
-
+#if !REDFIELD
             Assert.AreEqual("test me 1", activity.GetOperationName());
+#endif
         }
     }
 }
\ No newline at end of file
diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Channel/EventCounterListener.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Channel/EventCounterListener.cs
index e5701b5d44..7e0132f673 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Channel/EventCounterListener.cs
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Channel/EventCounterListener.cs
@@ -22,7 +22,11 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
 
         protected override void OnEventSourceCreated(EventSource eventSource)
         {
+#if REDFIELD
+            if (string.Equals(eventSource.Name, "Redfield-Microsoft-ApplicationInsights-Core", StringComparison.Ordinal))
+#else
             if (string.Equals(eventSource.Name, "Microsoft-ApplicationInsights-Core", StringComparison.Ordinal))
+#endif
             {
                 var eventCounterArguments = new Dictionary<string, string>
                 {
diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/CoreEventSourceTest.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/CoreEventSourceTest.cs
index 28e83e46c2..9d324961ce 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/CoreEventSourceTest.cs
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/CoreEventSourceTest.cs
@@ -4,6 +4,7 @@
     using Microsoft.ApplicationInsights.TestFramework;
     using System.Diagnostics.Tracing;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System.Linq;
 
     [TestClass]
     public class CoreEventSourceTest
@@ -25,5 +26,30 @@ private static EventAttribute GetEventAttribute(string methodName)
             MethodInfo method = typeof(CoreEventSource).GetMethod(methodName);
             return method.GetCustomAttribute<EventAttribute>();
         }
+
+#if REDFIELD
+        /// <summary>
+        /// This is a sanitiy check.
+        /// The 'Redfield' compilation flag should switch the name of EventSource class.
+        /// Devs can review the test log and confirm that this test runs and passes.
+        /// This will serve as a verification that the Redfield compilation flag worked as expected.
+        /// 
+        /// To run this test:
+        /// dotnet build /p:Redfield=True ".\dotnet\BASE\Microsoft.ApplicationInsights.sln"
+        /// dotnet test ".\bin\Debug\test\Microsoft.ApplicationInsights.Tests\net5.0\Microsoft.ApplicationInsights.Tests.dll" --filter Name~VerifyRedfieldEventSourceName
+        /// </summary>
+        [TestMethod]
+        public void VerifyRedfieldEventSourceName()
+        {
+            var expectedName = "Redfield-Microsoft-ApplicationInsights-Core";
+
+            var eventSourceAttribute = typeof(CoreEventSource)
+                .GetCustomAttributes(typeof(EventSourceAttribute))
+                .Single() as EventSourceAttribute;
+
+            Assert.IsNotNull(eventSourceAttribute);
+            Assert.AreEqual(expectedName, eventSourceAttribute.Name);
+        }
+#endif
     }
 }
\ No newline at end of file
diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/TestEventSource.cs b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/TestEventSource.cs
index a7621d19ee..02e538fb6a 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/TestEventSource.cs
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/SelfDiagnostics/TestEventSource.cs
@@ -2,7 +2,11 @@
 {
     using System.Diagnostics.Tracing;
 
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-Test")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-Test")]
+#endif
     internal class TestEventSource : EventSource
     {
         [Event(1, Message = "Error: {0}", Level = EventLevel.Error)]
diff --git a/BASE/src/Microsoft.ApplicationInsights/ActivityExtensions.cs b/BASE/src/Microsoft.ApplicationInsights/ActivityExtensions.cs
index b6a43d1ae5..412a674ffb 100644
--- a/BASE/src/Microsoft.ApplicationInsights/ActivityExtensions.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/ActivityExtensions.cs
@@ -52,7 +52,11 @@ private static bool Initialize()
         {
             try
             {
+#if REDFIELD
+                Assembly.Load(new AssemblyName("System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"));
+#else
                 Assembly.Load(new AssemblyName("System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"));
+#endif
                 return true;
             }
             catch (System.IO.FileNotFoundException)
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/RichPayloadEventSource.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/RichPayloadEventSource.cs
index 22eebfe304..4acc0dd566 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/RichPayloadEventSource.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/RichPayloadEventSource.cs
@@ -21,7 +21,11 @@ internal sealed partial class RichPayloadEventSource : IDisposable
         internal readonly EventSource EventSourceInternal;
 
         /// <summary>Event provider name.</summary>
+#if REDFIELD
+        private const string EventProviderName = "Redfield-Microsoft-ApplicationInsights-Data";
+#else
         private const string EventProviderName = "Microsoft-ApplicationInsights-Data";
+#endif        
 
         /// <summary>
         /// Initializes a new instance of the RichPayloadEventSource class.
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/CoreEventSource.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/CoreEventSource.cs
index fcdec90df0..c199cdf202 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/CoreEventSource.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/CoreEventSource.cs
@@ -4,7 +4,11 @@
     using System.Diagnostics.CodeAnalysis;
     using System.Diagnostics.Tracing;
 
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Core")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Core")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     internal sealed class CoreEventSource : EventSource
     {
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/DiagnosticsModule/DiagnosticsEventListener.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/DiagnosticsModule/DiagnosticsEventListener.cs
index 813c5c6012..205af356c7 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/DiagnosticsModule/DiagnosticsEventListener.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/DiagnosticsModule/DiagnosticsEventListener.cs
@@ -86,6 +86,38 @@ protected override void OnEventSourceCreated(EventSource eventSource)
         /// </summary>
         private static bool ShouldSubscribe(EventSource eventSource)
         {
+#if REDFIELD
+            if (eventSource.Name.StartsWith("Redfield-Microsoft-A", StringComparison.Ordinal))
+            {
+                switch (eventSource.Name)
+                {
+                    case "Redfield-Microsoft-ApplicationInsights-Core":
+                    case "Redfield-Microsoft-ApplicationInsights-WindowsServer-TelemetryChannel":
+
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-AppMapCorrelation-Dependency":
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-AppMapCorrelation-Web":
+
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-DependencyCollector":
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-EventCounterCollector":
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-PerformanceCollector":
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-PerformanceCollector-QuickPulse":
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-Web":
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-WindowsServer":
+                    case "Redfield-Microsoft-ApplicationInsights-WindowsServer-Core":
+                    case "Redfield-Microsoft-ApplicationInsights-Extensibility-EventSourceListener":
+                    case "Redfield-Microsoft-ApplicationInsights-AspNetCore":
+                    case "Redfield-Microsoft-ApplicationInsights-LoggerProvider":
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+
+            if (eventSource.Name == "Microsoft-AspNet-Telemetry-Correlation")
+            {
+                return true;
+            }
+#else
             if (eventSource.Name.StartsWith("Microsoft-A", StringComparison.Ordinal))
             {
                 switch (eventSource.Name)
@@ -96,7 +128,7 @@ private static bool ShouldSubscribe(EventSource eventSource)
                     // AppMapCorrelation has a shared partial class: https://github.com/microsoft/ApplicationInsights-dotnet/blob/master/WEB/Src/Common/AppMapCorrelationEventSource.cs
                     case "Microsoft-ApplicationInsights-Extensibility-AppMapCorrelation-Dependency": // https://github.com/microsoft/ApplicationInsights-dotnet/blob/master/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs
                     case "Microsoft-ApplicationInsights-Extensibility-AppMapCorrelation-Web": // https://github.com/microsoft/ApplicationInsights-dotnet/blob/master/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs
-                    
+
                     case "Microsoft-ApplicationInsights-Extensibility-DependencyCollector": // https://github.com/microsoft/ApplicationInsights-dotnet/blob/master/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs
                     case "Microsoft-ApplicationInsights-Extensibility-EventCounterCollector": // https://github.com/microsoft/ApplicationInsights-dotnet/blob/master/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollectorEventSource.cs
                     case "Microsoft-ApplicationInsights-Extensibility-PerformanceCollector": // https://github.com/microsoft/ApplicationInsights-dotnet/blob/master/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCollectorEventSource.cs
@@ -113,6 +145,7 @@ private static bool ShouldSubscribe(EventSource eventSource)
                         return false;
                 }
             }
+#endif
 
             return false;
         }
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/DiagnosticsEventListener.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/DiagnosticsEventListener.cs
index edee2dc886..7a93000085 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/DiagnosticsEventListener.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/DiagnosticsEventListener.cs
@@ -8,8 +8,11 @@
     /// </summary>
     internal class DiagnosticsEventListener : EventListener
     {
+#if REDFIELD
+        private const string EventSourceNamePrefix = "Redfield-Microsoft-ApplicationInsights-";
+#else
         private const string EventSourceNamePrefix = "Microsoft-ApplicationInsights-";
-
+#endif
         private readonly EventKeywords keywords;
 
         private readonly EventLevel logLevel;
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/TraceSourceForEventSource.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/TraceSourceForEventSource.cs
index 8bfa6313fe..f08d15078b 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/TraceSourceForEventSource.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/FileDiagnosticsModule/TraceSourceForEventSource.cs
@@ -13,7 +13,12 @@
     internal class TraceSourceForEventSource : TraceSource, IEventListener, IDisposable
     {
         private const long AllKeyword = -1;
+
+#if REDFIELD
+        private const string TraceSourceName = "Redfield.Microsoft.ApplicationInsights.Extensibility.TraceSource";
+#else
         private const string TraceSourceName = "Microsoft.ApplicationInsights.Extensibility.TraceSource";
+#endif
 
         private DiagnosticsEventListener listener;
 
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/SelfDiagnostics/SelfDiagnosticsEventListener.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/SelfDiagnostics/SelfDiagnosticsEventListener.cs
index 8173c311db..4e22c374a8 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/SelfDiagnostics/SelfDiagnosticsEventListener.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/SelfDiagnostics/SelfDiagnosticsEventListener.cs
@@ -13,8 +13,11 @@
     /// </summary>
     internal class SelfDiagnosticsEventListener : EventListener
     {
+#if REDFIELD
+        private const string EventSourceNamePrefix = "Redfield-Microsoft-ApplicationInsights-";
+#else
         private const string EventSourceNamePrefix = "Microsoft-ApplicationInsights-";
-
+#endif
         // Buffer size of the log line. A UTF-16 encoded character in C# can take up to 4 bytes if encoded in UTF-8.
         private const int BUFFERSIZE = 4 * 5120;
         private readonly ThreadLocal<byte[]> writeBuffer = new ThreadLocal<byte[]>(() => null);
diff --git a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj
index 17960e4447..2f3fa9ec64 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj
+++ b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28" Condition="$(OS) == 'Windows_NT'">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePkgVer)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
@@ -34,5 +34,5 @@
     <AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Unshipped.txt" />
   </ItemGroup>
-  
+ 
 </Project>
diff --git a/BASE/src/ServerTelemetryChannel/Implementation/TelemetryChannelEventSource.cs b/BASE/src/ServerTelemetryChannel/Implementation/TelemetryChannelEventSource.cs
index 4b78dd2b45..673c9ccfc8 100644
--- a/BASE/src/ServerTelemetryChannel/Implementation/TelemetryChannelEventSource.cs
+++ b/BASE/src/ServerTelemetryChannel/Implementation/TelemetryChannelEventSource.cs
@@ -4,7 +4,11 @@
     using System.Diagnostics.CodeAnalysis;
     using System.Diagnostics.Tracing;
 
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-WindowsServer-TelemetryChannel")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-WindowsServer-TelemetryChannel")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     internal sealed class TelemetryChannelEventSource : EventSource
     {
diff --git a/Directory.Build.props b/Directory.Build.props
index e141f830f0..713661966c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,8 +7,25 @@
 
     <!-- This is used to disable some build properties. -->
     <IsExamplesSolution Condition="'$(SolutionName)' == 'Examples' ">true</IsExamplesSolution>
+
+    <!-- This is used to change EventSource names. -->
+    <DefineConstants Condition="'$(Redfield)' == 'True'">$(DefineConstants);REDFIELD</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Package versions for System.Diagnostics.DiagnosticSource">
+    <SystemDiagnosticsDiagnosticSourcePkgVer>5.0.0</SystemDiagnosticsDiagnosticSourcePkgVer>
+    <SystemDiagnosticsDiagnosticSourcePkgVer Condition="'$(Redfield)' == 'True'">4.7.0</SystemDiagnosticsDiagnosticSourcePkgVer>
   </PropertyGroup>
 
+  <Target Name="Info_Redfield"  BeforeTargets="Build" Condition="'$(Redfield)' == 'True'">
+    <!-- 
+    This flag is reserved for Codeless Attach products.
+    Redfield has some unique code changes to avoid conflicting with the real AI SDK.
+    To use: dotnet build /p:Redfield=True
+    -->
+    <Message Text="Directory.Build.props: Redfield build detected." Importance="high"/>
+  </Target>
+  
   <Target Name="Info_InternalSettings"  BeforeTargets="Build">
     <Message Text="Directory.Build.props: Internal_Logging is set to $(Internal_Logging)." Importance="high"/>
   </Target>
diff --git a/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj b/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj
index c17a8a44ab..4e22038644 100644
--- a/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj
+++ b/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj
@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePkgVer)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LOGGING/src/EventSource.Shared/EventSource.Shared/Implementation/EventSourceListenerEventSource.cs b/LOGGING/src/EventSource.Shared/EventSource.Shared/Implementation/EventSourceListenerEventSource.cs
index 3a9d2d9d95..ca05846ef4 100644
--- a/LOGGING/src/EventSource.Shared/EventSource.Shared/Implementation/EventSourceListenerEventSource.cs
+++ b/LOGGING/src/EventSource.Shared/EventSource.Shared/Implementation/EventSourceListenerEventSource.cs
@@ -16,7 +16,11 @@ namespace Microsoft.ApplicationInsights.TraceEvent.Shared.Implementation
     [EventSource(Name = ProviderName)]
     internal sealed class EventSourceListenerEventSource : EventSource
     {
+#if REDFIELD
+        public const string ProviderName = "Redfield-Microsoft-ApplicationInsights-Extensibility-EventSourceListener";
+#else
         public const string ProviderName = "Microsoft-ApplicationInsights-Extensibility-EventSourceListener";
+#endif
         public static readonly EventSourceListenerEventSource Log = new EventSourceListenerEventSource();
 
         public readonly string ApplicationName;
diff --git a/LOGGING/src/ILogger/ApplicationInsightsLoggerEventSource.cs b/LOGGING/src/ILogger/ApplicationInsightsLoggerEventSource.cs
index 4307a69a32..d5c48f4520 100644
--- a/LOGGING/src/ILogger/ApplicationInsightsLoggerEventSource.cs
+++ b/LOGGING/src/ILogger/ApplicationInsightsLoggerEventSource.cs
@@ -13,7 +13,11 @@ namespace Microsoft.Extensions.Logging.ApplicationInsights
     /// <summary>
     /// EventSource for reporting errors and warnings from Logging module.
     /// </summary>
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-LoggerProvider")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-LoggerProvider")]
+#endif
     internal sealed class ApplicationInsightsLoggerEventSource : EventSource
     {
         public static readonly ApplicationInsightsLoggerEventSource Log = new ApplicationInsightsLoggerEventSource();
diff --git a/LOGGING/test/EtwCollector.Tests/EventSourceModuleDiagnosticListener.cs b/LOGGING/test/EtwCollector.Tests/EventSourceModuleDiagnosticListener.cs
index 7dcdbfab8d..1a63ec0f02 100644
--- a/LOGGING/test/EtwCollector.Tests/EventSourceModuleDiagnosticListener.cs
+++ b/LOGGING/test/EtwCollector.Tests/EventSourceModuleDiagnosticListener.cs
@@ -25,7 +25,11 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
 
         protected override void OnEventSourceCreated(EventSource eventSource)
         {
+#if REDFIELD
+            if (string.Equals(eventSource.Name, "Redfield-Microsoft-ApplicationInsights-Extensibility-EventSourceListener", System.StringComparison.Ordinal))
+#else
             if (string.Equals(eventSource.Name, "Microsoft-ApplicationInsights-Extensibility-EventSourceListener", System.StringComparison.Ordinal))
+#endif   
             {
                 EnableEvents(eventSource, EventLevel.LogAlways);
             }
diff --git a/LOGGING/test/EventSourceListener.Tests/EventSourceModuleDiagnosticListener.cs b/LOGGING/test/EventSourceListener.Tests/EventSourceModuleDiagnosticListener.cs
index f255685808..975053748c 100644
--- a/LOGGING/test/EventSourceListener.Tests/EventSourceModuleDiagnosticListener.cs
+++ b/LOGGING/test/EventSourceListener.Tests/EventSourceModuleDiagnosticListener.cs
@@ -26,7 +26,11 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
 
         protected override void OnEventSourceCreated(EventSource eventSource)
         {
+#if REDFIELD
+            if (string.Equals(eventSource.Name, "Redfield-Microsoft-ApplicationInsights-Extensibility-EventSourceListener", StringComparison.Ordinal))
+#else
             if (string.Equals(eventSource.Name, "Microsoft-ApplicationInsights-Extensibility-EventSourceListener", StringComparison.Ordinal))
+#endif  
             {
                 EnableEvents(eventSource, EventLevel.LogAlways);
             }
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensibility/Implementation/Tracing/AspNetCoreEventSource.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensibility/Implementation/Tracing/AspNetCoreEventSource.cs
index 567dd881c8..815caa2b1c 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensibility/Implementation/Tracing/AspNetCoreEventSource.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensibility/Implementation/Tracing/AspNetCoreEventSource.cs
@@ -11,7 +11,11 @@
     /// <summary>
     /// Event source for Application Insights ASP.NET Core SDK.
     /// </summary>
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-AspNetCore")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-AspNetCore")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     [SuppressMessage("", "SA1611:ElementParametersMustBeDocumented", Justification = "Internal only class.")]
     internal sealed class AspNetCoreEventSource : EventSource
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Implementation/Tracing/WorkerServiceEventSource.cs b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Implementation/Tracing/WorkerServiceEventSource.cs
index b461062b40..2ff8ab7dbd 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Implementation/Tracing/WorkerServiceEventSource.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.WorkerService/Implementation/Tracing/WorkerServiceEventSource.cs
@@ -8,7 +8,11 @@
     /// <summary>
     /// Event source for Application Insights Worker Service SDK.
     /// </summary>
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-WorkerService")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-WorkerService")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     [SuppressMessage("", "SA1611:ElementParametersMustBeDocumented", Justification = "Internal only class.")]
     internal sealed class WorkerServiceEventSource : EventSource
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj
index bb0d5ff414..7bf11c5908 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj
+++ b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj
@@ -26,7 +26,7 @@
   <ItemGroup>
     <!--Common Dependencies-->
     <ProjectReference Include="..\..\..\..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePkgVer)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs b/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs
index 8fcea7abaa..dbf2b9ef3d 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs
@@ -282,10 +282,9 @@ protected virtual void Dispose(bool disposing)
         [MethodImpl(MethodImplOptions.NoOptimization | MethodImplOptions.NoInlining)]
         private static void PrepareFirstActivity()
         {
-            using (var activity = new Activity("Microsoft.ApplicationInights.Init"))
-            {
-                activity.Start();
-            }
+            var activity = new Activity("Microsoft.ApplicationInsights.Init");
+            activity.Start();
+            activity.Stop();
         }
 
 #if !NETSTANDARD
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs
index 9a1ffc0bbd..237b671709 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AppMapCorrelationEventSource.cs
@@ -7,7 +7,11 @@
     /// <summary>
     /// ETW EventSource tracing class.
     /// </summary>
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-AppMapCorrelation-Dependency")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-AppMapCorrelation-Dependency")]
+#endif
     internal sealed partial class AppMapCorrelationEventSource : EventSource
     {
     }
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs
index 13ae8b034a..a3e9583526 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyCollectorEventSource.cs
@@ -10,7 +10,11 @@
     /// <summary>
     /// ETW EventSource tracing class.
     /// </summary>
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-DependencyCollector")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-DependencyCollector")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     internal sealed class DependencyCollectorEventSource : EventSource
     {
diff --git a/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollectorDiagnosticListener.cs b/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollectorDiagnosticListener.cs
index f9299e8271..020be06b17 100644
--- a/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollectorDiagnosticListener.cs
+++ b/WEB/Src/EventCounterCollector/EventCounterCollector.Tests/EventCounterCollectorDiagnosticListener.cs
@@ -21,7 +21,11 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
 
         protected override void OnEventSourceCreated(EventSource eventSource)
         {
+#if REDFIELD
+            if (string.Equals(eventSource.Name, "Redfield-Microsoft-ApplicationInsights-Extensibility-EventCounterCollector", StringComparison.Ordinal))
+#else
             if (string.Equals(eventSource.Name, "Microsoft-ApplicationInsights-Extensibility-EventCounterCollector", StringComparison.Ordinal))
+#endif
             {
                 EnableEvents(eventSource, EventLevel.LogAlways);
             }
diff --git a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollectorEventSource.cs b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollectorEventSource.cs
index bc5bda743c..a7c7cf6eee 100644
--- a/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollectorEventSource.cs
+++ b/WEB/Src/EventCounterCollector/EventCounterCollector/EventCounterCollectorEventSource.cs
@@ -4,7 +4,11 @@
     using System.Diagnostics.Tracing;
     using Microsoft.ApplicationInsights.Common;
 
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-EventCounterCollector")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-EventCounterCollector")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     internal sealed class EventCounterCollectorEventSource : EventSource
     {
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCollectorEventSource.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCollectorEventSource.cs
index aff827ce3f..e54b08d4c3 100644
--- a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCollectorEventSource.cs
+++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCollectorEventSource.cs
@@ -4,7 +4,11 @@
     using System.Diagnostics.Tracing;
     using Microsoft.ApplicationInsights.Common;
 
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-PerformanceCollector")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-PerformanceCollector")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     internal sealed class PerformanceCollectorEventSource : EventSource
     {
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseEventSource.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseEventSource.cs
index 735c703c3b..d6132e13c0 100644
--- a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseEventSource.cs
+++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/QuickPulse/QuickPulseEventSource.cs
@@ -6,7 +6,11 @@
     using System.Reflection;
     using Microsoft.ApplicationInsights.Common;
 
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-PerformanceCollector-QuickPulse")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-PerformanceCollector-QuickPulse")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     internal sealed class QuickPulseEventSource : EventSource
     {
diff --git a/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs b/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs
index 07f8ee4ac0..c789dc5cd4 100644
--- a/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs
+++ b/WEB/Src/Web/Web/Implementation/AppMapCorrelationEventSource.cs
@@ -7,7 +7,11 @@
     /// <summary>
     /// ETW EventSource tracing class.
     /// </summary>
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-AppMapCorrelation-Web")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-AppMapCorrelation-Web")]
+#endif
     internal sealed partial class AppMapCorrelationEventSource : EventSource
     {
     }
diff --git a/WEB/Src/Web/Web/Implementation/WebEventSource.cs b/WEB/Src/Web/Web/Implementation/WebEventSource.cs
index 80b659b4f1..5402b0a778 100644
--- a/WEB/Src/Web/Web/Implementation/WebEventSource.cs
+++ b/WEB/Src/Web/Web/Implementation/WebEventSource.cs
@@ -6,11 +6,15 @@
     using System.Diagnostics.Tracing;
 #endif
     using Microsoft.ApplicationInsights.Common;
-    
+
     /// <summary>
     /// ETW EventSource tracing class.
     /// </summary>
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-Web")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-Web")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     internal sealed class WebEventSource : EventSource
     {
diff --git a/WEB/Src/Web/Web/Web.csproj b/WEB/Src/Web/Web/Web.csproj
index ffedc9ea2b..61e8ce3ac0 100644
--- a/WEB/Src/Web/Web/Web.csproj
+++ b/WEB/Src/Web/Web/Web.csproj
@@ -21,7 +21,7 @@
     <!--Common Dependencies-->
     <ProjectReference Include="..\..\..\..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj" />
     <PackageReference Include="Microsoft.AspNet.TelemetryCorrelation" Version="1.0.8" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePkgVer)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WEB/Src/WindowsServer/WindowsServer/Implementation/WindowsServerEventSource.cs b/WEB/Src/WindowsServer/WindowsServer/Implementation/WindowsServerEventSource.cs
index d4339488dd..8e19218a9b 100644
--- a/WEB/Src/WindowsServer/WindowsServer/Implementation/WindowsServerEventSource.cs
+++ b/WEB/Src/WindowsServer/WindowsServer/Implementation/WindowsServerEventSource.cs
@@ -8,7 +8,11 @@
     /// <summary>
     /// ETW EventSource tracing class.
     /// </summary>
+#if REDFIELD
+    [EventSource(Name = "Redfield-Microsoft-ApplicationInsights-Extensibility-WindowsServer")]
+#else
     [EventSource(Name = "Microsoft-ApplicationInsights-Extensibility-WindowsServer")]
+#endif
     [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "appDomainName is required")]
     internal sealed class WindowsServerEventSource : EventSource
     {
diff --git a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj
index b30d19c8e2..29d7c20f94 100644
--- a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj
+++ b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj
@@ -24,7 +24,7 @@
     <!--Common Dependencies-->
     <ProjectReference Include="..\..\..\..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj" />
     <ProjectReference Include="..\..\..\..\BASE\src\ServerTelemetryChannel\TelemetryChannel.csproj" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="5.0.0" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePkgVer)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">