diff --git a/xml/System.Collections.Concurrent/OrderablePartitioner`1.xml b/xml/System.Collections.Concurrent/OrderablePartitioner`1.xml
index 2e3b90c635e..ce90dc0069a 100644
--- a/xml/System.Collections.Concurrent/OrderablePartitioner`1.xml
+++ b/xml/System.Collections.Concurrent/OrderablePartitioner`1.xml
@@ -25,7 +25,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Collections.Concurrent" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Collections.Concurrent" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TSource" />
diff --git a/xml/System.Collections.Concurrent/Partitioner`1.xml b/xml/System.Collections.Concurrent/Partitioner`1.xml
index 5afbd3ddbf2..77bd7b1a35a 100644
--- a/xml/System.Collections.Concurrent/Partitioner`1.xml
+++ b/xml/System.Collections.Concurrent/Partitioner`1.xml
@@ -25,7 +25,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Collections.Concurrent" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Collections.Concurrent" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TSource" />
diff --git a/xml/System.Collections.Generic/Dictionary`2+Enumerator.xml b/xml/System.Collections.Generic/Dictionary`2+Enumerator.xml
index 6977ef227c8..f0f8df3ae66 100644
--- a/xml/System.Collections.Generic/Dictionary`2+Enumerator.xml
+++ b/xml/System.Collections.Generic/Dictionary`2+Enumerator.xml
@@ -30,6 +30,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TKey" />
     <TypeParameter Name="TValue" />
diff --git a/xml/System.Collections.Generic/Dictionary`2.xml b/xml/System.Collections.Generic/Dictionary`2.xml
index 2d3e418eea6..aa1e1157769 100644
--- a/xml/System.Collections.Generic/Dictionary`2.xml
+++ b/xml/System.Collections.Generic/Dictionary`2.xml
@@ -42,7 +42,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Collections" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netstandard-1.3;netstandard-1.4" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TKey" />
diff --git a/xml/System.Collections.Generic/HashSet`1+Enumerator.xml b/xml/System.Collections.Generic/HashSet`1+Enumerator.xml
index e47fc4bbb18..a0dab399249 100644
--- a/xml/System.Collections.Generic/HashSet`1+Enumerator.xml
+++ b/xml/System.Collections.Generic/HashSet`1+Enumerator.xml
@@ -27,6 +27,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Core" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System.Collections.Generic/IAsyncEnumerable`1.xml b/xml/System.Collections.Generic/IAsyncEnumerable`1.xml
index 9a4849fbec0..6dea7f3eaaf 100644
--- a/xml/System.Collections.Generic/IAsyncEnumerable`1.xml
+++ b/xml/System.Collections.Generic/IAsyncEnumerable`1.xml
@@ -20,7 +20,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="Microsoft.Bcl.AsyncInterfaces" FromVersion="1.0.0.0" To="netstandard" ToVersion="2.1.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
-    <TypeForwarding From="netstandard" FromVersion="2.1.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T">
diff --git a/xml/System.Collections.Generic/IDictionary`2.xml b/xml/System.Collections.Generic/IDictionary`2.xml
index 2171f85d7ef..6dd23bbecd3 100644
--- a/xml/System.Collections.Generic/IDictionary`2.xml
+++ b/xml/System.Collections.Generic/IDictionary`2.xml
@@ -29,8 +29,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="netstandard" FromVersion="2.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.Runtime" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netstandard-1.5" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TKey" />
diff --git a/xml/System.Collections.Generic/IEnumerable`1.xml b/xml/System.Collections.Generic/IEnumerable`1.xml
index 1726f6173b3..9db6c5097ca 100644
--- a/xml/System.Collections.Generic/IEnumerable`1.xml
+++ b/xml/System.Collections.Generic/IEnumerable`1.xml
@@ -32,9 +32,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Runtime" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.6" />
-    <TypeForwarding From="netstandard" FromVersion="2.1.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
-    <TypeForwarding From="netstandard" FromVersion="2.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T">
diff --git a/xml/System.Collections.Generic/LinkedList`1+Enumerator.xml b/xml/System.Collections.Generic/LinkedList`1+Enumerator.xml
index 3ec5f6c8097..7157c21e88a 100644
--- a/xml/System.Collections.Generic/LinkedList`1+Enumerator.xml
+++ b/xml/System.Collections.Generic/LinkedList`1+Enumerator.xml
@@ -33,6 +33,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System.Collections.Generic/List`1+Enumerator.xml b/xml/System.Collections.Generic/List`1+Enumerator.xml
index e440a85b44b..1311156565c 100644
--- a/xml/System.Collections.Generic/List`1+Enumerator.xml
+++ b/xml/System.Collections.Generic/List`1+Enumerator.xml
@@ -27,6 +27,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System.Collections.Generic/Queue`1+Enumerator.xml b/xml/System.Collections.Generic/Queue`1+Enumerator.xml
index 09f281de9b6..3b35aa56836 100644
--- a/xml/System.Collections.Generic/Queue`1+Enumerator.xml
+++ b/xml/System.Collections.Generic/Queue`1+Enumerator.xml
@@ -27,6 +27,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System.Collections.Generic/SortedDictionary`2+Enumerator.xml b/xml/System.Collections.Generic/SortedDictionary`2+Enumerator.xml
index 17fd6e8b690..e101e99d5cb 100644
--- a/xml/System.Collections.Generic/SortedDictionary`2+Enumerator.xml
+++ b/xml/System.Collections.Generic/SortedDictionary`2+Enumerator.xml
@@ -29,6 +29,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TKey" />
     <TypeParameter Name="TValue" />
diff --git a/xml/System.Collections.Generic/SortedSet`1+Enumerator.xml b/xml/System.Collections.Generic/SortedSet`1+Enumerator.xml
index 99bd5505821..8250efebf34 100644
--- a/xml/System.Collections.Generic/SortedSet`1+Enumerator.xml
+++ b/xml/System.Collections.Generic/SortedSet`1+Enumerator.xml
@@ -32,6 +32,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System.Collections.Generic/Stack`1+Enumerator.xml b/xml/System.Collections.Generic/Stack`1+Enumerator.xml
index fb061baf0a8..d7bd04bb572 100644
--- a/xml/System.Collections.Generic/Stack`1+Enumerator.xml
+++ b/xml/System.Collections.Generic/Stack`1+Enumerator.xml
@@ -27,6 +27,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.Collections" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System.Collections.ObjectModel/ReadOnlyDictionary`2+KeyCollection.xml b/xml/System.Collections.ObjectModel/ReadOnlyDictionary`2+KeyCollection.xml
index 2fc0feeb18a..374dde65157 100644
--- a/xml/System.Collections.ObjectModel/ReadOnlyDictionary`2+KeyCollection.xml
+++ b/xml/System.Collections.ObjectModel/ReadOnlyDictionary`2+KeyCollection.xml
@@ -33,6 +33,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TKey" />
     <TypeParameter Name="TValue" />
diff --git a/xml/System.Collections.ObjectModel/ReadOnlyDictionary`2+ValueCollection.xml b/xml/System.Collections.ObjectModel/ReadOnlyDictionary`2+ValueCollection.xml
index 24ffec2dd3c..3ff56c9a25b 100644
--- a/xml/System.Collections.ObjectModel/ReadOnlyDictionary`2+ValueCollection.xml
+++ b/xml/System.Collections.ObjectModel/ReadOnlyDictionary`2+ValueCollection.xml
@@ -33,6 +33,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TKey" />
     <TypeParameter Name="TValue" />
diff --git a/xml/System.ComponentModel.Design.Serialization/BasicDesignerLoader+ReloadOptions.xml b/xml/System.ComponentModel.Design.Serialization/BasicDesignerLoader+ReloadOptions.xml
index 8a0a2a079c9..3cd754dd0c8 100644
--- a/xml/System.ComponentModel.Design.Serialization/BasicDesignerLoader+ReloadOptions.xml
+++ b/xml/System.ComponentModel.Design.Serialization/BasicDesignerLoader+ReloadOptions.xml
@@ -14,6 +14,9 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
diff --git a/xml/System.ComponentModel.Design/CollectionEditor+CollectionForm.xml b/xml/System.ComponentModel.Design/CollectionEditor+CollectionForm.xml
index a8467acb68d..1bda1ab4248 100644
--- a/xml/System.ComponentModel.Design/CollectionEditor+CollectionForm.xml
+++ b/xml/System.ComponentModel.Design/CollectionEditor+CollectionForm.xml
@@ -18,6 +18,10 @@
     <AssemblyName>System.Windows.Forms.Design</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design.Editors" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Windows.Forms.Form</BaseTypeName>
   </Base>
diff --git a/xml/System.ComponentModel.Design/ComponentDesigner+ShadowPropertyCollection.xml b/xml/System.ComponentModel.Design/ComponentDesigner+ShadowPropertyCollection.xml
index c3d1161cf14..db3e3f7bea5 100644
--- a/xml/System.ComponentModel.Design/ComponentDesigner+ShadowPropertyCollection.xml
+++ b/xml/System.ComponentModel.Design/ComponentDesigner+ShadowPropertyCollection.xml
@@ -15,6 +15,10 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
   </Base>
diff --git a/xml/System.ComponentModel.Design/DesignerActionService.xml b/xml/System.ComponentModel.Design/DesignerActionService.xml
index 2614bc99d69..3dd0cb4fab8 100644
--- a/xml/System.ComponentModel.Design/DesignerActionService.xml
+++ b/xml/System.ComponentModel.Design/DesignerActionService.xml
@@ -623,7 +623,6 @@
         <param name="type">The <see cref="T:System.ComponentModel.Design.ComponentActionsType" /> to filter the associated designer actions with.</param>
         <summary>Returns the collection of designer action item lists of the specified type associated with a component.</summary>
         <returns>The collection of designer actions of the specified type for the specified component.</returns>
-        <exception cref="T:System.ArgumentNullException"><paramref name="component" /> is <see langword="null" />.</exception>
         <remarks>
           <format type="text/markdown"><![CDATA[  
   
@@ -640,6 +639,8 @@
   
  ]]></format>
         </remarks>
+        <exception cref="T:System.ArgumentNullException">
+          <paramref name="component" /> is <see langword="null" />.</exception>
       </Docs>
     </Member>
     <Member MemberName="GetComponentDesignerActions">
diff --git a/xml/System.ComponentModel.Design/ObjectSelectorEditor+Selector.xml b/xml/System.ComponentModel.Design/ObjectSelectorEditor+Selector.xml
index 08d7b84fe6b..b27b3a8be1a 100644
--- a/xml/System.ComponentModel.Design/ObjectSelectorEditor+Selector.xml
+++ b/xml/System.ComponentModel.Design/ObjectSelectorEditor+Selector.xml
@@ -19,6 +19,10 @@
     <AssemblyName>System.Windows.Forms.Design</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design.Editors" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Windows.Forms.TreeView</BaseTypeName>
   </Base>
diff --git a/xml/System.ComponentModel.Design/ObjectSelectorEditor+SelectorNode.xml b/xml/System.ComponentModel.Design/ObjectSelectorEditor+SelectorNode.xml
index 52ce274f84b..909471eadce 100644
--- a/xml/System.ComponentModel.Design/ObjectSelectorEditor+SelectorNode.xml
+++ b/xml/System.ComponentModel.Design/ObjectSelectorEditor+SelectorNode.xml
@@ -19,6 +19,10 @@
     <AssemblyName>System.Windows.Forms.Design</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design.Editors" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Windows.Forms.TreeNode</BaseTypeName>
   </Base>
diff --git a/xml/System.ComponentModel.Design/ObjectSelectorEditor.xml b/xml/System.ComponentModel.Design/ObjectSelectorEditor.xml
index cca477a09b1..fdaa7d8aab4 100644
--- a/xml/System.ComponentModel.Design/ObjectSelectorEditor.xml
+++ b/xml/System.ComponentModel.Design/ObjectSelectorEditor.xml
@@ -137,6 +137,7 @@
       <Docs>
         <param name="treeView">The tree view control to modify.</param>
         <summary>Modify a Windows Forms <see cref="T:System.Windows.Forms.TreeView" /> control to use the <related type="Article" href="https://docs.microsoft.com/en-us/dotnet/framework/winforms/controls/creating-an-explorer-style-interface-with-the-listview-and-treeview"> new Explorer style theme</related>.</summary>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="currValue">
diff --git a/xml/System.ComponentModel/EditorBrowsableState.xml b/xml/System.ComponentModel/EditorBrowsableState.xml
index 687b26a0528..91471eca962 100644
--- a/xml/System.ComponentModel/EditorBrowsableState.xml
+++ b/xml/System.ComponentModel/EditorBrowsableState.xml
@@ -30,8 +30,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.Runtime" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Runtime" FromVersion="4.0.0.0" To="System" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1" />
-    <TypeForwarding From="netstandard" FromVersion="2.0.0.0" To="System" ToVersion="4.0.0.0" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1" />
   </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
diff --git a/xml/System.ComponentModel/INotifyPropertyChanged.xml b/xml/System.ComponentModel/INotifyPropertyChanged.xml
index 2f15f1368d5..7f54089947e 100644
--- a/xml/System.ComponentModel/INotifyPropertyChanged.xml
+++ b/xml/System.ComponentModel/INotifyPropertyChanged.xml
@@ -27,7 +27,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.ObjectModel" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.ObjectModel" FromVersion="4.0.0.0" To="System" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1" />
   </TypeForwardingChain>
   <Interfaces />
   <Docs>
diff --git a/xml/System.ComponentModel/TypeDescriptionProvider.xml b/xml/System.ComponentModel/TypeDescriptionProvider.xml
index 83625870c4d..53eaa95458e 100644
--- a/xml/System.ComponentModel/TypeDescriptionProvider.xml
+++ b/xml/System.ComponentModel/TypeDescriptionProvider.xml
@@ -24,9 +24,6 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
-  <TypeForwardingChain>
-    <TypeForwarding From="netstandard" FromVersion="2.1.0.0" To="System" ToVersion="4.0.0.0" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
-  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
   </Base>
diff --git a/xml/System.Diagnostics.Tracing/EventSource+EventData.xml b/xml/System.Diagnostics.Tracing/EventSource+EventData.xml
index 6d045020890..2109b6e1032 100644
--- a/xml/System.Diagnostics.Tracing/EventSource+EventData.xml
+++ b/xml/System.Diagnostics.Tracing/EventSource+EventData.xml
@@ -25,6 +25,11 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Diagnostics.Tracing" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+    <TypeForwarding From="System.Diagnostics.Tracing" FromVersion="4.1.2.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netframework-4.7.1" />
+    <TypeForwarding From="System.Diagnostics.Tracing" FromVersion="4.2.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netframework-4.7.2;netframework-4.8" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.ValueType</BaseTypeName>
   </Base>
diff --git a/xml/System.Diagnostics/DebuggableAttribute+DebuggingModes.xml b/xml/System.Diagnostics/DebuggableAttribute+DebuggingModes.xml
index 3ba9b6e473d..8b9d9735b96 100644
--- a/xml/System.Diagnostics/DebuggableAttribute+DebuggingModes.xml
+++ b/xml/System.Diagnostics/DebuggableAttribute+DebuggingModes.xml
@@ -28,8 +28,7 @@
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
   <TypeForwardingChain>
-    <TypeForwarding From="netstandard" FromVersion="2.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.Runtime" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netstandard-1.3;netstandard-1.4;netstandard-1.6" />
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
   </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
diff --git a/xml/System.Diagnostics/DebuggerBrowsableState.xml b/xml/System.Diagnostics/DebuggerBrowsableState.xml
index a548212ab2c..926779c7603 100644
--- a/xml/System.Diagnostics/DebuggerBrowsableState.xml
+++ b/xml/System.Diagnostics/DebuggerBrowsableState.xml
@@ -31,7 +31,6 @@
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Diagnostics.Debug" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Diagnostics.Debug" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.Diagnostics.Debug" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1" />
   </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
diff --git a/xml/System.Globalization/Calendar.xml b/xml/System.Globalization/Calendar.xml
index 9d291923a79..8d3cbb3742e 100644
--- a/xml/System.Globalization/Calendar.xml
+++ b/xml/System.Globalization/Calendar.xml
@@ -39,7 +39,6 @@
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Globalization" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Globalization" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.Globalization" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1;netstandard-1.3;netstandard-1.4;netstandard-1.6" />
     <TypeForwarding From="System.Globalization" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
     <TypeForwarding From="System.Globalization" FromVersion="4.1.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
     <TypeForwarding From="System.Globalization" FromVersion="4.1.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
diff --git a/xml/System.IO/Stream.xml b/xml/System.IO/Stream.xml
index 90779dbba0e..7ce9ce63f3e 100644
--- a/xml/System.IO/Stream.xml
+++ b/xml/System.IO/Stream.xml
@@ -44,7 +44,6 @@
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.IO" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.IO" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.IO" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1;netstandard-1.3;netstandard-1.4;netstandard-1.6" />
     <TypeForwarding From="System.IO" FromVersion="4.2.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
     <TypeForwarding From="System.IO" FromVersion="4.2.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
     <TypeForwarding From="System.IO" FromVersion="4.2.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
diff --git a/xml/System.IO/UnmanagedMemoryAccessor.xml b/xml/System.IO/UnmanagedMemoryAccessor.xml
index e52d5e4ffa2..f15700e8a68 100644
--- a/xml/System.IO/UnmanagedMemoryAccessor.xml
+++ b/xml/System.IO/UnmanagedMemoryAccessor.xml
@@ -29,7 +29,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System.IO.UnmanagedMemoryStream" FromVersion="5.0.0.0" To="System.Runtime.InteropServices" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.IO.UnmanagedMemoryStream" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1" />
     <TypeForwarding From="System.IO.UnmanagedMemoryStream" FromVersion="4.1.0.0" To="System.Runtime.InteropServices" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
     <TypeForwarding From="System.IO.UnmanagedMemoryStream" FromVersion="4.1.1.0" To="System.Runtime.InteropServices" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
     <TypeForwarding From="System.IO.UnmanagedMemoryStream" FromVersion="4.1.2.0" To="System.Runtime.InteropServices" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
diff --git a/xml/System.Linq.Expressions/Expression`1.xml b/xml/System.Linq.Expressions/Expression`1.xml
index 880ea7e020b..beae758944b 100644
--- a/xml/System.Linq.Expressions/Expression`1.xml
+++ b/xml/System.Linq.Expressions/Expression`1.xml
@@ -28,7 +28,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System.Core" FromVersion="4.0.0.0" To="System.Linq.Expressions" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Linq.Expressions" FromVersion="4.0.0.0" To="System.Core" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.1" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TDelegate" />
diff --git a/xml/System.Linq/IGrouping`2.xml b/xml/System.Linq/IGrouping`2.xml
index b4b2f6eb5c3..635019d34c5 100644
--- a/xml/System.Linq/IGrouping`2.xml
+++ b/xml/System.Linq/IGrouping`2.xml
@@ -30,7 +30,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System.Core" FromVersion="4.0.0.0" To="System.Linq" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Linq" FromVersion="4.0.0.0" To="System.Core" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TKey">
diff --git a/xml/System.Linq/IOrderedQueryable`1.xml b/xml/System.Linq/IOrderedQueryable`1.xml
index 1d7e65c47b0..753fe9bdf16 100644
--- a/xml/System.Linq/IOrderedQueryable`1.xml
+++ b/xml/System.Linq/IOrderedQueryable`1.xml
@@ -35,7 +35,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System.Core" FromVersion="4.0.0.0" To="System.Linq.Expressions" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Linq.Expressions" FromVersion="4.0.0.0" To="System.Core" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T">
diff --git a/xml/System.Linq/IQueryable`1.xml b/xml/System.Linq/IQueryable`1.xml
index cfaeb1d02a8..0a3e9e43867 100644
--- a/xml/System.Linq/IQueryable`1.xml
+++ b/xml/System.Linq/IQueryable`1.xml
@@ -32,7 +32,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System.Core" FromVersion="4.0.0.0" To="System.Linq.Expressions" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Linq.Expressions" FromVersion="4.0.0.0" To="System.Core" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T">
diff --git a/xml/System.Net/HttpRequestHeader.xml b/xml/System.Net/HttpRequestHeader.xml
index f11e77c06fc..61fc9c866c8 100644
--- a/xml/System.Net/HttpRequestHeader.xml
+++ b/xml/System.Net/HttpRequestHeader.xml
@@ -34,7 +34,6 @@
     <TypeForwarding From="System" FromVersion="4.0.0.0" To="System.Net.Requests" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Net" FromVersion="4.0.0.0" To="System.Net.Requests" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Net.Requests" FromVersion="4.0.10.0" To="System.Net.WebHeaderCollection" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1" />
-    <TypeForwarding From="System.Net.Requests" FromVersion="0.0.0.0" To="System.Net.WebHeaderCollection" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Net.Requests" FromVersion="5.0.0.0" To="System.Net.WebHeaderCollection" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="System.Net.Requests" FromVersion="4.1.0.0" To="System.Net.WebHeaderCollection" ToVersion="4.1.0.0" FrameworkAlternate="netcore-2.0" />
     <TypeForwarding From="System.Net.Requests" FromVersion="4.1.1.0" To="System.Net.WebHeaderCollection" ToVersion="4.1.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
diff --git a/xml/System.Reflection/ReflectionContext.xml b/xml/System.Reflection/ReflectionContext.xml
index 13e97983918..84a62615f71 100644
--- a/xml/System.Reflection/ReflectionContext.xml
+++ b/xml/System.Reflection/ReflectionContext.xml
@@ -31,7 +31,6 @@
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Reflection" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Reflection" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.Reflection" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1" />
     <TypeForwarding From="System.Reflection" FromVersion="4.2.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
     <TypeForwarding From="System.Reflection" FromVersion="4.2.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
     <TypeForwarding From="System.Reflection" FromVersion="4.2.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
diff --git a/xml/System.Runtime.CompilerServices/ConditionalWeakTable`2+CreateValueCallback.xml b/xml/System.Runtime.CompilerServices/ConditionalWeakTable`2+CreateValueCallback.xml
index 7e829dc5dfa..f37a6935ce8 100644
--- a/xml/System.Runtime.CompilerServices/ConditionalWeakTable`2+CreateValueCallback.xml
+++ b/xml/System.Runtime.CompilerServices/ConditionalWeakTable`2+CreateValueCallback.xml
@@ -24,6 +24,14 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+    <TypeForwarding From="System.Dynamic.Runtime" FromVersion="4.0.10.0" To="System.Runtime" ToVersion="4.0.20.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1" />
+    <TypeForwarding From="System.Dynamic.Runtime" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Dynamic.Runtime" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
+    <TypeForwarding From="System.Dynamic.Runtime" FromVersion="4.1.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
+    <TypeForwarding From="System.Dynamic.Runtime" FromVersion="4.1.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TKey">
       <Constraints>
diff --git a/xml/System.Runtime.CompilerServices/ConditionalWeakTable`2.xml b/xml/System.Runtime.CompilerServices/ConditionalWeakTable`2.xml
index 0233f579bca..eb159082afc 100644
--- a/xml/System.Runtime.CompilerServices/ConditionalWeakTable`2.xml
+++ b/xml/System.Runtime.CompilerServices/ConditionalWeakTable`2.xml
@@ -35,7 +35,6 @@
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Dynamic.Runtime" FromVersion="4.0.10.0" To="System.Runtime" ToVersion="4.0.20.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1" />
-    <TypeForwarding From="System.Dynamic.Runtime" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1" />
     <TypeForwarding From="System.Dynamic.Runtime" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="System.Dynamic.Runtime" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
     <TypeForwarding From="System.Dynamic.Runtime" FromVersion="4.1.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
diff --git a/xml/System.Runtime.CompilerServices/ConfiguredCancelableAsyncEnumerable`1+Enumerator.xml b/xml/System.Runtime.CompilerServices/ConfiguredCancelableAsyncEnumerable`1+Enumerator.xml
index 7862939b8e7..dbe0679c4af 100644
--- a/xml/System.Runtime.CompilerServices/ConfiguredCancelableAsyncEnumerable`1+Enumerator.xml
+++ b/xml/System.Runtime.CompilerServices/ConfiguredCancelableAsyncEnumerable`1+Enumerator.xml
@@ -18,6 +18,10 @@
     <AssemblyName>System.Runtime</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="Microsoft.Bcl.AsyncInterfaces" FromVersion="1.0.0.0" To="netstandard" ToVersion="2.1.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable+ConfiguredTaskAwaiter.xml b/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable+ConfiguredTaskAwaiter.xml
index f141ccefeeb..23697ffa535 100644
--- a/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable+ConfiguredTaskAwaiter.xml
+++ b/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable+ConfiguredTaskAwaiter.xml
@@ -27,6 +27,13 @@
     <AssemblyVersion>4.2.2.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Threading.Tasks" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.ValueType</BaseTypeName>
   </Base>
diff --git a/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable`1+ConfiguredTaskAwaiter.xml b/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable`1+ConfiguredTaskAwaiter.xml
index 2df69b97008..04e7adf4124 100644
--- a/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable`1+ConfiguredTaskAwaiter.xml
+++ b/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable`1+ConfiguredTaskAwaiter.xml
@@ -27,6 +27,13 @@
     <AssemblyVersion>4.2.2.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Threading.Tasks" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TResult" />
   </TypeParameters>
diff --git a/xml/System.Runtime.CompilerServices/ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter.xml b/xml/System.Runtime.CompilerServices/ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter.xml
index df4af2df615..65431a3df20 100644
--- a/xml/System.Runtime.CompilerServices/ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter.xml
+++ b/xml/System.Runtime.CompilerServices/ConfiguredValueTaskAwaitable+ConfiguredValueTaskAwaiter.xml
@@ -15,6 +15,11 @@
     <AssemblyName>netstandard</AssemblyName>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Threading.Tasks.Extensions" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Threading.Tasks.Extensions" FromVersion="4.3.0.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
+    <TypeForwarding From="System.Threading.Tasks.Extensions" FromVersion="4.3.1.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.ValueType</BaseTypeName>
   </Base>
diff --git a/xml/System.Runtime.CompilerServices/ConfiguredValueTaskAwaitable`1+ConfiguredValueTaskAwaiter.xml b/xml/System.Runtime.CompilerServices/ConfiguredValueTaskAwaitable`1+ConfiguredValueTaskAwaiter.xml
index da8e1287e7f..b4c2e9e2d7c 100644
--- a/xml/System.Runtime.CompilerServices/ConfiguredValueTaskAwaitable`1+ConfiguredValueTaskAwaiter.xml
+++ b/xml/System.Runtime.CompilerServices/ConfiguredValueTaskAwaitable`1+ConfiguredValueTaskAwaiter.xml
@@ -22,6 +22,11 @@
     <AssemblyName>netstandard</AssemblyName>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Threading.Tasks.Extensions" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Threading.Tasks.Extensions" FromVersion="4.3.0.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
+    <TypeForwarding From="System.Threading.Tasks.Extensions" FromVersion="4.3.1.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TResult" />
   </TypeParameters>
diff --git a/xml/System.Runtime.CompilerServices/YieldAwaitable+YieldAwaiter.xml b/xml/System.Runtime.CompilerServices/YieldAwaitable+YieldAwaiter.xml
index 0326919b576..10a2c91650c 100644
--- a/xml/System.Runtime.CompilerServices/YieldAwaitable+YieldAwaiter.xml
+++ b/xml/System.Runtime.CompilerServices/YieldAwaitable+YieldAwaiter.xml
@@ -27,6 +27,13 @@
     <AssemblyVersion>4.2.2.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Threading.Tasks" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
+    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.ValueType</BaseTypeName>
   </Base>
diff --git a/xml/System.Runtime.InteropServices.ComTypes/ELEMDESC+DESCUNION.xml b/xml/System.Runtime.InteropServices.ComTypes/ELEMDESC+DESCUNION.xml
index 56b96bdf617..0a7c240221f 100644
--- a/xml/System.Runtime.InteropServices.ComTypes/ELEMDESC+DESCUNION.xml
+++ b/xml/System.Runtime.InteropServices.ComTypes/ELEMDESC+DESCUNION.xml
@@ -29,6 +29,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime.InteropServices" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.ValueType</BaseTypeName>
   </Base>
diff --git a/xml/System.Runtime.InteropServices.ComTypes/VARDESC+DESCUNION.xml b/xml/System.Runtime.InteropServices.ComTypes/VARDESC+DESCUNION.xml
index 67a6c4bf96f..c09998461e5 100644
--- a/xml/System.Runtime.InteropServices.ComTypes/VARDESC+DESCUNION.xml
+++ b/xml/System.Runtime.InteropServices.ComTypes/VARDESC+DESCUNION.xml
@@ -29,6 +29,9 @@
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime.InteropServices" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.ValueType</BaseTypeName>
   </Base>
diff --git a/xml/System.Runtime.InteropServices/ComInterfaceType.xml b/xml/System.Runtime.InteropServices/ComInterfaceType.xml
index 8fed3a0ecc1..5fbfa6bc4d8 100644
--- a/xml/System.Runtime.InteropServices/ComInterfaceType.xml
+++ b/xml/System.Runtime.InteropServices/ComInterfaceType.xml
@@ -32,7 +32,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime.InteropServices" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Runtime.InteropServices" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1" />
   </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
diff --git a/xml/System.Runtime.InteropServices/CriticalHandle.xml b/xml/System.Runtime.InteropServices/CriticalHandle.xml
index d3e0f4892ac..9e0ba1928bf 100644
--- a/xml/System.Runtime.InteropServices/CriticalHandle.xml
+++ b/xml/System.Runtime.InteropServices/CriticalHandle.xml
@@ -50,7 +50,6 @@
     <TypeForwarding From="System.Runtime.InteropServices" FromVersion="4.2.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
     <TypeForwarding From="System.Runtime.Handles" FromVersion="4.1.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
     <TypeForwarding From="System.Runtime.InteropServices" FromVersion="4.2.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
-    <TypeForwarding From="System.Runtime.Handles" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netstandard-1.5" />
   </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
diff --git a/xml/System.Runtime.InteropServices/SafeHandle.xml b/xml/System.Runtime.InteropServices/SafeHandle.xml
index 1857958b94a..91bc7b537dc 100644
--- a/xml/System.Runtime.InteropServices/SafeHandle.xml
+++ b/xml/System.Runtime.InteropServices/SafeHandle.xml
@@ -51,7 +51,6 @@
     <TypeForwarding From="System.Runtime.InteropServices" FromVersion="4.2.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
     <TypeForwarding From="System.Runtime.Handles" FromVersion="4.1.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
     <TypeForwarding From="System.Runtime.InteropServices" FromVersion="4.2.2.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
-    <TypeForwarding From="System.Runtime.Handles" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netstandard-1.5" />
   </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
diff --git a/xml/System.Security.Cryptography/RSACng.xml b/xml/System.Security.Cryptography/RSACng.xml
index d7c07c137cf..7b2d4d4b8c2 100644
--- a/xml/System.Security.Cryptography/RSACng.xml
+++ b/xml/System.Security.Cryptography/RSACng.xml
@@ -1,4 +1,4 @@
-<Type Name="RSACng" FullName="System.Security.Cryptography.RSACng">
+<Type Name="RSACng" FullName="System.Security.Cryptography.RSACng">
   <TypeSignature Language="C#" Value="public sealed class RSACng : System.Security.Cryptography.RSA" />
   <TypeSignature Language="ILAsm" Value=".class public auto ansi sealed beforefieldinit RSACng extends System.Security.Cryptography.RSA" />
   <TypeSignature Language="DocId" Value="T:System.Security.Cryptography.RSACng" />
diff --git a/xml/System.Security/IPermission.xml b/xml/System.Security/IPermission.xml
index 0465f2db27d..ed87e00a026 100644
--- a/xml/System.Security/IPermission.xml
+++ b/xml/System.Security/IPermission.xml
@@ -37,7 +37,6 @@
     <TypeForwarding From="System.Security.Permissions" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
     <TypeForwarding From="System.Runtime.Extensions" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="System.Security.Permissions" FromVersion="5.0.0.0" To="System.Runtime.Extensions" ToVersion="4.2.1.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.Runtime.Extensions" FromVersion="4.2.1.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="System.Security.Permissions" FromVersion="4.0.3.0" To="System.Runtime.Extensions" ToVersion="4.2.1.0" FrameworkAlternate="netcore-3.1" />
   </TypeForwardingChain>
   <Interfaces>
diff --git a/xml/System.ServiceModel.Description/IEndpointBehavior.xml b/xml/System.ServiceModel.Description/IEndpointBehavior.xml
index 980f94f1141..15e9d90ce63 100644
--- a/xml/System.ServiceModel.Description/IEndpointBehavior.xml
+++ b/xml/System.ServiceModel.Description/IEndpointBehavior.xml
@@ -28,7 +28,6 @@
     <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.7.0.0" FrameworkAlternate="dotnet-plat-ext-3.1" />
     <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="5.0.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
     <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.ServiceModel.Primitives" FromVersion="4.0.0.0" To="System.ServiceModel" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1" />
   </TypeForwardingChain>
   <Interfaces />
   <Docs>
diff --git a/xml/System.ServiceModel/ClientBase`1+BeginOperationDelegate.xml b/xml/System.ServiceModel/ClientBase`1+BeginOperationDelegate.xml
index 367c3391532..79da6f606f7 100644
--- a/xml/System.ServiceModel/ClientBase`1+BeginOperationDelegate.xml
+++ b/xml/System.ServiceModel/ClientBase`1+BeginOperationDelegate.xml
@@ -22,6 +22,12 @@
     <AssemblyVersion>4.7.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.6.0.0" FrameworkAlternate="dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.7.0.0" FrameworkAlternate="dotnet-plat-ext-3.1" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="5.0.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TChannel">
       <Constraints>
diff --git a/xml/System.ServiceModel/ClientBase`1+ChannelBase`1.xml b/xml/System.ServiceModel/ClientBase`1+ChannelBase`1.xml
index b095ef3ba67..c141a9e6b53 100644
--- a/xml/System.ServiceModel/ClientBase`1+ChannelBase`1.xml
+++ b/xml/System.ServiceModel/ClientBase`1+ChannelBase`1.xml
@@ -24,6 +24,12 @@
     <AssemblyVersion>4.7.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.6.0.0" FrameworkAlternate="dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.7.0.0" FrameworkAlternate="dotnet-plat-ext-3.1" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="5.0.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TChannel">
       <Constraints>
diff --git a/xml/System.ServiceModel/ClientBase`1+EndOperationDelegate.xml b/xml/System.ServiceModel/ClientBase`1+EndOperationDelegate.xml
index d889d642ddc..d1aeeb0fd7b 100644
--- a/xml/System.ServiceModel/ClientBase`1+EndOperationDelegate.xml
+++ b/xml/System.ServiceModel/ClientBase`1+EndOperationDelegate.xml
@@ -22,6 +22,12 @@
     <AssemblyVersion>4.7.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.6.0.0" FrameworkAlternate="dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.7.0.0" FrameworkAlternate="dotnet-plat-ext-3.1" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="5.0.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TChannel">
       <Constraints>
diff --git a/xml/System.ServiceModel/ClientBase`1+InvokeAsyncCompletedEventArgs.xml b/xml/System.ServiceModel/ClientBase`1+InvokeAsyncCompletedEventArgs.xml
index de3a19cca02..5bb894472cd 100644
--- a/xml/System.ServiceModel/ClientBase`1+InvokeAsyncCompletedEventArgs.xml
+++ b/xml/System.ServiceModel/ClientBase`1+InvokeAsyncCompletedEventArgs.xml
@@ -22,6 +22,12 @@
     <AssemblyVersion>4.7.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.6.0.0" FrameworkAlternate="dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.7.0.0" FrameworkAlternate="dotnet-plat-ext-3.1" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="5.0.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
+    <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="TChannel">
       <Constraints>
diff --git a/xml/System.ServiceModel/IExtensionCollection`1.xml b/xml/System.ServiceModel/IExtensionCollection`1.xml
index 3728287487a..17871eb8f94 100644
--- a/xml/System.ServiceModel/IExtensionCollection`1.xml
+++ b/xml/System.ServiceModel/IExtensionCollection`1.xml
@@ -28,7 +28,6 @@
     <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="4.7.0.0" FrameworkAlternate="dotnet-plat-ext-3.1" />
     <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="5.0.0.0" FrameworkAlternate="dotnet-plat-ext-5.0" />
     <TypeForwarding From="System.ServiceModel" FromVersion="4.0.0.0" To="System.ServiceModel.Primitives" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.ServiceModel.Primitives" FromVersion="4.0.0.0" To="System.ServiceModel" ToVersion="4.0.0.0" FrameworkAlternate="netcore-1.0;netcore-1.1" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T">
diff --git a/xml/System.Threading.Tasks/Task`1.xml b/xml/System.Threading.Tasks/Task`1.xml
index 0787ef4cbc7..2698a046954 100644
--- a/xml/System.Threading.Tasks/Task`1.xml
+++ b/xml/System.Threading.Tasks/Task`1.xml
@@ -29,7 +29,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Threading.Tasks" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Threading.Tasks" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netstandard-1.3;netstandard-1.4;netstandard-1.6" />
     <TypeForwarding From="System.Threading.Tasks" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
     <TypeForwarding From="System.Threading.Tasks" FromVersion="4.1.1.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
diff --git a/xml/System.Windows.Forms.Design/AxImporter+IReferenceResolver.xml b/xml/System.Windows.Forms.Design/AxImporter+IReferenceResolver.xml
index c076e3a480c..98b68a4bf7d 100644
--- a/xml/System.Windows.Forms.Design/AxImporter+IReferenceResolver.xml
+++ b/xml/System.Windows.Forms.Design/AxImporter+IReferenceResolver.xml
@@ -16,6 +16,10 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Interfaces />
   <Docs>
     <summary>Provides methods to resolve references to ActiveX libraries, COM type libraries or assemblies, or managed assemblies.</summary>
diff --git a/xml/System.Windows.Forms.Design/AxImporter+Options.xml b/xml/System.Windows.Forms.Design/AxImporter+Options.xml
index e49c3c108c2..02faa52a7bf 100644
--- a/xml/System.Windows.Forms.Design/AxImporter+Options.xml
+++ b/xml/System.Windows.Forms.Design/AxImporter+Options.xml
@@ -16,6 +16,10 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
   </Base>
diff --git a/xml/System.Windows.Forms.Design/ControlDesigner+ControlDesignerAccessibleObject.xml b/xml/System.Windows.Forms.Design/ControlDesigner+ControlDesignerAccessibleObject.xml
index 72a856b81e4..5276f71fdb0 100644
--- a/xml/System.Windows.Forms.Design/ControlDesigner+ControlDesignerAccessibleObject.xml
+++ b/xml/System.Windows.Forms.Design/ControlDesigner+ControlDesignerAccessibleObject.xml
@@ -16,6 +16,10 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Windows.Forms.AccessibleObject</BaseTypeName>
   </Base>
diff --git a/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowser.xml b/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowser.xml
index 880330aba38..8a4cd5b30bb 100644
--- a/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowser.xml
+++ b/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowser.xml
@@ -18,6 +18,10 @@
     <AssemblyName>System.Windows.Forms.Design</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design.Editors" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.ComponentModel.Component</BaseTypeName>
   </Base>
diff --git a/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowserFolder.xml b/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowserFolder.xml
index c03e1a5444c..6c2fe9ead93 100644
--- a/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowserFolder.xml
+++ b/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowserFolder.xml
@@ -18,6 +18,10 @@
     <AssemblyName>System.Windows.Forms.Design</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design.Editors" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
diff --git a/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowserStyles.xml b/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowserStyles.xml
index a3a293b88b6..2aa6ab4727f 100644
--- a/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowserStyles.xml
+++ b/xml/System.Windows.Forms.Design/FolderNameEditor+FolderBrowserStyles.xml
@@ -18,6 +18,10 @@
     <AssemblyName>System.Windows.Forms.Design</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Design" FromVersion="5.0.0.0" To="System.Windows.Forms.Design" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Design" FromVersion="4.0.0.0" To="System.Windows.Forms.Design.Editors" ToVersion="4.0.0.0" FrameworkAlternate="netcore-3.0;netcore-3.1" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
diff --git a/xml/System.Windows.Forms/DataGridView.xml b/xml/System.Windows.Forms/DataGridView.xml
index b3155d19d01..bc11ed96fd7 100644
--- a/xml/System.Windows.Forms/DataGridView.xml
+++ b/xml/System.Windows.Forms/DataGridView.xml
@@ -15237,6 +15237,7 @@
         <summary>Activates the keyboard tooltip.</summary>
         <returns>
           <see langword="true" /> if the key was processed; otherwise, <see langword="false" />.</returns>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="ProcessDataGridViewKey">
diff --git a/xml/System.Windows.Forms/Form.xml b/xml/System.Windows.Forms/Form.xml
index d0b25a4b16d..2dc6fa39436 100644
--- a/xml/System.Windows.Forms/Form.xml
+++ b/xml/System.Windows.Forms/Form.xml
@@ -1379,6 +1379,7 @@
       <Docs>
         <summary>Creates a new accessibility object for the <see cref="T:System.Windows.Forms.Form" /> control.</summary>
         <returns>A new accessible object for the control.</returns>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="CreateControlsInstance">
diff --git a/xml/System.Windows.Forms/ListBox.xml b/xml/System.Windows.Forms/ListBox.xml
index e20d61f9cd5..4125587922f 100644
--- a/xml/System.Windows.Forms/ListBox.xml
+++ b/xml/System.Windows.Forms/ListBox.xml
@@ -2022,6 +2022,7 @@
       <Docs>
         <param name="e">An event data instance.</param>
         <summary>Raises the <see cref="E:System.Windows.Forms.Control.GotFocus" /> event.</summary>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OnHandleCreated">
diff --git a/xml/System.Windows.Forms/MonthCalendar.xml b/xml/System.Windows.Forms/MonthCalendar.xml
index f8b2f084871..ae368277a62 100644
--- a/xml/System.Windows.Forms/MonthCalendar.xml
+++ b/xml/System.Windows.Forms/MonthCalendar.xml
@@ -1759,6 +1759,7 @@ The <xref:System.Windows.Forms.AccessibleObject> is only available in applicatio
       <Docs>
         <param name="e">An event data instance.</param>
         <summary>Raises the <see cref="E:System.Windows.Forms.Control.GotFocus" /> event.</summary>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
     <Member MemberName="OnHandleCreated">
diff --git a/xml/System.Windows.Forms/ToolStripControlHost+ToolStripHostedControlAccessibleObject.xml b/xml/System.Windows.Forms/ToolStripControlHost+ToolStripHostedControlAccessibleObject.xml
index 4db7442bc09..0f9c7009a31 100644
--- a/xml/System.Windows.Forms/ToolStripControlHost+ToolStripHostedControlAccessibleObject.xml
+++ b/xml/System.Windows.Forms/ToolStripControlHost+ToolStripHostedControlAccessibleObject.xml
@@ -40,6 +40,7 @@
         <param name="toolStripHostedControl">The control hosted in the <see cref="T:System.Windows.Forms.ToolStripControlHost" /> container.</param>
         <param name="toolStripControlHost">The container which hosts a control on the <see cref="T:System.Windows.Forms.ToolStrip" />.</param>
         <summary> Initializes a new <see cref="T:System.Windows.Forms.ToolStripControlHost.ToolStripHostedControlAccessibleObject" /> instance with the specified tool strip hosted control and tool strip control host. </summary>
+        <remarks>To be added.</remarks>
       </Docs>
     </Member>
   </Members>
diff --git a/xml/System.Xml.Serialization/IXmlSerializable.xml b/xml/System.Xml.Serialization/IXmlSerializable.xml
index c9d14c7646f..1659299cd4c 100644
--- a/xml/System.Xml.Serialization/IXmlSerializable.xml
+++ b/xml/System.Xml.Serialization/IXmlSerializable.xml
@@ -36,7 +36,6 @@
     <TypeForwarding From="System.Xml" FromVersion="4.0.0.0" To="System.Xml.XmlSerializer" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Xml.Serialization" FromVersion="4.0.0.0" To="System.Xml.XmlSerializer" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Xml.XmlSerializer" FromVersion="4.0.10.0" To="System.Xml.ReaderWriter" ToVersion="4.0.10.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1" />
-    <TypeForwarding From="System.Xml.XmlSerializer" FromVersion="0.0.0.0" To="System.Xml.ReaderWriter" ToVersion="4.0.10.0" FrameworkAlternate="dotnet-uwp-10.0" />
     <TypeForwarding From="System.Xml.XmlSerializer" FromVersion="5.0.0.0" To="System.Xml.ReaderWriter" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="System.Xml.XmlSerializer" FromVersion="4.1.0.0" To="System.Xml.ReaderWriter" ToVersion="4.2.0.0" FrameworkAlternate="netcore-2.0" />
     <TypeForwarding From="System.Xml.XmlSerializer" FromVersion="4.1.1.0" To="System.Xml.ReaderWriter" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2;netcore-3.0" />
diff --git a/xml/System.Xml/XmlReader.xml b/xml/System.Xml/XmlReader.xml
index b1b9069f5c6..8df9de3064a 100644
--- a/xml/System.Xml/XmlReader.xml
+++ b/xml/System.Xml/XmlReader.xml
@@ -34,7 +34,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System.Xml" FromVersion="4.0.0.0" To="System.Xml.ReaderWriter" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Xml.ReaderWriter" FromVersion="4.0.0.0" To="System.Xml" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1" />
   </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
diff --git a/xml/System/AttributeTargets.xml b/xml/System/AttributeTargets.xml
index 5bb1f895bff..f25c2e8428b 100644
--- a/xml/System/AttributeTargets.xml
+++ b/xml/System/AttributeTargets.xml
@@ -31,7 +31,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Runtime" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netstandard-1.5" />
   </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
diff --git a/xml/System/Char.xml b/xml/System/Char.xml
index a1a8b914ac2..42f7f3d3e16 100644
--- a/xml/System/Char.xml
+++ b/xml/System/Char.xml
@@ -1,4 +1,4 @@
-<Type Name="Char" FullName="System.Char">
+<Type Name="Char" FullName="System.Char">
   <TypeSignature Language="C#" Value="public struct Char : IComparable, IComparable&lt;char&gt;, IConvertible, IEquatable&lt;char&gt;" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1;xamarinandroid-7.1;xamarinios-10.8;xamarinmac-3.0" />
   <TypeSignature Language="ILAsm" Value=".class public sequential ansi sealed beforefieldinit char extends System.ValueType implements class System.IComparable, class System.IComparable`1&lt;char&gt;, class System.IConvertible, class System.IEquatable`1&lt;char&gt;" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
   <TypeSignature Language="DocId" Value="T:System.Char" />
diff --git a/xml/System/DateTime.xml b/xml/System/DateTime.xml
index dcb8e8e4e41..9bae9f4d3a7 100644
--- a/xml/System/DateTime.xml
+++ b/xml/System/DateTime.xml
@@ -1,4 +1,4 @@
-<Type Name="DateTime" FullName="System.DateTime">
+<Type Name="DateTime" FullName="System.DateTime">
   <TypeSignature Language="C#" Value="public struct DateTime : IComparable, IComparable&lt;DateTime&gt;, IConvertible, IEquatable&lt;DateTime&gt;, IFormattable" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6" />
   <TypeSignature Language="ILAsm" Value=".class public sequential ansi sealed beforefieldinit DateTime extends System.ValueType implements class System.IComparable, class System.IComparable`1&lt;valuetype System.DateTime&gt;, class System.IConvertible, class System.IEquatable`1&lt;valuetype System.DateTime&gt;, class System.IFormattable" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6" />
   <TypeSignature Language="DocId" Value="T:System.DateTime" />
diff --git a/xml/System/Environment+SpecialFolder.xml b/xml/System/Environment+SpecialFolder.xml
index 00f3324822a..29359b1b208 100644
--- a/xml/System/Environment+SpecialFolder.xml
+++ b/xml/System/Environment+SpecialFolder.xml
@@ -27,6 +27,9 @@
     <AssemblyName>System.Runtime</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Runtime.Extensions" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
