diff --git a/.github/workflows/dotnet-core-desktop.yml b/.github/workflows/dotnet-core-desktop.yml
index d23eec528..194ac738e 100644
--- a/.github/workflows/dotnet-core-desktop.yml
+++ b/.github/workflows/dotnet-core-desktop.yml
@@ -48,10 +48,13 @@ jobs:
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@2008f912f56e61277eefaac6d1888b750582aa16
+      env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
     - name: Build
       run: msbuild build.proj /p:PackageOutputDir="${{ env.GITHUB_WORKSPACE }}/nuget-output" /p:Configuration=${{ matrix.configuration }}
       env:
+        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
         Configuration: ${{ matrix.configuration }}
 
     - name: Upload build artifacts
diff --git a/build.proj b/build.proj
index f702ce175..afbf537d6 100644
--- a/build.proj
+++ b/build.proj
@@ -11,7 +11,7 @@ of patent rights can be found in the PATENTS file in the same directory.
 	<PropertyGroup>
 		<Major>5</Major>
 		<Minor>2</Minor>
-		<Build>11</Build>
+		<Build>13</Build>
 		<Revision>0</Revision>
 		<DevNuGetServer>http://reactjs.net/packages/</DevNuGetServer>
 		<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildTasks</MSBuildCommunityTasksPath>
diff --git a/site/jekyll/tutorials/aspnetcore.md b/site/jekyll/tutorials/aspnetcore.md
index 478686691..0a79d245c 100644
--- a/site/jekyll/tutorials/aspnetcore.md
+++ b/site/jekyll/tutorials/aspnetcore.md
@@ -149,7 +149,7 @@ app.UseReact(config =>
   //  .AddScript("~/js/First.jsx")
   //  .AddScript("~/js/Second.jsx");
 
-  // If you use an external build too (for example, Babel, Webpack,
+  // If you use an external build tool (for example, Babel, Webpack,
   // Browserify or Gulp), you can improve performance by disabling
   // ReactJS.NET's version of Babel and loading the pre-transpiled
   // scripts. Example:
diff --git a/src/React.Core/package-lock.json b/src/React.Core/package-lock.json
index 68fbc2d71..95d7482a5 100644
--- a/src/React.Core/package-lock.json
+++ b/src/React.Core/package-lock.json
@@ -1212,18 +1212,32 @@
       }
     },
     "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "dev": true
+        }
       }
     },
     "emoji-regex": {
diff --git a/src/React.Router/HtmlHelperExtensions.cs b/src/React.Router/HtmlHelperExtensions.cs
index 1bbf99914..076638b58 100644
--- a/src/React.Router/HtmlHelperExtensions.cs
+++ b/src/React.Router/HtmlHelperExtensions.cs
@@ -102,7 +102,12 @@ public static IHtmlString ReactRouter<T>(
 			{
 				var response = htmlHelper.ViewContext.HttpContext.Response;
 				var request = htmlHelper.ViewContext.HttpContext.Request;
-				path = path ?? request.Path.ToString() + request.QueryString;
+				var queryString = request != null && request.QueryString != null ? request.QueryString.ToString() : "";
+				if (!string.IsNullOrWhiteSpace(queryString) && !queryString.StartsWith("?"))
+				{
+					queryString = $"?{queryString}";
+				}
+				path = path ?? request.Path.ToString() + queryString;
 
 				var reactComponent
 					= Environment.CreateRouterComponent(
diff --git a/src/React.Template/reactnet-vanilla/Startup.cs b/src/React.Template/reactnet-vanilla/Startup.cs
index 7777ffb1a..6ca7827e5 100644
--- a/src/React.Template/reactnet-vanilla/Startup.cs
+++ b/src/React.Template/reactnet-vanilla/Startup.cs
@@ -72,7 +72,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
 						ContractResolver = new CamelCasePropertyNamesContractResolver()
 					});
 
-				// If you use an external build too (for example, Babel, Webpack,
+				// If you use an external build tool (for example, Babel, Webpack,
 				// Browserify or Gulp), you can improve performance by disabling
 				// ReactJS.NET's version of Babel and loading the pre-transpiled
 				// scripts. Example: