diff --git a/Documentation/manpages/sdk/dotnet-new.1 b/Documentation/manpages/sdk/dotnet-new.1
index 29b8af05f..f1242f3c1 100644
--- a/Documentation/manpages/sdk/dotnet-new.1
+++ b/Documentation/manpages/sdk/dotnet-new.1
@@ -301,6 +301,13 @@ For example if the directory already contains a project, it doesn't list all pro
 The language of the template to create.
 The language accepted varies by the template (see defaults in the arguments section).
 Not valid for some templates.
+.IP
+.nf
+\f[C]
+>\ [!NOTE]
+>\ Some\ shells\ interpret\ `#`\ as\ a\ special\ character.\ In\ those\ cases,\ you\ need\ to\ enclose\ the\ language\ parameter\ value,\ such\ as\ `dotnet\ new\ console\ \-lang\ "F#"`.
+\f[]
+.fi
 .PP
 \f[C]\-n|\-\-name\ <OUTPUT_NAME>\f[]
 .PP
@@ -350,6 +357,13 @@ For example if the directory already contains a project, it doesn't list all pro
 The language of the template to create.
 The language accepted varies by the template (see defaults in the arguments section).
 Not valid for some templates.
+.IP
+.nf
+\f[C]
+>\ [!NOTE]
+>\ Some\ shells\ interpret\ `#`\ as\ a\ special\ character.\ In\ those\ cases,\ you\ need\ to\ enclose\ the\ language\ parameter\ value,\ such\ as\ `dotnet\ new\ console\ \-lang\ "F#"`.
+\f[]
+.fi
 .PP
 \f[C]\-n|\-\-name\ <OUTPUT_NAME>\f[]
 .PP
@@ -548,7 +562,7 @@ The default value is \f[C]false\f[].
 .PP
 Create an F# console application project in the current directory:
 .PP
-\f[C]dotnet\ new\ console\ \-lang\ f#\f[]
+\f[C]dotnet\ new\ console\ \-lang\ F#\f[]
 .PP
 Create a .NET Standard class library project in the specified directory (available only with .NET Core 2.0 SDK or later versions):
 .PP
diff --git a/Documentation/manpages/tool/README.md b/Documentation/manpages/tool/README.md
index 8806be693..2ee216742 100644
--- a/Documentation/manpages/tool/README.md
+++ b/Documentation/manpages/tool/README.md
@@ -20,23 +20,16 @@ Utility to update dotnet-cli documentation from https://github.com/dotnet/docs.
 ## Ubuntu example (from scratch)
 
 ```sh
-sudo apt install -y pandoc python python-pip wget unzip < /dev/null
-sudo pip install pandocfilters
+apt update
+apt install -y jq curl python python-pip wget unzip git < /dev/null
+pip install pandocfilters
+
+pandocVersion=$(curl -s https://api.github.com/repos/jgm/pandoc/releases/latest | jq -r ".tag_name")
+pandocVersionedName="pandoc-$pandocVersion-1-amd64.deb"
+curl -sLO https://github.com/jgm/pandoc/releases/download/$pandocVersion/$pandocVersionedName > /dev/null
+dpkg -i $pandocVersionedName
+rm $pandocVersionedName*
 
 git clone https://github.com/dotnet/cli
-./cli/Documentation/manpage/tool/update-man-pages.sh
+./cli/Documentation/manpages/tool/update-man-pages.sh
 ```
-
-The version of pandoc is printed in first line as code comment in `.1` (manpage) files.
-If your version of pandoc is older than (or even equal to) the last modifed version,
-please install the latest stable version of pandoc from https://github.com/jgm/pandoc/releases (deb file for Ubuntu):
-
-```sh
-wget -q https://github.com/jgm/pandoc/releases/download/$pandocVersion/$pandocVersionedName.deb > /dev/null
-# or
-# curl -sSLO https://github.com/jgm/pandoc/releases/download/$pandocVersion/$pandocVersionedName.deb > /dev/null
-sudo dpkg -i $pandocVersionedName.deb
-rm $pandocVersionedName.deb*
-```
-
-after that update manpages by calling `update-man-pages.sh` script.
diff --git a/Documentation/manpages/tool/update-man-pages.sh b/Documentation/manpages/tool/update-man-pages.sh
index d52051377..9e177de92 100755
--- a/Documentation/manpages/tool/update-man-pages.sh
+++ b/Documentation/manpages/tool/update-man-pages.sh
@@ -19,7 +19,10 @@ else
   exit 1
 fi
 
+echo "Extracting master.zip"
 unzip -o master.zip > /dev/null
+
+echo "Removing master.zip"
 rm master.zip*
 
 ls docs-master/docs/core/tools/dotnet*.md | while read -r line;
diff --git a/build/Signing.proj b/build/Signing.proj
index cb7b9fe78..4cd7f997a 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -5,6 +5,9 @@
     <!-- The signing infrastructure runs using MSBuild 14, which doesn't support some of the new syntax we're using.  So set the BuildingSingingProject
          property here to avoid importing files we don't need for signing which would cause errors if imported when using MSBuild 14. -->
     <BuildingSigningProject>true</BuildingSigningProject>
