diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c6fbf341cf3e..1ad48b39636d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -260,7 +260,7 @@ input-file:
 require: https://github.com/Azure/azure-rest-api-specs/blob/49fc16354df7211f8392c56884a3437138317d1f/specification/azsadmin/resource-manager/storage/readme.md
 ```
 
-3. Run `dotnet msbuild /t:GenerateCode` in src directory of the project (e.g. `net\sdk\storage\Azure.Management.Storage\src`). This would run Autorest and generate the code. (NOTE: this step requires Node 13).
+3. Run `dotnet msbuild /t:GenerateCode` in src directory of the project (e.g. `net\sdk\storage\Azure.Management.Storage\src`). This would run AutoRest and generate the code. (NOTE: this step requires Node 13).
 4. For management plan libraries add `azure-arm: true` setting to `autorest.md` client constructors and options would be auto-generated. For data-plane libraries follow the next two steps.
 4. Add a `*ClientOptions` type that inherits from `ClientOptions` and has a service version enum:
 
diff --git a/eng/CodeGeneration.targets b/eng/CodeGeneration.targets
index fecba93175db..55c9695c0210 100644
--- a/eng/CodeGeneration.targets
+++ b/eng/CodeGeneration.targets
@@ -1,27 +1,27 @@
 <Project>
 
   <PropertyGroup>
-    <_AutoRestVersion>https://github.com/Azure/autorest/releases/download/autorest-3.0.6221/autorest-3.0.6221.tgz</_AutoRestVersion>
-    <_AutoRestCoreVersion>3.0.6280</_AutoRestCoreVersion>
-    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200415.7/autorest-csharp-v3-3.0.0-dev.20200415.7.tgz</_AutoRestCSharpVersion>
+    <_AutoRestVersion>https://github.com/Azure/autorest/releases/download/autorest-3.0.6222/autorest-3.0.6222.tgz</_AutoRestVersion>
+    <_AutoRestCoreVersion>3.0.6282</_AutoRestCoreVersion>
+    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200427.3/autorest-csharp-v3-3.0.0-dev.20200427.3.tgz</_AutoRestCSharpVersion>
     <_SupportsCodeGeneration Condition="'$(IsClientLibrary)' == 'true'">true</_SupportsCodeGeneration>
     <_DefaultInputName Condition="Exists('$(MSBuildProjectDirectory)/autorest.md')">$(MSBuildProjectDirectory)/autorest.md</_DefaultInputName>
-    <AutorestInput Condition="'$(AutorestInput)' == ''">$(_DefaultInputName)</AutorestInput>
+    <AutoRestInput Condition="'$(AutoRestInput)' == ''">$(_DefaultInputName)</AutoRestInput>
     <!--
       Allows passing additional AutoRest command line arguments, for example to run in interactive mode 
-      use the following command line (remove the space between minus minus): dotnet msbuild /t:GenerateCode /p:AutorestAdditionalParameters="- -interactive"
+      use the following command line (remove the space between minus minus): dotnet msbuild /t:GenerateCode /p:AutoRestAdditionalParameters="- -interactive"
     -->
-    <AutorestAdditionalParameters></AutorestAdditionalParameters>
+    <AutoRestAdditionalParameters></AutoRestAdditionalParameters>
     <_SharedCodeDirectory>$(MSBuildThisFileDirectory)../sdk/core/Azure.Core/src/Shared/</_SharedCodeDirectory>
-    <_AutoRestSharedCodeDirectory>$(_SharedCodeDirectory)Autorest/</_AutoRestSharedCodeDirectory>
+    <_AutoRestSharedCodeDirectory>$(_SharedCodeDirectory)AutoRest/</_AutoRestSharedCodeDirectory>
 
-    <_GenerateCode Condition="'$(_SupportsCodeGeneration)' == 'true' AND '$(AutorestInput)' != ''">true</_GenerateCode>
+    <_GenerateCode Condition="'$(_SupportsCodeGeneration)' == 'true' AND '$(AutoRestInput)' != ''">true</_GenerateCode>
     <UsesJsonSerialization Condition="'$(UsesJsonSerialization)' == ''">true</UsesJsonSerialization>
   </PropertyGroup>
 
   <Target Name="GenerateCode" Condition="'$(_GenerateCode)' == 'true'" >
     <RemoveDir Directories="$(MSBuildProjectDirectory)/Generated"/>
-    <Exec Command="npx autorest@$(_AutoRestVersion) --version=$(_AutoRestCoreVersion) $(AutorestInput) $(AutorestAdditionalParameters) --use=$(_AutoRestCSharpVersion) --output-folder=$(MSBuildProjectDirectory) --title=$(RootNamespace) --namespace=$(RootNamespace) --shared-source-folder=$(_SharedCodeDirectory) --verbose" />
+    <Exec Command="npx autorest@$(_AutoRestVersion) --version=$(_AutoRestCoreVersion) $(AutoRestInput) $(AutoRestAdditionalParameters) --use=$(_AutoRestCSharpVersion) --output-folder=$(MSBuildProjectDirectory) --title=$(RootNamespace) --namespace=$(RootNamespace) --shared-source-folder=$(_SharedCodeDirectory) --verbose" />
   </Target>
 
   <ItemGroup Condition="'$(_GenerateCode)' == 'true'">
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/ArmOperationHelpers.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/ArmOperationHelpers.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/ArmOperationHelpers.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/ArmOperationHelpers.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/CodeGenClientAttribute.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/CodeGenClientAttribute.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/CodeGenClientAttribute.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/CodeGenClientAttribute.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/CodeGenMemberAttribute.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/CodeGenMemberAttribute.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/CodeGenMemberAttribute.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/CodeGenMemberAttribute.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/CodeGenModelAttribute.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/CodeGenModelAttribute.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/CodeGenModelAttribute.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/CodeGenModelAttribute.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/CodeGenSuppressAttribute.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/CodeGenSuppressAttribute.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/CodeGenSuppressAttribute.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/CodeGenSuppressAttribute.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/IUtf8JsonSerializable.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/IUtf8JsonSerializable.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/IUtf8JsonSerializable.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/IUtf8JsonSerializable.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/IXmlSerializable.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/IXmlSerializable.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/IXmlSerializable.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/IXmlSerializable.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/JsonElementExtensions.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/JsonElementExtensions.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/JsonElementExtensions.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/JsonElementExtensions.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/ManagementPipelineBuilder.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/ManagementPipelineBuilder.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/ManagementPipelineBuilder.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/ManagementPipelineBuilder.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/OperationFinalStateVia.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/OperationFinalStateVia.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/OperationFinalStateVia.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/OperationFinalStateVia.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/Page.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/Page.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/Page.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/Page.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/PageableHelpers.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/PageableHelpers.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/PageableHelpers.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/PageableHelpers.cs
diff --git a/sdk/core/Azure.Core/src/Shared/AutoRest/RawRequestUriBuilder.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/RawRequestUriBuilder.cs
new file mode 100644
index 000000000000..14dd07e14773
--- /dev/null
+++ b/sdk/core/Azure.Core/src/Shared/AutoRest/RawRequestUriBuilder.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System;
+using System.Globalization;
+
+namespace Azure.Core
+{
+    internal class RawRequestUriBuilder: RequestUriBuilder
+    {
+        private const string SchemeSeparator = "://";
+        private const char HostSeparator = '/';
+        private const char PortSeparator = ':';
+        private static readonly char[] HostOrPort = { HostSeparator, PortSeparator };
+        private const char QueryBeginSeparator = '?';
+        private const char QueryContinueSeparator = '&';
+        private const char QueryValueSeparator = '=';
+
+        private RawWritingPosition _position = RawWritingPosition.Scheme;
+
+        private static (string Name, string Value) GetQueryParts(string queryUnparsed)
+        {
+            int separatorIndex = queryUnparsed.IndexOf(QueryValueSeparator);
+            if (separatorIndex == -1)
+            {
+                return (queryUnparsed, string.Empty);
+            }
+            return (queryUnparsed.Substring(0, separatorIndex), queryUnparsed.Substring(separatorIndex + 1));
+        }
+
+        public void AppendRaw(string value, bool escape)
+        {
+            while (!string.IsNullOrWhiteSpace(value))
+            {
+                if (_position == RawWritingPosition.Scheme)
+                {
+                    int separator = value.IndexOf(SchemeSeparator, StringComparison.InvariantCultureIgnoreCase);
+                    if (separator == -1)
+                    {
+                        Scheme += value;
+                        value = string.Empty;
+                    }
+                    else
+                    {
+                        Scheme += value.Substring(0, separator);
+                        // TODO: Find a better way to map schemes to default ports
+                        Port = string.Equals(Scheme, "https", StringComparison.OrdinalIgnoreCase) ? 443 : 80;
+                        value = value.Substring(separator + SchemeSeparator.Length);
+                        _position = RawWritingPosition.Host;
+                    }
+                }
+                else if (_position == RawWritingPosition.Host)
+                {
+                    int separator = value.IndexOfAny(HostOrPort);
+                    if (separator == -1)
+                    {
+                        if (string.IsNullOrEmpty(Path))
+                        {
+                            Host += value;
+                            value = string.Empty;
+                        }
+                        else
+                        {
+                            // All Host information must be written before Path information
+                            // If Path already has information, we transition to writing Path
+                            _position = RawWritingPosition.Path;
+                        }
+                    }
+                    else
+                    {
+                        Host += value.Substring(0, separator);
+                        _position = value[separator] == HostSeparator ? RawWritingPosition.Path : RawWritingPosition.Port;
+                        value = value.Substring(separator + 1);
+                    }
+                }
+                else if (_position == RawWritingPosition.Port)
+                {
+                    int separator = value.IndexOf(HostSeparator);
+                    if (separator == -1)
+                    {
+                        Port = int.Parse(value, CultureInfo.InvariantCulture);
+                        value = string.Empty;
+                    }
+                    else
+                    {
+                        Port = int.Parse(value.Substring(0, separator), CultureInfo.InvariantCulture);
+                        value = value.Substring(separator + 1);
+                    }
+                    // Port cannot be split (like Host), so always transition to Path when Port is parsed
+                    _position = RawWritingPosition.Path;
+                }
+                else if (_position == RawWritingPosition.Path)
+                {
+                    int separator = value.IndexOf(QueryBeginSeparator);
+                    if (separator == -1)
+                    {
+                        AppendPath(value, escape);
+                        value = string.Empty;
+                    }
+                    else
+                    {
+                        AppendPath(value.Substring(0, separator), escape);
+                        value = value.Substring(separator + 1);
+                        _position = RawWritingPosition.Query;
+                    }
+                }
+                else if (_position == RawWritingPosition.Query)
+                {
+                    int separator = value.IndexOf(QueryContinueSeparator);
+                    if (separator == 0)
+                    {
+                        value = value.Substring(1);
+                    }
+                    else if (separator == -1)
+                    {
+                        (string queryName, string queryValue) = GetQueryParts(value);
+                        AppendQuery(queryName, queryValue, escape);
+                        value = string.Empty;
+                    }
+                    else
+                    {
+                        (string queryName, string queryValue) = GetQueryParts(value.Substring(0, separator));
+                        AppendQuery(queryName, queryValue, escape);
+                        value = value.Substring(separator + 1);
+                    }
+                }
+            }
+        }
+
+        private enum RawWritingPosition
+        {
+            Scheme,
+            Host,
+            Port,
+            Path,
+            Query
+        }
+
+        public void AppendRawNextLink(string nextLink, bool escape)
+        {
+            // If it is an absolute link, we use the nextLink as the entire url
+            if (nextLink.StartsWith(Uri.UriSchemeHttp, StringComparison.InvariantCultureIgnoreCase))
+            {
+                Reset(new Uri(nextLink));
+                return;
+            }
+
+            AppendPath(nextLink, escape);
+        }
+    }
+}
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/RequestHeaderExtensions.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/RequestHeaderExtensions.cs
similarity index 88%
rename from sdk/core/Azure.Core/src/Shared/Autorest/RequestHeaderExtensions.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/RequestHeaderExtensions.cs
index 085d05082ea3..5417f05ecc62 100644
--- a/sdk/core/Azure.Core/src/Shared/Autorest/RequestHeaderExtensions.cs
+++ b/sdk/core/Azure.Core/src/Shared/AutoRest/RequestHeaderExtensions.cs
@@ -4,6 +4,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 
 namespace Azure.Core
@@ -49,5 +50,10 @@ public static void Add(this RequestHeaders headers, string name, byte[] value)
         {
             headers.Add(name, Convert.ToBase64String(value));
         }
+
+        public static void AddDelimited<T>(this RequestHeaders headers, string name, IEnumerable<T> value, string delimiter)
+        {
+            headers.Add(name, string.Join(delimiter, value));
+        }
     }
 }
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/RequestUriBuilderExtensions.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/RequestUriBuilderExtensions.cs
similarity index 95%
rename from sdk/core/Azure.Core/src/Shared/Autorest/RequestUriBuilderExtensions.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/RequestUriBuilderExtensions.cs
index 46a3e29d7093..5b43df070308 100644
--- a/sdk/core/Azure.Core/src/Shared/Autorest/RequestUriBuilderExtensions.cs
+++ b/sdk/core/Azure.Core/src/Shared/AutoRest/RequestUriBuilderExtensions.cs
@@ -97,6 +97,11 @@ public static void AppendQuery(this RequestUriBuilder builder, string name, byte
             builder.AppendQuery(name, Convert.ToBase64String(value), escape);
         }
 
+        public static void AppendQuery(this RequestUriBuilder builder, string name, Guid value, bool escape = true)
+        {
+            builder.AppendQuery(name, value.ToString(), escape);
+        }
+
         public static void AppendQueryDelimited<T>(this RequestUriBuilder builder, string name, IEnumerable<T> value, string delimiter, bool escape = true)
         {
             builder.AppendQuery(name, string.Join(delimiter, value), escape);
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/ResponseHeadersExtensions.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseHeadersExtensions.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/ResponseHeadersExtensions.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/ResponseHeadersExtensions.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/ResponseWithHeaders.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/ResponseWithHeaders.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/ResponseWithHeaders{T,THeaders}.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{T,THeaders}.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/ResponseWithHeaders{T,THeaders}.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{T,THeaders}.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/ResponseWithHeaders{THeaders}.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{THeaders}.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/ResponseWithHeaders{THeaders}.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/ResponseWithHeaders{THeaders}.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/StringRequestContent.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/StringRequestContent.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/StringRequestContent.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/StringRequestContent.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/TypeFormatters.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/TypeFormatters.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/TypeFormatters.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/TypeFormatters.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/Utf8JsonRequestContent.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/Utf8JsonRequestContent.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/Utf8JsonRequestContent.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/Utf8JsonRequestContent.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/Utf8JsonWriterExtensions.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/Utf8JsonWriterExtensions.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/Utf8JsonWriterExtensions.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/Utf8JsonWriterExtensions.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/XElementExtensions.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/XElementExtensions.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/XElementExtensions.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/XElementExtensions.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/XmlWriterContent.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/XmlWriterContent.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/XmlWriterContent.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/XmlWriterContent.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/XmlWriterExtensions.cs b/sdk/core/Azure.Core/src/Shared/AutoRest/XmlWriterExtensions.cs
similarity index 100%
rename from sdk/core/Azure.Core/src/Shared/Autorest/XmlWriterExtensions.cs
rename to sdk/core/Azure.Core/src/Shared/AutoRest/XmlWriterExtensions.cs
diff --git a/sdk/core/Azure.Core/src/Shared/Autorest/RawRequestUriBuilder.cs b/sdk/core/Azure.Core/src/Shared/Autorest/RawRequestUriBuilder.cs
deleted file mode 100644
index 0c800decc945..000000000000
--- a/sdk/core/Azure.Core/src/Shared/Autorest/RawRequestUriBuilder.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-#nullable enable
-
-using System;
-using System.Globalization;
-
-namespace Azure.Core
-{
-    internal class RawRequestUriBuilder: RequestUriBuilder
-    {
-        private const string SchemeSeparator = "://";
-        private const char HostSeparator = '/';
-        private const char PortSeparator = ':';
-        private static readonly char[] HostOrPort = new[] {HostSeparator, PortSeparator};
-
-        private RawWritingPosition _position = RawWritingPosition.Scheme;
-
-        public void AppendRaw(string value, bool escape)
-        {
-            while (!string.IsNullOrWhiteSpace(value))
-            {
-                if (_position == RawWritingPosition.Scheme)
-                {
-                    int separator = value.IndexOf(SchemeSeparator, StringComparison.InvariantCultureIgnoreCase);
-                    if (separator == -1)
-                    {
-                        Scheme += value;
-                        value = string.Empty;
-                    }
-                    else
-                    {
-                        Scheme += value.Substring(0, separator);
-
-                        // TODO: Find a better way to map schemes to default ports
-                        Port = string.Equals(Scheme, "https", StringComparison.OrdinalIgnoreCase) ? 443 : 80;
-
-                        value = value.Substring(separator + SchemeSeparator.Length);
-                        _position = RawWritingPosition.Host;
-                    }
-                }
-                else if (_position == RawWritingPosition.Host)
-                {
-                    int separator = value.IndexOfAny(HostOrPort);
-                    if (separator == -1)
-                    {
-                        Host += value;
-                        value = string.Empty;
-                    }
-                    else
-                    {
-                        Host += value.Substring(0, separator);
-
-                        _position = value[separator] == HostSeparator ? RawWritingPosition.Rest : RawWritingPosition.Port;
-
-                        value = value.Substring(separator + 1);
-                    }
-                }
-                else if (_position == RawWritingPosition.Port)
-                {
-                    int separator = value.IndexOf(HostSeparator);
-                    if (separator == -1)
-                    {
-                        Port = int.Parse(value, CultureInfo.InvariantCulture);
-                        value = string.Empty;
-                    }
-                    else
-                    {
-                        Port = int.Parse(value.Substring(0, separator), CultureInfo.InvariantCulture);
-                        value = value.Substring(separator + 1);
-                        _position = RawWritingPosition.Rest;
-                    }
-                }
-                else
-                {
-                    AppendPath(value, escape);
-                    value = string.Empty;
-                }
-            }
-        }
-
-        private enum RawWritingPosition
-        {
-            Scheme,
-            Host,
-            Port,
-            Rest
-        }
-    }
-}
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/Operations/ServiceClient.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/Operations/ServiceClient.cs
index aa42ab8781cf..af2c390156f1 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/Operations/ServiceClient.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/Operations/ServiceClient.cs
@@ -17,6 +17,7 @@
 
 namespace Azure.AI.FormRecognizer
 {
+    /// <summary> The Service service client. </summary>
     internal partial class ServiceClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/Operations/ServiceRestClient.cs b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/Operations/ServiceRestClient.cs
index aef302eae78a..eccd94f9ada0 100644
--- a/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/Operations/ServiceRestClient.cs
+++ b/sdk/formrecognizer/Azure.AI.FormRecognizer/src/Generated/Operations/ServiceRestClient.cs
@@ -1233,7 +1233,9 @@ internal HttpMessage CreateListCustomModelsNextPageRequest(string nextLink)
             var request = message.Request;
             request.Method = RequestMethod.Get;
             var uri = new RawRequestUriBuilder();
-            uri.AppendRaw(nextLink, false);
+            uri.AppendRaw(endpoint, false);
+            uri.AppendRaw("/formrecognizer/v2.0-preview", false);
+            uri.AppendRawNextLink(nextLink, false);
             request.Uri = uri;
             return message;
         }
diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Operations/DataSourcesClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/Operations/DataSourcesClient.cs
index 1e21f9350344..ac093e4e4536 100644
--- a/sdk/search/Azure.Search.Documents/src/Generated/Operations/DataSourcesClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Generated/Operations/DataSourcesClient.cs
@@ -14,6 +14,7 @@
 
 namespace Azure.Search.Documents
 {
+    /// <summary> The DataSources service client. </summary>
     internal partial class DataSourcesClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Operations/DocumentsClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/Operations/DocumentsClient.cs
index a24239866970..97a1df9e2db2 100644
--- a/sdk/search/Azure.Search.Documents/src/Generated/Operations/DocumentsClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Generated/Operations/DocumentsClient.cs
@@ -15,6 +15,7 @@
 
 namespace Azure.Search.Documents
 {
+    /// <summary> The Documents service client. </summary>
     internal partial class DocumentsClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Operations/IndexersClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/Operations/IndexersClient.cs
index 8672830714cf..3f32747df335 100644
--- a/sdk/search/Azure.Search.Documents/src/Generated/Operations/IndexersClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Generated/Operations/IndexersClient.cs
@@ -14,6 +14,7 @@
 
 namespace Azure.Search.Documents
 {
+    /// <summary> The Indexers service client. </summary>
     internal partial class IndexersClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Operations/IndexesClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/Operations/IndexesClient.cs
index 35108ffbf327..c597d99bdf88 100644
--- a/sdk/search/Azure.Search.Documents/src/Generated/Operations/IndexesClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Generated/Operations/IndexesClient.cs
@@ -14,6 +14,7 @@
 
 namespace Azure.Search.Documents
 {
+    /// <summary> The Indexes service client. </summary>
     internal partial class IndexesClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Operations/ServiceClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/Operations/ServiceClient.cs
index 28f612c587a7..d78e6f4cbdb1 100644
--- a/sdk/search/Azure.Search.Documents/src/Generated/Operations/ServiceClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Generated/Operations/ServiceClient.cs
@@ -14,6 +14,7 @@
 
 namespace Azure.Search.Documents
 {
+    /// <summary> The Service service client. </summary>
     internal partial class ServiceClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Operations/SkillsetsClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/Operations/SkillsetsClient.cs
index 5809103494d8..06f23e4d043d 100644
--- a/sdk/search/Azure.Search.Documents/src/Generated/Operations/SkillsetsClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Generated/Operations/SkillsetsClient.cs
@@ -14,6 +14,7 @@
 
 namespace Azure.Search.Documents
 {
+    /// <summary> The Skillsets service client. </summary>
     internal partial class SkillsetsClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Operations/SynonymMapsClient.cs b/sdk/search/Azure.Search.Documents/src/Generated/Operations/SynonymMapsClient.cs
index ca9a8c02dde6..817302f06dc4 100644
--- a/sdk/search/Azure.Search.Documents/src/Generated/Operations/SynonymMapsClient.cs
+++ b/sdk/search/Azure.Search.Documents/src/Generated/Operations/SynonymMapsClient.cs
@@ -14,6 +14,7 @@
 
 namespace Azure.Search.Documents
 {
+    /// <summary> The SynonymMaps service client. </summary>
     internal partial class SynonymMapsClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/storage/Azure.Storage.Common/swagger/Generator/readme.md b/sdk/storage/Azure.Storage.Common/swagger/Generator/readme.md
index cc05a8a7d76d..8d0f6c9aeba0 100644
--- a/sdk/storage/Azure.Storage.Common/swagger/Generator/readme.md
+++ b/sdk/storage/Azure.Storage.Common/swagger/Generator/readme.md
@@ -17,7 +17,7 @@ We support a number of extensions including using the vendor prefix `x-az-`:
 - `x-az-nullable-array`:  Allows list to be null. The default value is `false`.
 - `x-az-internal`: x-ms-external is only allowed on definitions so this does the same for parameters, etc.
 
-### Autorest plugin configuration
+### AutoRest plugin configuration
 The AutoRest example at https://github.com/Azure/autorest-extension-helloworld
 walks through the following section and the docs at
 http://azure.github.io/autorest/user/literate-file-formats/configuration.html
diff --git a/sdk/tables/Azure.Data.Tables/src/Generated/Operations/ServiceClient.cs b/sdk/tables/Azure.Data.Tables/src/Generated/Operations/ServiceClient.cs
index c33a599dae22..2569937d3772 100644
--- a/sdk/tables/Azure.Data.Tables/src/Generated/Operations/ServiceClient.cs
+++ b/sdk/tables/Azure.Data.Tables/src/Generated/Operations/ServiceClient.cs
@@ -13,6 +13,7 @@
 
 namespace Azure.Data.Tables
 {
+    /// <summary> The Service service client. </summary>
     internal partial class ServiceClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/tables/Azure.Data.Tables/src/Generated/Operations/TableInternalClient.cs b/sdk/tables/Azure.Data.Tables/src/Generated/Operations/TableInternalClient.cs
index 0c96d5f5853c..659fb60f70ea 100644
--- a/sdk/tables/Azure.Data.Tables/src/Generated/Operations/TableInternalClient.cs
+++ b/sdk/tables/Azure.Data.Tables/src/Generated/Operations/TableInternalClient.cs
@@ -14,6 +14,7 @@
 
 namespace Azure.Data.Tables
 {
+    /// <summary> The Table service client. </summary>
     internal partial class TableInternalClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/sdk/template/Azure.Template/src/Generated/Operations/MiniSecretClient.cs b/sdk/template/Azure.Template/src/Generated/Operations/MiniSecretClient.cs
index 716ab1e3f758..80cd32a08820 100644
--- a/sdk/template/Azure.Template/src/Generated/Operations/MiniSecretClient.cs
+++ b/sdk/template/Azure.Template/src/Generated/Operations/MiniSecretClient.cs
@@ -13,6 +13,7 @@
 
 namespace Azure.Template
 {
+    /// <summary> The Service service client. </summary>
     public partial class MiniSecretClient
     {
         private readonly ClientDiagnostics _clientDiagnostics;
diff --git a/tools/Repo-Tasks.psm1 b/tools/Repo-Tasks.psm1
index edc69d039264..8b165b37151a 100644
--- a/tools/Repo-Tasks.psm1
+++ b/tools/Repo-Tasks.psm1
@@ -350,7 +350,7 @@ Function Install-VSProjectTemplates
 .SYNOPSIS
 
 Install-VSProjectTemplates will install getting started project templates for
-1) Autorest-.NET SDKProject
+1) AutoRest-.NET SDKProject
 2) .NET SDK Test projectct
 
 After executing the cmdlet, restart VS (if already open), create new project