diff --git a/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable+ConfiguredTaskAwaiter.xml b/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable+ConfiguredTaskAwaiter.xml
index 5bd758c3070..556cc495e78 100644
--- a/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable+ConfiguredTaskAwaiter.xml
+++ b/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable+ConfiguredTaskAwaiter.xml
@@ -65,11 +65,11 @@
   <Docs>
     <summary>Provides an awaiter for an awaitable (<see cref="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable" />) object.</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This type is intended for compiler use; do not use it directly in your code.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This type is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -120,15 +120,15 @@
       <Docs>
         <summary>Ends the await on the completed task.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is intended for compiler use; do not use it directly in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-        <exception cref="T:System.Threading.Tasks.TaskCanceledException">The task was canceled.</exception>
+        <exception cref="T:System.OperationCanceledException">The task was canceled.</exception>
         <exception cref="T:System.Exception">The task completed in a faulted state.</exception>
       </Docs>
     </Member>
@@ -179,11 +179,11 @@
         <value>
           <see langword="true" /> if the task being awaited is completed; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is intended for compiler use; do not use it directly in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
@@ -245,11 +245,11 @@
         <param name="continuation">The action to invoke when the await operation completes.</param>
         <summary>Schedules the continuation action for the task associated with this awaiter.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is intended for compiler use; do not use it directly in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The <paramref name="continuation" /> argument is <see langword="null" />.</exception>
@@ -312,11 +312,11 @@
         <param name="continuation">The action to invoke when the await operation completes.</param>
         <summary>Schedules the continuation action for the task associated with this awaiter.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is intended for compiler use; do not use it directly in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The <paramref name="continuation" /> argument is <see langword="null" />.</exception>
diff --git a/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable`1+ConfiguredTaskAwaiter.xml b/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable`1+ConfiguredTaskAwaiter.xml
index c800bee047d..12f0fad895e 100644
--- a/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable`1+ConfiguredTaskAwaiter.xml
+++ b/xml/System.Runtime.CompilerServices/ConfiguredTaskAwaitable`1+ConfiguredTaskAwaiter.xml
@@ -75,11 +75,11 @@
   <Docs>
     <summary>Provides an awaiter for an awaitable object(<see cref="T:System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1" />).</summary>
     <remarks>
-      <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This type is intended for compiler use; do not use it directly in your code.  
-  
+      <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This type is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
     </remarks>
   </Docs>
@@ -135,15 +135,15 @@
         <summary>Ends the await on the completed task.</summary>
         <returns>The result of the completed task.</returns>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is intended for compiler use; do not use it directly in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
-        <exception cref="T:System.Threading.Tasks.TaskCanceledException">The task was canceled.</exception>
+        <exception cref="T:System.OperationCanceledException">The task was canceled.</exception>
         <exception cref="T:System.Exception">The task completed in a faulted state.</exception>
       </Docs>
     </Member>
@@ -194,11 +194,11 @@
         <value>
           <see langword="true" /> if the task being awaited has been completed; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This property is intended for compiler use; do not use it directly in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This property is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.NullReferenceException">The awaiter was not properly initialized.</exception>
@@ -260,11 +260,11 @@
         <param name="continuation">The action to invoke when the await operation completes.</param>
         <summary>Schedules the continuation action for the task associated with this awaiter.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is intended for compiler use; do not use it directly in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The <paramref name="continuation" /> argument is <see langword="null" />.</exception>
@@ -327,11 +327,11 @@
         <param name="continuation">The action to invoke when the await operation completes.</param>
         <summary>Schedules the continuation action for the task associated with this awaiter.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This method is intended for compiler use; do not use it directly in your code.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This method is intended for compiler use; do not use it directly in your code.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">The <paramref name="continuation" /> argument is <see langword="null" />.</exception>
