diff --git a/snippets/csharp/System.Net.Http/SocketsHttpHandler/ConnectCallback/program.cs b/snippets/csharp/System.Net.Http/SocketsHttpHandler/ConnectCallback/program.cs
index feec305fbb7..3ee31d37fe3 100644
--- a/snippets/csharp/System.Net.Http/SocketsHttpHandler/ConnectCallback/program.cs
+++ b/snippets/csharp/System.Net.Http/SocketsHttpHandler/ConnectCallback/program.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System;
 using System.Net;
 using System.Net.Http;
 using System.Net.Sockets;
@@ -14,6 +13,8 @@ static async Task Main()
 
         handler.ConnectCallback = async (ctx, ct) =>
         {
+            DnsEndPoint dnsEndPoint = ctx.DnsEndPoint;
+            IPAddress[] addresses = await Dns.GetHostAddressesAsync(dnsEndPoint.Host, dnsEndPoint.AddressFamily, ct);
             var s = new Socket(SocketType.Stream, ProtocolType.Tcp) { NoDelay = true };
             try
             {
@@ -21,7 +22,8 @@ static async Task Main()
                 s.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 5);
                 s.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 5);
                 s.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveRetryCount, 5);
-                await s.ConnectAsync(ctx.DnsEndPoint, ct);
+
+                await s.ConnectAsync(addresses, dnsEndPoint.Port, ct);
                 return new NetworkStream(s, ownsSocket: true);
             }
             catch
diff --git a/xml/System.IO.Pipes/NamedPipeServerStream.xml b/xml/System.IO.Pipes/NamedPipeServerStream.xml
index 3f2c7bc806b..733055dc0ad 100644
--- a/xml/System.IO.Pipes/NamedPipeServerStream.xml
+++ b/xml/System.IO.Pipes/NamedPipeServerStream.xml
@@ -1377,7 +1377,7 @@ This example is for the server process, which uses the <xref:System.IO.Pipes.Nam
 ## Remarks
  The connecting client's permissions are applied to the remote server. For example, if the connecting client tries to request the contents of a file on the server, the client can request only files that it has sufficient permissions to open.
 
-
+ On Windows, only the thread used for executing the delegate is updated to impersonate the client. On other platforms, all threads from the parent process impersonate the client when `RunAsClient` is called. This behavior affects multi-threaded servers such as the example shown.
 
 ## Examples
  The following example demonstrates a method to create a pipe server that can respond to multiple simultaneous client requests, and a method for client impersonation. This example creates a <xref:System.IO.Pipes.NamedPipeServerStream> object in a parent process, which then creates multiple threads that wait for <xref:System.IO.Pipes.NamedPipeClientStream> objects to connect. After a client is connected, it supplies a file name to the server and the contents of that file are read and sent back to the client. Because the <xref:System.IO.Pipes.NamedPipeServerStream> impersonates the client when opening the file, the client can request only files that it has sufficient permissions to open.
diff --git a/xml/System/Uri.xml b/xml/System/Uri.xml
index fc06c487ac8..a7931c9bafd 100644
--- a/xml/System/Uri.xml
+++ b/xml/System/Uri.xml
@@ -1971,9 +1971,7 @@ If you used an escaped string to construct this instance (for example, `"http://
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="stringToEscape" /> is <see langword="null" />.</exception>
-        <exception cref="T:System.UriFormatException">Note: In the <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Windows Store apps</see> or the <see href="https://learn.microsoft.com/dotnet/standard/cross-platform/cross-platform-development-with-the-portable-class-library">Portable Class Library</see>, catch the base class exception, <see cref="T:System.FormatException" />, instead.
-
- The length of <paramref name="stringToEscape" /> exceeds 32766 characters.</exception>
+        <exception cref="T:System.UriFormatException">.NET Framework only: The length of <paramref name="stringToEscape" /> exceeds 32766 characters.</exception>
       </Docs>
     </Member>
     <Member MemberName="EscapeString">
@@ -2129,9 +2127,7 @@ If you used an escaped string to construct this instance (for example, `"http://
         </remarks>
         <exception cref="T:System.ArgumentNullException">
           <paramref name="stringToEscape" /> is <see langword="null" />.</exception>
-        <exception cref="T:System.UriFormatException">The length of <paramref name="stringToEscape" /> exceeds 32766 characters.
-
-        Note: In <see href="https://learn.microsoft.com/previous-versions/br230232(v=vs.110)">.NET for Windows Store apps</see> or the <see href="https://learn.microsoft.com/dotnet/standard/cross-platform/cross-platform-development-with-the-portable-class-library">Portable Class Library</see>, catch the base class exception, <see cref="T:System.FormatException" />, instead.</exception>
+        <exception cref="T:System.UriFormatException">.NET Framework only: The length of <paramref name="stringToEscape" /> exceeds 32766 characters.</exception>
       </Docs>
     </Member>
     <Member MemberName="Fragment">