+    <ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">135020001</ExternalCertificateId>
+    <InternalCertificateId Condition="'$(InternalCertificateId)' == ''">Microsoft402</InternalCertificateId>
+    <NugetCertificateId Condition="'$(NugetCertificateId)' == ''">NuGet</NugetCertificateId>
   </PropertyGroup>
   
   <Import Project="..\dir.props" />
@@ -106,6 +109,10 @@
       <FilesToSign Include="$(PackagesDirectory)/**/*.cab">
         <Authenticode>$(InternalCertificateId)</Authenticode>
       </FilesToSign>
+      <FilesToSign Include="$(PackagesDirectory)/**/*.nupkg"
+                   Exclude="$(PackagesDirectory)/**/*symbols.nupkg">
+        <Authenticode>$(NugetCertificateId)</Authenticode>
+      </FilesToSign>
     </ItemGroup>
   </Target>
 
diff --git a/src/dotnet/BuiltInCommandsCatalog.cs b/src/dotnet/BuiltInCommandsCatalog.cs
index 8a6f81824..e8faed4d9 100644
--- a/src/dotnet/BuiltInCommandsCatalog.cs
+++ b/src/dotnet/BuiltInCommandsCatalog.cs
@@ -151,7 +151,7 @@ namespace Microsoft.DotNet.Cli
                 Command = ToolCommand.Run,
                 DocLink = "https://aka.ms/dotnet-tool"
             },