diff --git a/xml/System.Runtime.CompilerServices/TaskAwaiter.xml b/xml/System.Runtime.CompilerServices/TaskAwaiter.xml
index 526c9598f6a..876326b4c42 100644
--- a/xml/System.Runtime.CompilerServices/TaskAwaiter.xml
+++ b/xml/System.Runtime.CompilerServices/TaskAwaiter.xml
@@ -122,7 +122,7 @@ This type is intended for compiler use only.
         <summary>Ends the wait for the completion of the asynchronous task.</summary>
         <remarks>To be added.</remarks>
         <exception cref="T:System.NullReferenceException">The <see cref="T:System.Runtime.CompilerServices.TaskAwaiter" /> object was not properly initialized.</exception>
-        <exception cref="T:System.Threading.Tasks.TaskCanceledException">The task was canceled.</exception>
+        <exception cref="T:System.OperationCanceledException">The task was canceled.</exception>
         <exception cref="T:System.Exception">The task completed in a <see cref="F:System.Threading.Tasks.TaskStatus.Faulted" /> state.</exception>
       </Docs>
     </Member>
@@ -173,11 +173,11 @@ This type is intended for compiler use only.
         <value>
           <see langword="true" /> if the task has completed; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This type and its members are intended for use by the compiler.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This type and its members are intended for use by the compiler.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.NullReferenceException">The <see cref="T:System.Runtime.CompilerServices.TaskAwaiter" /> object was not properly initialized.</exception>
@@ -240,11 +240,11 @@ This type is intended for compiler use only.
         <param name="continuation">The action to perform when the wait operation completes.</param>
         <summary>Sets the action to perform when the <see cref="T:System.Runtime.CompilerServices.TaskAwaiter" /> object stops waiting for the asynchronous task to complete.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This type and its members are intended for use by the compiler.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This type and its members are intended for use by the compiler.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">
diff --git a/xml/System.Runtime.CompilerServices/TaskAwaiter`1.xml b/xml/System.Runtime.CompilerServices/TaskAwaiter`1.xml
index cfbcb6a8ee4..a79a9908eb5 100644
--- a/xml/System.Runtime.CompilerServices/TaskAwaiter`1.xml
+++ b/xml/System.Runtime.CompilerServices/TaskAwaiter`1.xml
@@ -138,7 +138,7 @@ This type is intended for compiler use only.
         <returns>The result of the completed task.</returns>
         <remarks>To be added.</remarks>
         <exception cref="T:System.NullReferenceException">The <see cref="T:System.Runtime.CompilerServices.TaskAwaiter`1" /> object was not properly initialized.</exception>
-        <exception cref="T:System.Threading.Tasks.TaskCanceledException">The task was canceled.</exception>
+        <exception cref="T:System.OperationCanceledException">The task was canceled.</exception>
         <exception cref="T:System.Exception">The task completed in a <see cref="F:System.Threading.Tasks.TaskStatus.Faulted" /> state.</exception>
       </Docs>
     </Member>
@@ -189,11 +189,11 @@ This type is intended for compiler use only.
         <value>
           <see langword="true" /> if the task has completed; otherwise, <see langword="false" />.</value>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This type and its members are intended for use by the compiler.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This type and its members are intended for use by the compiler.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.NullReferenceException">The <see cref="T:System.Runtime.CompilerServices.TaskAwaiter`1" /> object was not properly initialized.</exception>
@@ -256,11 +256,11 @@ This type is intended for compiler use only.
         <param name="continuation">The action to perform when the wait operation completes.</param>
         <summary>Sets the action to perform when the <see cref="T:System.Runtime.CompilerServices.TaskAwaiter`1" /> object stops waiting for the asynchronous task to complete.</summary>
         <remarks>
-          <format type="text/markdown"><![CDATA[  
-  
-## Remarks  
- This type and its members are intended for use by the compiler.  
-  
+          <format type="text/markdown"><![CDATA[
+
+## Remarks
+ This type and its members are intended for use by the compiler.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentNullException">