diff --git a/doc/DistributedTracing.md b/doc/DistributedTracing.md
index 2c373d31a9..90f55161ce 100644
--- a/doc/DistributedTracing.md
+++ b/doc/DistributedTracing.md
@@ -71,9 +71,6 @@ CreateOpenTelemetryProvider()
 }
 ```
 
-Other exporters exist to export to [Jaeger](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/exporters/jaeger),
-[Windows ETW](https://github.com/open-telemetry/opentelemetry-cpp/tree/main/exporters/etw) and others.
-
 Once the `opentelemetry::trace::TracerProvider` has been created, The client needs to create a new `Azure::Core::Tracing::OpenTelemetry::OpenTelemetryProvider` which
 functions as an abstract class integration between OpenTelemetry and Azure Core:
 
diff --git a/eng/common/scripts/job-matrix/tests/job-matrix-functions.modification.tests.ps1 b/eng/common/scripts/job-matrix/tests/job-matrix-functions.modification.tests.ps1
index 9dca8eba09..e869c29f42 100644
--- a/eng/common/scripts/job-matrix/tests/job-matrix-functions.modification.tests.ps1
+++ b/eng/common/scripts/job-matrix/tests/job-matrix-functions.modification.tests.ps1
@@ -476,7 +476,7 @@ Describe "Platform Matrix Replace" -Tag "replace" {
 {
   "matrix": {
     "Agent": {
-      "ubuntu-1804": { "OSVmImage": "MMSUbuntu18.04", "Pool": "azsdk-pool-mms-ubuntu-1804-general" }
+      "ubuntu-1804": { "OSVmImage": "azsdk-pool-mms-ubuntu-2004-1espt", "Pool": "azsdk-pool-mms-ubuntu-2004-general" }
     },
     "JavaTestVersion": [ "1.8", "1.11" ]
   }
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 3081c4a558..409435a2a5 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -133,15 +133,18 @@ jobs:
               TestPipeline: ${{ parameters.TestPipeline }}
 
         - pwsh: |
-            $setupFile="doxygen-1.8.18-setup.exe";
+            $setupFile="doxygen-1.9.7-setup.exe";
 
             Invoke-WebRequest `
               -MaximumRetryCount 10 `
-              -Uri "https://azuresdktooling.blob.core.windows.net/dependencies/$setupFile" `
+              -Uri "https://azuresdkartifacts.blob.core.windows.net/tools/doxygen/$setupFile" `
               -OutFile $setupFile `
             | Wait-Process;
 
+            Write-Host "Installing $setupFile..."
             Start-Process -Filepath .\$setupFile -ArgumentList @("/VERYSILENT") -Wait
+            Write-Host "Install complete"
+            .'C:\Program Files\doxygen\bin\doxygen.exe' --version
           workingDirectory: $(Agent.TempDirectory)
           displayName: Download and Install Doxygen
 
diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
index c6b27addaa..87b31b5836 100644
--- a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
+++ b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
@@ -3,8 +3,8 @@
     "CmakeEnvArg": "",
     "OSConfig": {
       "Linux": {
-        "Pool": "azsdk-pool-mms-ubuntu-1804-general",
-        "OSVmImage": "MMSUbuntu18.04",
+        "Pool": "azsdk-pool-mms-ubuntu-2004-general",
+        "OSVmImage": "azsdk-pool-mms-ubuntu-2004-1espt",
         "AptDependencies": "libcurl4-openssl-dev",
         "VCPKG_DEFAULT_TRIPLET": "x64-linux"
       },
diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
index 07e9fbc210..f5a88f5332 100644
--- a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
+++ b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
@@ -7,8 +7,8 @@
         "CmakeEnvArg": ""
       },
       "Linux": {
-        "Pool": "azsdk-pool-mms-ubuntu-1804-general",
-        "OSVmImage": "MMSUbuntu18.04",
+        "Pool": "azsdk-pool-mms-ubuntu-2004-general",
+        "OSVmImage": "azsdk-pool-mms-ubuntu-2004-1espt",
         "CmakeEnvArg": "",
         "AptDependencies": "libcurl4-openssl-dev"
       },
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
index 8c6315f643..5723198492 100644
--- a/eng/pipelines/templates/stages/platform-matrix.json
+++ b/eng/pipelines/templates/stages/platform-matrix.json
@@ -116,15 +116,6 @@
       }
     },
     {
-      "StaticConfigs": {
-        "Ubuntu18": {
-          "OSVmImage": "MMSUbuntu18.04",
-          "Pool": "azsdk-pool-mms-ubuntu-1804-general",
-          "VCPKG_DEFAULT_TRIPLET": "x64-linux",
-          "BuildArgs": "-j 10",
-          "RunProxyTests": true
-        }
-      },
       "BuildSettings": {
         "gpp-5": {
           "AptDependencies": "g++-5",
diff --git a/sdk/attestation/azure-security-attestation/samples/README.md b/sdk/attestation/azure-security-attestation/samples/README.md
index 56dfb6853b..33b83eac16 100644
--- a/sdk/attestation/azure-security-attestation/samples/README.md
+++ b/sdk/attestation/azure-security-attestation/samples/README.md
@@ -85,8 +85,7 @@ variables have been set by the user:
 * POLICY_SIGNING_CERTIFICATE_0 - The DER encoded form of a self-signed
   certificate which contains the public key associated with policySigningKey0, Base64 encoded.
 
-The tests also assume that the currently logged on user is authorized to call
-into the attestation service instance because they use [Azure::Core::Credentials::TokenCredential](https://azuresdkdocs.blob.core.windows.net/$web/cpp/azure-core/1.3.1/class_azure_1_1_core_1_1_credentials_1_1_token_credential.html) for authorization.
+The tests also assume that the currently logged on user is authorized to call into the attestation service instance because they use Azure::Core::Credentials::TokenCredential for authorization.
 
 This directory contains functional samples for the attestation service SDK.
 
diff --git a/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp b/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp
index 6aea60d172..f2f5ea1cd7 100644
--- a/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp
+++ b/sdk/core/azure-core/src/http/winhttp/win_http_transport.cpp
@@ -1419,6 +1419,10 @@ int64_t _detail::WinHttpRequest::GetContentLength(
 std::unique_ptr<RawResponse> _detail::WinHttpRequest::SendRequestAndGetResponse(
     HttpMethod requestMethod)
 {
+  // Suppress unused parameter warning (C4100).
+  // Keeping 'requestMethod' in the signature preserves API compatibility.
+  (void)requestMethod;
+
   // First, use WinHttpQueryHeaders to obtain the size of the buffer.
   // The call is expected to fail since no destination buffer is provided.
   DWORD sizeOfHeaders = 0;