-            ["buildserver"] = new BuiltInCommandMetadata
+            ["build-server"] = new BuiltInCommandMetadata
             {
                 Command = BuildServerCommand.Run,
                 DocLink = "https://aka.ms/dotnet-build-server"
diff --git a/src/dotnet/commands/dotnet-buildserver/BuildServerCommand.cs b/src/dotnet/commands/dotnet-buildserver/BuildServerCommand.cs
index e45302274..801a3edff 100644
--- a/src/dotnet/commands/dotnet-buildserver/BuildServerCommand.cs
+++ b/src/dotnet/commands/dotnet-buildserver/BuildServerCommand.cs
@@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.BuildServer
 {
     public class BuildServerCommand : DotNetTopLevelCommandBase
     {
-        protected override string CommandName => "buildserver";
+        protected override string CommandName => "build-server";
         protected override string FullCommandNameLocalized => LocalizableStrings.BuildServerCommandName;
         protected override string ArgumentName => "";
         protected override string ArgumentDescriptionLocalized => "";
diff --git a/src/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs b/src/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs
index a7693c2d7..b298d391d 100644
--- a/src/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs
+++ b/src/dotnet/commands/dotnet-buildserver/BuildServerCommandParser.cs
@@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Cli
         public static Command CreateCommand()
         {
             return Create.Command(
-                "buildserver",
+                "build-server",
                 LocalizableStrings.CommandDescription,
                 Accept.NoArguments(),
                 CommonOptions.HelpOption(),
diff --git a/src/dotnet/commands/dotnet-help/HelpUsageText.cs b/src/dotnet/commands/dotnet-help/HelpUsageText.cs
index afb84106f..0579e9d80 100644
--- a/src/dotnet/commands/dotnet-help/HelpUsageText.cs
+++ b/src/dotnet/commands/dotnet-help/HelpUsageText.cs
@@ -29,7 +29,7 @@ path-to-application:
   vstest           {LocalizableStrings.VsTestDefinition}
   store            {LocalizableStrings.StoreDefinition}
   tool             {LocalizableStrings.ToolDefinition}
-  buildserver      {LocalizableStrings.BuildServerDefinition}
+  build-server     {LocalizableStrings.BuildServerDefinition}
   help             {LocalizableStrings.HelpDefinition}
 
 {LocalizableStrings.CommonOptions}:
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index e3f051a92..da0774145 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -19,6 +19,7 @@
     <PackageReference Include="NuGet.Build.Tasks" Version="$(NuGetBuildTasksPackageVersion)" />
     <PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
     <PackageReference Include="Microsoft.TestPlatform.Build" Version="$(MicrosoftTestPlatformBuildPackageVersion)" />
+    <PackageReference Include="NuGet.Localization" Version="$(NuGetProjectModelPackageVersion)" />
     <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
     <PackageReference Include="Microsoft.NETCore.Compilers" Version="$(MicrosoftNETCoreCompilersPackageVersion)">
       <ExcludeAssets>All</ExcludeAssets>
diff --git a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
index 38089f254..09461ed59 100644
--- a/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
+++ b/test/dotnet-help.Tests/GivenThatIWantToShowHelpForDotnetCommand.cs
@@ -40,7 +40,7 @@ SDK commands:
   vstest           Runs Microsoft Test Execution Command Line Tool.
   store            Stores the specified assemblies in the runtime store.
   tool             Install or work with tools that extend the .NET experience.
-  buildserver      Interact with servers started by a build.
+  build-server     Interact with servers started by a build.
   help             Show help.
 
 Common options:
diff --git a/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs b/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs
index 795fe57d9..f41bc9400 100644
--- a/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs
+++ b/test/dotnet.Tests/CommandTests/BuildServerShutdownCommandTests.cs
@@ -172,9 +172,9 @@ namespace Microsoft.DotNet.Tests.Commands
 
         private BuildServerShutdownCommand CreateCommand(string options = "", IEnumerable<IBuildServerManager> managers = null)
         {
-            ParseResult result = Parser.Instance.Parse("dotnet buildserver shutdown " + options);
+            ParseResult result = Parser.Instance.Parse("dotnet build-server shutdown " + options);
             return new BuildServerShutdownCommand(
-                options: result["dotnet"]["buildserver"]["shutdown"],
+                options: result["dotnet"]["build-server"]["shutdown"],
                 result: result,
                 managers: managers,
                 useOrderedWait: true,
diff --git a/test/dotnet.Tests/ParserTests/BuildServerShutdownParserTests.cs b/test/dotnet.Tests/ParserTests/BuildServerShutdownParserTests.cs
index fb6e66bc1..d17f6002e 100644
--- a/test/dotnet.Tests/ParserTests/BuildServerShutdownParserTests.cs
+++ b/test/dotnet.Tests/ParserTests/BuildServerShutdownParserTests.cs
@@ -23,9 +23,9 @@ namespace Microsoft.DotNet.Tests.ParserTests
         [Fact]
         public void GivenNoOptionsAllFlagsAreFalse()
         {
-            var result = Parser.Instance.Parse("dotnet buildserver shutdown");
+            var result = Parser.Instance.Parse("dotnet build-server shutdown");
 
-            var options = result["dotnet"]["buildserver"]["shutdown"];
+            var options = result["dotnet"]["build-server"]["shutdown"];
             options.ValueOrDefault<bool>("msbuild").Should().Be(false);
             options.ValueOrDefault<bool>("vbcscompiler").Should().Be(false);
             options.ValueOrDefault<bool>("razor").Should().Be(false);
@@ -34,9 +34,9 @@ namespace Microsoft.DotNet.Tests.ParserTests
         [Fact]
         public void GivenMSBuildOptionIsItTrue()
         {
-            var result = Parser.Instance.Parse("dotnet buildserver shutdown --msbuild");
+            var result = Parser.Instance.Parse("dotnet build-server shutdown --msbuild");
 
-            var options = result["dotnet"]["buildserver"]["shutdown"];
+            var options = result["dotnet"]["build-server"]["shutdown"];
             options.ValueOrDefault<bool>("msbuild").Should().Be(true);
             options.ValueOrDefault<bool>("vbcscompiler").Should().Be(false);
             options.ValueOrDefault<bool>("razor").Should().Be(false);
@@ -45,9 +45,9 @@ namespace Microsoft.DotNet.Tests.ParserTests
         [Fact]
         public void GivenVBCSCompilerOptionIsItTrue()
         {
-            var result = Parser.Instance.Parse("dotnet buildserver shutdown --vbcscompiler");
+            var result = Parser.Instance.Parse("dotnet build-server shutdown --vbcscompiler");
 
-            var options = result["dotnet"]["buildserver"]["shutdown"];
+            var options = result["dotnet"]["build-server"]["shutdown"];
             options.ValueOrDefault<bool>("msbuild").Should().Be(false);
             options.ValueOrDefault<bool>("vbcscompiler").Should().Be(true);
             options.ValueOrDefault<bool>("razor").Should().Be(false);
@@ -56,9 +56,9 @@ namespace Microsoft.DotNet.Tests.ParserTests
         [Fact]
         public void GivenRazorOptionIsItTrue()
         {
-            var result = Parser.Instance.Parse("dotnet buildserver shutdown --razor");
+            var result = Parser.Instance.Parse("dotnet build-server shutdown --razor");
 
-            var options = result["dotnet"]["buildserver"]["shutdown"];
+            var options = result["dotnet"]["build-server"]["shutdown"];
             options.ValueOrDefault<bool>("msbuild").Should().Be(false);
             options.ValueOrDefault<bool>("vbcscompiler").Should().Be(false);
             options.ValueOrDefault<bool>("razor").Should().Be(true);
@@ -67,9 +67,9 @@ namespace Microsoft.DotNet.Tests.ParserTests
         [Fact]
         public void GivenMultipleOptionsThoseAreTrue()
         {
-            var result = Parser.Instance.Parse("dotnet buildserver shutdown --razor --msbuild");
+            var result = Parser.Instance.Parse("dotnet build-server shutdown --razor --msbuild");
 
-            var options = result["dotnet"]["buildserver"]["shutdown"];
+            var options = result["dotnet"]["build-server"]["shutdown"];
             options.ValueOrDefault<bool>("msbuild").Should().Be(true);
             options.ValueOrDefault<bool>("vbcscompiler").Should().Be(false);
             options.ValueOrDefault<bool>("razor").Should().Be(true);