diff --git a/xml/System/Environment+SpecialFolderOption.xml b/xml/System/Environment+SpecialFolderOption.xml
index 626c3eefd22..6202fbd337f 100644
--- a/xml/System/Environment+SpecialFolderOption.xml
+++ b/xml/System/Environment+SpecialFolderOption.xml
@@ -25,6 +25,9 @@
     <AssemblyName>System.Runtime</AssemblyName>
     <AssemblyVersion>5.0.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Runtime.Extensions" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Enum</BaseTypeName>
   </Base>
diff --git a/xml/System/Lazy`2.xml b/xml/System/Lazy`2.xml
index b1e191074b0..f193b423bb0 100644
--- a/xml/System/Lazy`2.xml
+++ b/xml/System/Lazy`2.xml
@@ -29,7 +29,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System.ComponentModel.Composition" FromVersion="4.0.0.0" To="netstandard" ToVersion="2.0.0.0" FrameworkAlternate="dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
-    <TypeForwarding From="netstandard" FromVersion="2.0.0.0" To="System.ComponentModel.Composition" ToVersion="4.0.0.0" FrameworkAlternate="dotnet-plat-ext-2.1;dotnet-plat-ext-2.2;dotnet-plat-ext-3.0;dotnet-plat-ext-3.1;dotnet-plat-ext-5.0" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
diff --git a/xml/System/Object.xml b/xml/System/Object.xml
index 6a3aa192ea8..ce33738f25e 100644
--- a/xml/System/Object.xml
+++ b/xml/System/Object.xml
@@ -31,7 +31,6 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="mscorlib" FromVersion="4.0.0.0" To="System.Runtime" ToVersion="0.0.0.0" FrameworkAlternate="dotnet-uwp-10.0" />
-    <TypeForwarding From="System.Runtime" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="net-5.0;netcore-3.0;netcore-3.1;netstandard-1.2" />
   </TypeForwardingChain>
   <Interfaces />
   <Attributes>
diff --git a/xml/System/ReadOnlySpan`1+Enumerator.xml b/xml/System/ReadOnlySpan`1+Enumerator.xml
index adb8e6284b1..755e42c6edf 100644
--- a/xml/System/ReadOnlySpan`1+Enumerator.xml
+++ b/xml/System/ReadOnlySpan`1+Enumerator.xml
@@ -15,6 +15,12 @@
     <AssemblyName>netstandard</AssemblyName>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Memory" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Memory" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2" />
+    <TypeForwarding From="System.Memory" FromVersion="4.2.0.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-3.0" />
+    <TypeForwarding From="System.Memory" FromVersion="4.2.1.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System/SByte.xml b/xml/System/SByte.xml
index 9b6a54931e6..febc99dee15 100644
--- a/xml/System/SByte.xml
+++ b/xml/System/SByte.xml
@@ -1137,8 +1137,7 @@
         <summary>Compares the current instance with another object of the same type and returns an integer that indicates whether the current instance precedes, follows, or occurs in the same position in the sort order as the other object.</summary>
         <returns>A value that indicates the relative order of the objects being compared.</returns>
         <remarks>
-          <format type="text/markdown">
-  <![CDATA[
+          <format type="text/markdown"><![CDATA[
 
 ## Remarks
 
diff --git a/xml/System/Span`1+Enumerator.xml b/xml/System/Span`1+Enumerator.xml
index f4d4ea040b4..e55684b6997 100644
--- a/xml/System/Span`1+Enumerator.xml
+++ b/xml/System/Span`1+Enumerator.xml
@@ -15,6 +15,12 @@
     <AssemblyName>netstandard</AssemblyName>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Memory" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
+    <TypeForwarding From="System.Memory" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2" />
+    <TypeForwarding From="System.Memory" FromVersion="4.2.0.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-3.0" />
+    <TypeForwarding From="System.Memory" FromVersion="4.2.1.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
+  </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
   </TypeParameters>
diff --git a/xml/System/Span`1.xml b/xml/System/Span`1.xml
index 484ad16e902..7b92289fc3d 100644
--- a/xml/System/Span`1.xml
+++ b/xml/System/Span`1.xml
@@ -21,12 +21,9 @@
   </AssemblyInfo>
   <TypeForwardingChain>
     <TypeForwarding From="System.Memory" FromVersion="5.0.0.0" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
-    <TypeForwarding From="System.Memory" FromVersion="4.0.1.1" To="System.Runtime" ToVersion="5.0.0.0" FrameworkAlternate="net-5.0" />
     <TypeForwarding From="System.Memory" FromVersion="4.1.0.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-2.1;netcore-2.2" />
     <TypeForwarding From="System.Memory" FromVersion="4.2.0.0" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-3.0" />
-    <TypeForwarding From="System.Memory" FromVersion="4.0.1.1" To="System.Runtime" ToVersion="4.2.1.0" FrameworkAlternate="netcore-3.0" />
     <TypeForwarding From="System.Memory" FromVersion="4.2.1.0" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
-    <TypeForwarding From="System.Memory" FromVersion="4.0.1.1" To="System.Runtime" ToVersion="4.2.2.0" FrameworkAlternate="netcore-3.1" />
   </TypeForwardingChain>
   <TypeParameters>
     <TypeParameter Name="T" />
diff --git a/xml/System/TimeZoneInfo+AdjustmentRule.xml b/xml/System/TimeZoneInfo+AdjustmentRule.xml
index bf2db76d1c3..c465f4cbc12 100644
--- a/xml/System/TimeZoneInfo+AdjustmentRule.xml
+++ b/xml/System/TimeZoneInfo+AdjustmentRule.xml
@@ -29,6 +29,10 @@
     <AssemblyName>System.Core</AssemblyName>
     <AssemblyVersion>3.5.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Core" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;xamarinmac-3.0" />
+    <TypeForwarding From="System.Core" FromVersion="2.0.5.0" To="mscorlib" ToVersion="2.0.5.0" FrameworkAlternate="xamarinandroid-7.1;xamarinios-10.8" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.Object</BaseTypeName>
   </Base>
diff --git a/xml/System/TimeZoneInfo+TransitionTime.xml b/xml/System/TimeZoneInfo+TransitionTime.xml
index 04de017070e..15191cb4244 100644
--- a/xml/System/TimeZoneInfo+TransitionTime.xml
+++ b/xml/System/TimeZoneInfo+TransitionTime.xml
@@ -28,6 +28,10 @@
     <AssemblyName>System.Core</AssemblyName>
     <AssemblyVersion>3.5.0.0</AssemblyVersion>
   </AssemblyInfo>
+  <TypeForwardingChain>
+    <TypeForwarding From="System.Core" FromVersion="4.0.0.0" To="mscorlib" ToVersion="4.0.0.0" FrameworkAlternate="netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;xamarinmac-3.0" />
+    <TypeForwarding From="System.Core" FromVersion="2.0.5.0" To="mscorlib" ToVersion="2.0.5.0" FrameworkAlternate="xamarinandroid-7.1;xamarinios-10.8" />
+  </TypeForwardingChain>
   <Base>
     <BaseTypeName>System.ValueType</BaseTypeName>
   </Base>