From 5f44501a27e29208210b945c42d2decadb2dd0c0 Mon Sep 17 00:00:00 2001
From: gagik <me@gagik.co>
Date: Wed, 20 Aug 2025 13:43:45 +0200
Subject: [PATCH 1/7] chore: bump crypt_shared and add 8.2 tests

---
 .evergreen/constants.js                                | 2 ++
 packages/build/src/packaging/download-crypt-library.ts | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.evergreen/constants.js b/.evergreen/constants.js
index 38c3c48aab..1901a01c7a 100644
--- a/.evergreen/constants.js
+++ b/.evergreen/constants.js
@@ -37,6 +37,8 @@ exports.MONGODB_VERSIONS = [
   { shortName: '70xe', versionSpec: '7.0.x-enterprise' },
   { shortName: '80xc', versionSpec: '8.0.x' },
   { shortName: '80xe', versionSpec: '8.0.x-enterprise' },
+  { shortName: '82xc', versionSpec: '8.2.x' },
+  { shortName: '82xe', versionSpec: '8.2.x-enterprise' },
   { shortName: 'latest', versionSpec: 'latest-alpha-enterprise' },
 ];
 
diff --git a/packages/build/src/packaging/download-crypt-library.ts b/packages/build/src/packaging/download-crypt-library.ts
index 01d1706207..1eaa5eb73d 100644
--- a/packages/build/src/packaging/download-crypt-library.ts
+++ b/packages/build/src/packaging/download-crypt-library.ts
@@ -36,10 +36,10 @@ export async function downloadCryptLibrary(
   // (for the platforms that they exist for, i.e. for ppc64le/s390x only pick stable releases).
   let versionSpec = 'stable'; // TODO(MONGOSH-2192): Switch back to 'continuous' and deal with affected platform support.
   if (/ppc64|s390x/.test(opts.arch || process.arch)) {
-    versionSpec = 'stable';
+    versionSpec = '8.2.0';
   }
   if ((opts.platform || process.platform) === 'darwin') {
-    versionSpec = '8.0.5'; // TBD(MONGOSH-2192,SERVER-101020): Figure out at what point we use a later version.
+    versionSpec = '8.2.0'; // TBD(MONGOSH-2192,SERVER-101020): Figure out at what point we use a later version.
   }
   const { downloadedBinDir: libdir, version } =
     await downloadMongoDbWithVersionInfo(cryptTmpTargetDir, versionSpec, opts);

From 02d4da85a1c1d35dbdd35f5ef1b383e41ea9ec1a Mon Sep 17 00:00:00 2001
From: gagik <me@gagik.co>
Date: Wed, 20 Aug 2025 15:19:07 +0200
Subject: [PATCH 2/7] chore: add e2e tests for 8.2

---
 .evergreen.yml                                | 68 +++++++++++++++++++
 .../e2e-tests-build-variants.js               | 41 +++++++++++
 2 files changed, 109 insertions(+)

diff --git a/.evergreen.yml b/.evergreen.yml
index 980a0d157e..cda652d64a 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -11369,6 +11369,17 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_arm64_openssl3
+  - name: e2e_tests_ubuntu2404_arm64_small_openssl3_m820
+    display_name: "Ubuntu 24.04 arm64 820 openssl3 (E2E tests)"
+    run_on: ubuntu2404-arm64-small
+    tags: []
+    expansions:
+      executable_os_id: "linux-arm64-openssl3"
+      node_js_version: "20.19.4"
+      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_arm64_openssl3
   - name: e2e_tests_amazon2_arm64_large_m70x
     display_name: "Amazon Linux 2 arm64 70x (E2E tests)"
     run_on: amazon2-arm64-large
@@ -11391,6 +11402,17 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_arm64
+  - name: e2e_tests_amazon2023.0_arm64_small_m820
+    display_name: "Amazon Linux 2023 arm64 820 (E2E tests)"
+    run_on: amazon2023.0-arm64-small
+    tags: []
+    expansions:
+      executable_os_id: "linux-arm64"
+      node_js_version: "20.19.4"
+      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_arm64
   - name: e2e_tests_rhel82_arm64_small
     display_name: "RHEL 8.2 arm64 (E2E tests)"
     run_on: rhel82-arm64-small
@@ -11468,6 +11490,17 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_ppc64le
+  - name: e2e_tests_rhel9_power_small_m820
+    display_name: "RHEL 9 PPC 820 (E2E tests)"
+    run_on: rhel9-power-small
+    tags: []
+    expansions:
+      executable_os_id: "linux-ppc64le"
+      node_js_version: "20.19.4"
+      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_ppc64le
   - name: e2e_tests_rhel7_zseries_large_m60x
     display_name: "RHEL 7 s390x 60x (E2E tests)"
     run_on: rhel7-zseries-large
@@ -11501,6 +11534,17 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_s390x
+  - name: e2e_tests_rhel9_zseries_small_m820
+    display_name: "RHEL 9 s390x 820 (E2E tests)"
+    run_on: rhel9-zseries-small
+    tags: []
+    expansions:
+      executable_os_id: "linux-s390x"
+      node_js_version: "20.19.4"
+      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_linux_s390x
   - name: e2e_tests_macos_14
     display_name: "MacOS 14 x64 (E2E tests)"
     run_on: macos-14
@@ -11523,6 +11567,17 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_darwin_arm64
+  - name: e2e_tests_macos_14_arm64_m820
+    display_name: "MacOS 14 arm64 820 (E2E tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: "darwin-arm64"
+      node_js_version: "20.19.4"
+      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_darwin_arm64
   - name: e2e_tests_darwin_m805
     display_name: "MacOS Big Sur 805 (E2E tests)"
     run_on: macos-11
@@ -11562,6 +11617,19 @@ buildvariants:
       - name: e2e_tests_win32
       - name: package_artifact_win32_x64
       - name: package_artifact_win32msi_x64
+  - name: e2e_tests_windows_vsCurrent_small_m820
+    display_name: "Windows VS 2022 820 (E2E tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
+    expansions:
+      executable_os_id: "win32"
+      node_js_version: "20.19.4"
+      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_test_e2e_force_fips: ""
+    tasks:
+      - name: e2e_tests_win32
+      - name: package_artifact_win32_x64
+      - name: package_artifact_win32msi_x64
 
   - name: linux_compile
     display_name: "Ubuntu 20.04 x64 (Compile and Check)"
diff --git a/.evergreen/build-variants/e2e-tests-build-variants.js b/.evergreen/build-variants/e2e-tests-build-variants.js
index ac4c80ce25..f0def3bac0 100644
--- a/.evergreen/build-variants/e2e-tests-build-variants.js
+++ b/.evergreen/build-variants/e2e-tests-build-variants.js
@@ -241,6 +241,13 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     executableOsId: 'linux-arm64-openssl3',
     mVersion: 'stable',
   },
+  {
+    displayName: 'Ubuntu 24.04 arm64',
+    runOn: 'ubuntu2404-arm64-small',
+    sharedOpenSsl: 'openssl3',
+    executableOsId: 'linux-arm64-openssl3',
+    mVersion: '8.2.0',
+  },
   {
     displayName: 'Amazon Linux 2 arm64',
     runOn: 'amazon2-arm64-large',
@@ -253,6 +260,12 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     executableOsId: 'linux-arm64',
     mVersion: 'stable',
   },
+  {
+    displayName: 'Amazon Linux 2023 arm64',
+    runOn: 'amazon2023.0-arm64-small',
+    executableOsId: 'linux-arm64',
+    mVersion: '8.2.0',
+  },
   {
     displayName: 'RHEL 8.2 arm64',
     runOn: 'rhel82-arm64-small',
@@ -297,6 +310,12 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     executableOsId: 'linux-ppc64le',
     mVersion: 'stable',
   },
+  {
+    displayName: 'RHEL 9 PPC',
+    runOn: 'rhel9-power-small',
+    executableOsId: 'linux-ppc64le',
+    mVersion: '8.2.0',
+  },
   {
     displayName: 'RHEL 7 s390x',
     runOn: 'rhel7-zseries-large',
@@ -315,6 +334,12 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     executableOsId: 'linux-s390x',
     mVersion: 'stable',
   },
+  {
+    displayName: 'RHEL 9 s390x',
+    runOn: 'rhel9-zseries-small',
+    executableOsId: 'linux-s390x',
+    mVersion: '8.2.0',
+  },
   {
     displayName: 'MacOS 14 x64',
     runOn: 'macos-14',
@@ -327,6 +352,12 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     executableOsId: 'darwin-arm64',
     mVersion: 'stable',
   },
+  {
+    displayName: 'MacOS 14 arm64',
+    runOn: 'macos-14-arm64',
+    executableOsId: 'darwin-arm64',
+    mVersion: '8.2.0',
+  },
   {
     displayName: 'MacOS Big Sur',
     id: 'darwin',
@@ -357,6 +388,16 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
       'package_artifact_win32msi_x64',
     ],
   },
+  {
+    displayName: 'Windows VS 2022',
+    runOn: 'windows-vsCurrent-small',
+    executableOsId: 'win32',
+    mVersion: '8.2.0',
+    additionalTasks: [
+      'package_artifact_win32_x64',
+      'package_artifact_win32msi_x64',
+    ],
+  },
 ].map((buildVariant) => {
   const { displayName, fips, sharedOpenSsl, mVersion, runOn, executableOsId } =
     buildVariant;

From 2c2a0e2769d8506b48e0fc75a983027b8704ee30 Mon Sep 17 00:00:00 2001
From: gagik <me@gagik.co>
Date: Wed, 20 Aug 2025 16:19:54 +0200
Subject: [PATCH 3/7] chore: go back to 8.0.5 for mac

---
 packages/build/src/packaging/download-crypt-library.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/build/src/packaging/download-crypt-library.ts b/packages/build/src/packaging/download-crypt-library.ts
index 1eaa5eb73d..9f0b82648e 100644
--- a/packages/build/src/packaging/download-crypt-library.ts
+++ b/packages/build/src/packaging/download-crypt-library.ts
@@ -39,7 +39,7 @@ export async function downloadCryptLibrary(
     versionSpec = '8.2.0';
   }
   if ((opts.platform || process.platform) === 'darwin') {
-    versionSpec = '8.2.0'; // TBD(MONGOSH-2192,SERVER-101020): Figure out at what point we use a later version.
+    versionSpec = '8.0.5'; // TBD(MONGOSH-2192,SERVER-101020): Figure out at what point we use a later version.
   }
   const { downloadedBinDir: libdir, version } =
     await downloadMongoDbWithVersionInfo(cryptTmpTargetDir, versionSpec, opts);

From a845602e5961b86cf6c1ed7dd6fc04e65499428f Mon Sep 17 00:00:00 2001
From: gagik <me@gagik.co>
Date: Thu, 21 Aug 2025 11:50:09 +0200
Subject: [PATCH 4/7] chore: use 8.2.0 for all except

---
 packages/build/src/packaging/download-crypt-library.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/build/src/packaging/download-crypt-library.ts b/packages/build/src/packaging/download-crypt-library.ts
index 9f0b82648e..38210fa0a8 100644
--- a/packages/build/src/packaging/download-crypt-library.ts
+++ b/packages/build/src/packaging/download-crypt-library.ts
@@ -34,9 +34,9 @@ export async function downloadCryptLibrary(
   );
   // Download mongodb for latest server version, including rapid releases
   // (for the platforms that they exist for, i.e. for ppc64le/s390x only pick stable releases).
-  let versionSpec = 'stable'; // TODO(MONGOSH-2192): Switch back to 'continuous' and deal with affected platform support.
+  let versionSpec = '8.2.0'; // TODO(MONGOSH-2192): Switch back to 'continuous' and deal with affected platform support.
   if (/ppc64|s390x/.test(opts.arch || process.arch)) {
-    versionSpec = '8.2.0';
+    versionSpec = 'stable';
   }
   if ((opts.platform || process.platform) === 'darwin') {
     versionSpec = '8.0.5'; // TBD(MONGOSH-2192,SERVER-101020): Figure out at what point we use a later version.

From 9c5e295b6d2ff666fbf1595822cf9775902db3e1 Mon Sep 17 00:00:00 2001
From: gagik <me@gagik.co>
Date: Thu, 21 Aug 2025 12:32:09 +0200
Subject: [PATCH 5/7] chore: check with -rc.4

---
 .evergreen.yml                                | 782 +++++++++++++++++-
 .../e2e-tests-build-variants.js               |  12 +-
 2 files changed, 748 insertions(+), 46 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index cda652d64a..39d13a1b08 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -965,6 +965,146 @@ functions:
         script: |
           set -e
           tar xvzf nyc-output-tests_darwin-m80xe_n20-shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xc_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-cli_repl.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xc_n20-cli_repl.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xc_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-e2e_tests.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xc_n20-e2e_tests.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xc_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-node_runtime_worker_thread.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xc_n20-node_runtime_worker_thread.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xc_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-service_provider_node_driver.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xc_n20-service_provider_node_driver.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xc_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-shell_api.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xc_n20-shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xe_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-cli_repl.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xe_n20-cli_repl.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xe_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-e2e_tests.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xe_n20-e2e_tests.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xe_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-node_runtime_worker_thread.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xe_n20-node_runtime_worker_thread.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xe_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-service_provider_node_driver.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xe_n20-service_provider_node_driver.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_darwin-m82xe_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-shell_api.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_darwin-m82xe_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2267,6 +2407,174 @@ functions:
         script: |
           set -e
           tar xvzf nyc-output-tests_linux-m80xe_n20-shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xc_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-cli_repl.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xc_n20-cli_repl.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xc_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-e2e_tests.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xc_n20-e2e_tests.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xc_n20-java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-java_shell.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xc_n20-java_shell.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xc_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-node_runtime_worker_thread.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xc_n20-node_runtime_worker_thread.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xc_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-service_provider_node_driver.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xc_n20-service_provider_node_driver.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xc_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-shell_api.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xc_n20-shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xe_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-cli_repl.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xe_n20-cli_repl.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xe_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-e2e_tests.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xe_n20-e2e_tests.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xe_n20-java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-java_shell.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xe_n20-java_shell.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xe_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-node_runtime_worker_thread.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xe_n20-node_runtime_worker_thread.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xe_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-service_provider_node_driver.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xe_n20-service_provider_node_driver.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_linux-m82xe_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-shell_api.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_linux-m82xe_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3302,13 +3610,153 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m70xe_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_win32-m70xe_n20-e2e_tests.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m70xe_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m70xe_n20-node_runtime_worker_thread.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m70xe_n20-node_runtime_worker_thread.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m70xe_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m70xe_n20-service_provider_node_driver.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m70xe_n20-service_provider_node_driver.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m70xe_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m70xe_n20-shell_api.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m70xe_n20-shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m80xc_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-cli_repl.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m80xc_n20-cli_repl.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m80xc_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-e2e_tests.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m80xc_n20-e2e_tests.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m80xc_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-node_runtime_worker_thread.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m80xc_n20-node_runtime_worker_thread.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m80xc_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-service_provider_node_driver.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m80xc_n20-service_provider_node_driver.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m80xc_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-shell_api.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m80xc_n20-shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m80xe_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-cli_repl.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m80xe_n20-cli_repl.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-tests_win32-m80xe_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-e2e_tests.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-tests_win32-m80xe_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m70xe_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m70xe_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_win32-m80xe_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3316,13 +3764,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m70xe_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_win32-m80xe_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m70xe_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m70xe_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_win32-m80xe_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3330,13 +3778,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m70xe_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_win32-m80xe_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m70xe_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m70xe_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_win32-m80xe_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3344,13 +3792,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m70xe_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_win32-m80xe_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xc_n20-cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-cli_repl.tgz
+        local_file: src/nyc-output-tests_win32-m82xc_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3358,13 +3806,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xc_n20-cli_repl.tgz
+          tar xvzf nyc-output-tests_win32-m82xc_n20-cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xc_n20-e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-e2e_tests.tgz
+        local_file: src/nyc-output-tests_win32-m82xc_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3372,13 +3820,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xc_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_win32-m82xc_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xc_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_win32-m82xc_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3386,13 +3834,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xc_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_win32-m82xc_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xc_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_win32-m82xc_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3400,13 +3848,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xc_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_win32-m82xc_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xc_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xc_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_win32-m82xc_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3414,13 +3862,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xc_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_win32-m82xc_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xe_n20-cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-cli_repl.tgz
+        local_file: src/nyc-output-tests_win32-m82xe_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3428,13 +3876,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xe_n20-cli_repl.tgz
+          tar xvzf nyc-output-tests_win32-m82xe_n20-cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xe_n20-e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-e2e_tests.tgz
+        local_file: src/nyc-output-tests_win32-m82xe_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3442,13 +3890,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xe_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_win32-m82xe_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xe_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_win32-m82xe_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3456,13 +3904,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xe_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_win32-m82xe_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xe_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_win32-m82xe_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3470,13 +3918,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xe_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_win32-m82xe_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m80xe_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m80xe_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_win32-m82xe_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3484,7 +3932,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m80xe_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_win32-m82xe_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -4588,6 +5036,26 @@ tasks:
         variant: tests_darwin-m80xe_n20
       - name: test_shell_api
         variant: tests_darwin-m80xe_n20
+      - name: test_cli_repl
+        variant: tests_darwin-m82xc_n20
+      - name: test_e2e_tests
+        variant: tests_darwin-m82xc_n20
+      - name: test_node_runtime_worker_thread
+        variant: tests_darwin-m82xc_n20
+      - name: test_service_provider_node_driver
+        variant: tests_darwin-m82xc_n20
+      - name: test_shell_api
+        variant: tests_darwin-m82xc_n20
+      - name: test_cli_repl
+        variant: tests_darwin-m82xe_n20
+      - name: test_e2e_tests
+        variant: tests_darwin-m82xe_n20
+      - name: test_node_runtime_worker_thread
+        variant: tests_darwin-m82xe_n20
+      - name: test_service_provider_node_driver
+        variant: tests_darwin-m82xe_n20
+      - name: test_shell_api
+        variant: tests_darwin-m82xe_n20
       - name: test_cli_repl
         variant: tests_darwin-mlatest_n20
       - name: test_e2e_tests
@@ -4774,6 +5242,30 @@ tasks:
         variant: tests_linux-m80xe_n20
       - name: test_shell_api
         variant: tests_linux-m80xe_n20
+      - name: test_cli_repl
+        variant: tests_linux-m82xc_n20
+      - name: test_e2e_tests
+        variant: tests_linux-m82xc_n20
+      - name: test_java_shell
+        variant: tests_linux-m82xc_n20
+      - name: test_node_runtime_worker_thread
+        variant: tests_linux-m82xc_n20
+      - name: test_service_provider_node_driver
+        variant: tests_linux-m82xc_n20
+      - name: test_shell_api
+        variant: tests_linux-m82xc_n20
+      - name: test_cli_repl
+        variant: tests_linux-m82xe_n20
+      - name: test_e2e_tests
+        variant: tests_linux-m82xe_n20
+      - name: test_java_shell
+        variant: tests_linux-m82xe_n20
+      - name: test_node_runtime_worker_thread
+        variant: tests_linux-m82xe_n20
+      - name: test_service_provider_node_driver
+        variant: tests_linux-m82xe_n20
+      - name: test_shell_api
+        variant: tests_linux-m82xe_n20
       - name: test_cli_repl
         variant: tests_linux-mlatest_n20
       - name: test_e2e_tests
@@ -4948,6 +5440,26 @@ tasks:
         variant: tests_win32-m80xe_n20
       - name: test_shell_api
         variant: tests_win32-m80xe_n20
+      - name: test_cli_repl
+        variant: tests_win32-m82xc_n20
+      - name: test_e2e_tests
+        variant: tests_win32-m82xc_n20
+      - name: test_node_runtime_worker_thread
+        variant: tests_win32-m82xc_n20
+      - name: test_service_provider_node_driver
+        variant: tests_win32-m82xc_n20
+      - name: test_shell_api
+        variant: tests_win32-m82xc_n20
+      - name: test_cli_repl
+        variant: tests_win32-m82xe_n20
+      - name: test_e2e_tests
+        variant: tests_win32-m82xe_n20
+      - name: test_node_runtime_worker_thread
+        variant: tests_win32-m82xe_n20
+      - name: test_service_provider_node_driver
+        variant: tests_win32-m82xe_n20
+      - name: test_shell_api
+        variant: tests_win32-m82xe_n20
       - name: test_cli_repl
         variant: tests_win32-mlatest_n20
       - name: test_e2e_tests
@@ -10006,6 +10518,70 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
+  - name: tests_darwin-m82xc_n20
+    display_name: "MacOS 14 arm64 m82xc n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "8.2.x"
+      node_js_version: "20.19.4"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_darwin-m82xe_n20
+    display_name: "MacOS 14 arm64 m82xe n20 (Unit tests)"
+    run_on: macos-14-arm64
+    tags: []
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "8.2.x-enterprise"
+      node_js_version: "20.19.4"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_repl
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
   - name: tests_darwin-mlatest_n20
     display_name: "MacOS 14 arm64 mlatest n20 (Unit tests)"
     run_on: macos-14-arm64
@@ -10422,6 +10998,70 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
+  - name: tests_linux-m82xc_n20
+    display_name: "Ubuntu 20.04 x64 m82xc n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "8.2.x"
+      node_js_version: "20.19.4"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_linux-m82xe_n20
+    display_name: "Ubuntu 20.04 x64 m82xe n20 (Unit tests)"
+    run_on: ubuntu2004-small
+    tags: ["nightly-driver"]
+    expansions:
+      executable_os_id: darwin-arm64
+      mongosh_server_test_version: "8.2.x-enterprise"
+      node_js_version: "20.19.4"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_java_shell
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
   - name: tests_linux-mlatest_n20
     display_name: "Ubuntu 20.04 x64 mlatest n20 (Unit tests)"
     run_on: ubuntu2004-small
@@ -10857,6 +11497,68 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
+  - name: tests_win32-m82xc_n20
+    display_name: "Windows m82xc n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
+    expansions:
+      executable_os_id: win32
+      mongosh_server_test_version: "8.2.x"
+      node_js_version: "20.19.4"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
+  - name: tests_win32-m82xe_n20
+    display_name: "Windows m82xe n20 (Unit tests)"
+    run_on: windows-vsCurrent-small
+    tags: []
+    expansions:
+      executable_os_id: win32
+      mongosh_server_test_version: "8.2.x-enterprise"
+      node_js_version: "20.19.4"
+      mongosh_skip_node_version_check: ""
+    tasks:
+      - name: test_arg_parser
+      - name: test_async_rewriter2
+      - name: test_autocomplete
+      - name: test_browser_runtime_core
+      - name: test_browser_runtime_electron
+      - name: test_build
+      - name: test_cli_repl
+      - name: test_e2e_tests
+      - name: test_editor
+      - name: test_errors
+      - name: test_history
+      - name: test_i18n
+      - name: test_js_multiline_to_singleline
+      - name: test_logging
+      - name: test_node_runtime_worker_thread
+      - name: test_service_provider_core
+      - name: test_service_provider_node_driver
+      - name: test_shell_api
+      - name: test_shell_evaluator
+      - name: test_snippet_manager
+      - name: test_types
   - name: tests_win32-mlatest_n20
     display_name: "Windows mlatest n20 (Unit tests)"
     run_on: windows-vsCurrent-small
diff --git a/.evergreen/build-variants/e2e-tests-build-variants.js b/.evergreen/build-variants/e2e-tests-build-variants.js
index f0def3bac0..68fa3c8329 100644
--- a/.evergreen/build-variants/e2e-tests-build-variants.js
+++ b/.evergreen/build-variants/e2e-tests-build-variants.js
@@ -246,7 +246,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     runOn: 'ubuntu2404-arm64-small',
     sharedOpenSsl: 'openssl3',
     executableOsId: 'linux-arm64-openssl3',
-    mVersion: '8.2.0',
+    mVersion: '8.2.0-rc4',
   },
   {
     displayName: 'Amazon Linux 2 arm64',
@@ -264,7 +264,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     displayName: 'Amazon Linux 2023 arm64',
     runOn: 'amazon2023.0-arm64-small',
     executableOsId: 'linux-arm64',
-    mVersion: '8.2.0',
+    mVersion: '8.2.0-rc4',
   },
   {
     displayName: 'RHEL 8.2 arm64',
@@ -314,7 +314,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     displayName: 'RHEL 9 PPC',
     runOn: 'rhel9-power-small',
     executableOsId: 'linux-ppc64le',
-    mVersion: '8.2.0',
+    mVersion: '8.2.0-rc4',
   },
   {
     displayName: 'RHEL 7 s390x',
@@ -338,7 +338,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     displayName: 'RHEL 9 s390x',
     runOn: 'rhel9-zseries-small',
     executableOsId: 'linux-s390x',
-    mVersion: '8.2.0',
+    mVersion: '8.2.0-rc4',
   },
   {
     displayName: 'MacOS 14 x64',
@@ -356,7 +356,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     displayName: 'MacOS 14 arm64',
     runOn: 'macos-14-arm64',
     executableOsId: 'darwin-arm64',
-    mVersion: '8.2.0',
+    mVersion: '8.2.0-rc4',
   },
   {
     displayName: 'MacOS Big Sur',
@@ -392,7 +392,7 @@ exports.E2E_TESTS_BUILD_VARIANTS = [
     displayName: 'Windows VS 2022',
     runOn: 'windows-vsCurrent-small',
     executableOsId: 'win32',
-    mVersion: '8.2.0',
+    mVersion: '8.2.0-rc4',
     additionalTasks: [
       'package_artifact_win32_x64',
       'package_artifact_win32msi_x64',

From a9c274e82d9257d56e5de0d2c1ae1c824b684e1b Mon Sep 17 00:00:00 2001
From: gagik <me@gagik.co>
Date: Thu, 21 Aug 2025 13:27:07 +0200
Subject: [PATCH 6/7] chore: revert to stable

---
 packages/build/src/packaging/download-crypt-library.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/build/src/packaging/download-crypt-library.ts b/packages/build/src/packaging/download-crypt-library.ts
index 38210fa0a8..01d1706207 100644
--- a/packages/build/src/packaging/download-crypt-library.ts
+++ b/packages/build/src/packaging/download-crypt-library.ts
@@ -34,7 +34,7 @@ export async function downloadCryptLibrary(
   );
   // Download mongodb for latest server version, including rapid releases
   // (for the platforms that they exist for, i.e. for ppc64le/s390x only pick stable releases).
-  let versionSpec = '8.2.0'; // TODO(MONGOSH-2192): Switch back to 'continuous' and deal with affected platform support.
+  let versionSpec = 'stable'; // TODO(MONGOSH-2192): Switch back to 'continuous' and deal with affected platform support.
   if (/ppc64|s390x/.test(opts.arch || process.arch)) {
     versionSpec = 'stable';
   }

From 025d151ede918c89959310c54b256c38b7fdb65a Mon Sep 17 00:00:00 2001
From: gagik <me@gagik.co>
Date: Thu, 21 Aug 2025 13:44:34 +0200
Subject: [PATCH 7/7] chore: use rc in constant too

---
 .evergreen.yml          | 328 ++++++++++++++++++++--------------------
 .evergreen/constants.js |   4 +-
 2 files changed, 166 insertions(+), 166 deletions(-)

diff --git a/.evergreen.yml b/.evergreen.yml
index 39d13a1b08..52916c4a50 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -969,8 +969,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xc_n20-cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-cli_repl.tgz
+        local_file: src/nyc-output-tests_darwin-m82rc_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rc_n20-cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -978,13 +978,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xc_n20-cli_repl.tgz
+          tar xvzf nyc-output-tests_darwin-m82rc_n20-cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xc_n20-e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-e2e_tests.tgz
+        local_file: src/nyc-output-tests_darwin-m82rc_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rc_n20-e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -992,13 +992,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xc_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_darwin-m82rc_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xc_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_darwin-m82rc_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rc_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1006,13 +1006,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xc_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_darwin-m82rc_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xc_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_darwin-m82rc_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rc_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1020,13 +1020,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xc_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_darwin-m82rc_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xc_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xc_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_darwin-m82rc_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rc_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1034,13 +1034,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xc_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_darwin-m82rc_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xe_n20-cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-cli_repl.tgz
+        local_file: src/nyc-output-tests_darwin-m82rce_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rce_n20-cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1048,13 +1048,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xe_n20-cli_repl.tgz
+          tar xvzf nyc-output-tests_darwin-m82rce_n20-cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xe_n20-e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-e2e_tests.tgz
+        local_file: src/nyc-output-tests_darwin-m82rce_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rce_n20-e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1062,13 +1062,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xe_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_darwin-m82rce_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xe_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_darwin-m82rce_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rce_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1076,13 +1076,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xe_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_darwin-m82rce_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xe_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_darwin-m82rce_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rce_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1090,13 +1090,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xe_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_darwin-m82rce_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_darwin-m82xe_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82xe_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_darwin-m82rce_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_darwin-m82rce_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1104,7 +1104,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_darwin-m82xe_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_darwin-m82rce_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2411,8 +2411,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xc_n20-cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-cli_repl.tgz
+        local_file: src/nyc-output-tests_linux-m82rc_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rc_n20-cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2420,13 +2420,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xc_n20-cli_repl.tgz
+          tar xvzf nyc-output-tests_linux-m82rc_n20-cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xc_n20-e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-e2e_tests.tgz
+        local_file: src/nyc-output-tests_linux-m82rc_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rc_n20-e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2434,13 +2434,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xc_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_linux-m82rc_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xc_n20-java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-java_shell.tgz
+        local_file: src/nyc-output-tests_linux-m82rc_n20-java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rc_n20-java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2448,13 +2448,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xc_n20-java_shell.tgz
+          tar xvzf nyc-output-tests_linux-m82rc_n20-java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xc_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_linux-m82rc_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rc_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2462,13 +2462,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xc_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_linux-m82rc_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xc_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_linux-m82rc_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rc_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2476,13 +2476,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xc_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_linux-m82rc_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xc_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xc_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_linux-m82rc_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rc_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2490,13 +2490,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xc_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_linux-m82rc_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xe_n20-cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-cli_repl.tgz
+        local_file: src/nyc-output-tests_linux-m82rce_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rce_n20-cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2504,13 +2504,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xe_n20-cli_repl.tgz
+          tar xvzf nyc-output-tests_linux-m82rce_n20-cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xe_n20-e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-e2e_tests.tgz
+        local_file: src/nyc-output-tests_linux-m82rce_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rce_n20-e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2518,13 +2518,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xe_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_linux-m82rce_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xe_n20-java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-java_shell.tgz
+        local_file: src/nyc-output-tests_linux-m82rce_n20-java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rce_n20-java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2532,13 +2532,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xe_n20-java_shell.tgz
+          tar xvzf nyc-output-tests_linux-m82rce_n20-java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xe_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_linux-m82rce_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rce_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2546,13 +2546,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xe_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_linux-m82rce_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xe_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_linux-m82rce_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rce_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2560,13 +2560,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xe_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_linux-m82rce_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_linux-m82xe_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82xe_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_linux-m82rce_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_linux-m82rce_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2574,7 +2574,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_linux-m82xe_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_linux-m82rce_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3797,8 +3797,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xc_n20-cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-cli_repl.tgz
+        local_file: src/nyc-output-tests_win32-m82rc_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rc_n20-cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3806,13 +3806,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xc_n20-cli_repl.tgz
+          tar xvzf nyc-output-tests_win32-m82rc_n20-cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xc_n20-e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-e2e_tests.tgz
+        local_file: src/nyc-output-tests_win32-m82rc_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rc_n20-e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3820,13 +3820,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xc_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_win32-m82rc_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xc_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_win32-m82rc_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rc_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3834,13 +3834,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xc_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_win32-m82rc_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xc_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_win32-m82rc_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rc_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3848,13 +3848,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xc_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_win32-m82rc_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xc_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xc_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_win32-m82rc_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rc_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3862,13 +3862,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xc_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_win32-m82rc_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xe_n20-cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-cli_repl.tgz
+        local_file: src/nyc-output-tests_win32-m82rce_n20-cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rce_n20-cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3876,13 +3876,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xe_n20-cli_repl.tgz
+          tar xvzf nyc-output-tests_win32-m82rce_n20-cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xe_n20-e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-e2e_tests.tgz
+        local_file: src/nyc-output-tests_win32-m82rce_n20-e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rce_n20-e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3890,13 +3890,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xe_n20-e2e_tests.tgz
+          tar xvzf nyc-output-tests_win32-m82rce_n20-e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xe_n20-node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-tests_win32-m82rce_n20-node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rce_n20-node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3904,13 +3904,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xe_n20-node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-tests_win32-m82rce_n20-node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xe_n20-service_provider_node_driver.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-service_provider_node_driver.tgz
+        local_file: src/nyc-output-tests_win32-m82rce_n20-service_provider_node_driver.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rce_n20-service_provider_node_driver.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3918,13 +3918,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xe_n20-service_provider_node_driver.tgz
+          tar xvzf nyc-output-tests_win32-m82rce_n20-service_provider_node_driver.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-tests_win32-m82xe_n20-shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82xe_n20-shell_api.tgz
+        local_file: src/nyc-output-tests_win32-m82rce_n20-shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-tests_win32-m82rce_n20-shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3932,7 +3932,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-tests_win32-m82xe_n20-shell_api.tgz
+          tar xvzf nyc-output-tests_win32-m82rce_n20-shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -5037,25 +5037,25 @@ tasks:
       - name: test_shell_api
         variant: tests_darwin-m80xe_n20
       - name: test_cli_repl
-        variant: tests_darwin-m82xc_n20
+        variant: tests_darwin-m82rc_n20
       - name: test_e2e_tests
-        variant: tests_darwin-m82xc_n20
+        variant: tests_darwin-m82rc_n20
       - name: test_node_runtime_worker_thread
-        variant: tests_darwin-m82xc_n20
+        variant: tests_darwin-m82rc_n20
       - name: test_service_provider_node_driver
-        variant: tests_darwin-m82xc_n20
+        variant: tests_darwin-m82rc_n20
       - name: test_shell_api
-        variant: tests_darwin-m82xc_n20
+        variant: tests_darwin-m82rc_n20
       - name: test_cli_repl
-        variant: tests_darwin-m82xe_n20
+        variant: tests_darwin-m82rce_n20
       - name: test_e2e_tests
-        variant: tests_darwin-m82xe_n20
+        variant: tests_darwin-m82rce_n20
       - name: test_node_runtime_worker_thread
-        variant: tests_darwin-m82xe_n20
+        variant: tests_darwin-m82rce_n20
       - name: test_service_provider_node_driver
-        variant: tests_darwin-m82xe_n20
+        variant: tests_darwin-m82rce_n20
       - name: test_shell_api
-        variant: tests_darwin-m82xe_n20
+        variant: tests_darwin-m82rce_n20
       - name: test_cli_repl
         variant: tests_darwin-mlatest_n20
       - name: test_e2e_tests
@@ -5243,29 +5243,29 @@ tasks:
       - name: test_shell_api
         variant: tests_linux-m80xe_n20
       - name: test_cli_repl
-        variant: tests_linux-m82xc_n20
+        variant: tests_linux-m82rc_n20
       - name: test_e2e_tests
-        variant: tests_linux-m82xc_n20
+        variant: tests_linux-m82rc_n20
       - name: test_java_shell
-        variant: tests_linux-m82xc_n20
+        variant: tests_linux-m82rc_n20
       - name: test_node_runtime_worker_thread
-        variant: tests_linux-m82xc_n20
+        variant: tests_linux-m82rc_n20
       - name: test_service_provider_node_driver
-        variant: tests_linux-m82xc_n20
+        variant: tests_linux-m82rc_n20
       - name: test_shell_api
-        variant: tests_linux-m82xc_n20
+        variant: tests_linux-m82rc_n20
       - name: test_cli_repl
-        variant: tests_linux-m82xe_n20
+        variant: tests_linux-m82rce_n20
       - name: test_e2e_tests
-        variant: tests_linux-m82xe_n20
+        variant: tests_linux-m82rce_n20
       - name: test_java_shell
-        variant: tests_linux-m82xe_n20
+        variant: tests_linux-m82rce_n20
       - name: test_node_runtime_worker_thread
-        variant: tests_linux-m82xe_n20
+        variant: tests_linux-m82rce_n20
       - name: test_service_provider_node_driver
-        variant: tests_linux-m82xe_n20
+        variant: tests_linux-m82rce_n20
       - name: test_shell_api
-        variant: tests_linux-m82xe_n20
+        variant: tests_linux-m82rce_n20
       - name: test_cli_repl
         variant: tests_linux-mlatest_n20
       - name: test_e2e_tests
@@ -5441,25 +5441,25 @@ tasks:
       - name: test_shell_api
         variant: tests_win32-m80xe_n20
       - name: test_cli_repl
-        variant: tests_win32-m82xc_n20
+        variant: tests_win32-m82rc_n20
       - name: test_e2e_tests
-        variant: tests_win32-m82xc_n20
+        variant: tests_win32-m82rc_n20
       - name: test_node_runtime_worker_thread
-        variant: tests_win32-m82xc_n20
+        variant: tests_win32-m82rc_n20
       - name: test_service_provider_node_driver
-        variant: tests_win32-m82xc_n20
+        variant: tests_win32-m82rc_n20
       - name: test_shell_api
-        variant: tests_win32-m82xc_n20
+        variant: tests_win32-m82rc_n20
       - name: test_cli_repl
-        variant: tests_win32-m82xe_n20
+        variant: tests_win32-m82rce_n20
       - name: test_e2e_tests
-        variant: tests_win32-m82xe_n20
+        variant: tests_win32-m82rce_n20
       - name: test_node_runtime_worker_thread
-        variant: tests_win32-m82xe_n20
+        variant: tests_win32-m82rce_n20
       - name: test_service_provider_node_driver
-        variant: tests_win32-m82xe_n20
+        variant: tests_win32-m82rce_n20
       - name: test_shell_api
-        variant: tests_win32-m82xe_n20
+        variant: tests_win32-m82rce_n20
       - name: test_cli_repl
         variant: tests_win32-mlatest_n20
       - name: test_e2e_tests
@@ -10518,13 +10518,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-m82xc_n20
-    display_name: "MacOS 14 arm64 m82xc n20 (Unit tests)"
+  - name: tests_darwin-m82rc_n20
+    display_name: "MacOS 14 arm64 m82rc n20 (Unit tests)"
     run_on: macos-14-arm64
     tags: []
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.2.x"
+      mongosh_server_test_version: "8.2.0-rc4"
       node_js_version: "20.19.4"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10550,13 +10550,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_darwin-m82xe_n20
-    display_name: "MacOS 14 arm64 m82xe n20 (Unit tests)"
+  - name: tests_darwin-m82rce_n20
+    display_name: "MacOS 14 arm64 m82rce n20 (Unit tests)"
     run_on: macos-14-arm64
     tags: []
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.2.x-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       node_js_version: "20.19.4"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -10998,13 +10998,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m82xc_n20
-    display_name: "Ubuntu 20.04 x64 m82xc n20 (Unit tests)"
+  - name: tests_linux-m82rc_n20
+    display_name: "Ubuntu 20.04 x64 m82rc n20 (Unit tests)"
     run_on: ubuntu2004-small
     tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.2.x"
+      mongosh_server_test_version: "8.2.0-rc4"
       node_js_version: "20.19.4"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -11030,13 +11030,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_linux-m82xe_n20
-    display_name: "Ubuntu 20.04 x64 m82xe n20 (Unit tests)"
+  - name: tests_linux-m82rce_n20
+    display_name: "Ubuntu 20.04 x64 m82rce n20 (Unit tests)"
     run_on: ubuntu2004-small
     tags: ["nightly-driver"]
     expansions:
       executable_os_id: darwin-arm64
-      mongosh_server_test_version: "8.2.x-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       node_js_version: "20.19.4"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -11497,13 +11497,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_win32-m82xc_n20
-    display_name: "Windows m82xc n20 (Unit tests)"
+  - name: tests_win32-m82rc_n20
+    display_name: "Windows m82rc n20 (Unit tests)"
     run_on: windows-vsCurrent-small
     tags: []
     expansions:
       executable_os_id: win32
-      mongosh_server_test_version: "8.2.x"
+      mongosh_server_test_version: "8.2.0-rc4"
       node_js_version: "20.19.4"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -11528,13 +11528,13 @@ buildvariants:
       - name: test_shell_evaluator
       - name: test_snippet_manager
       - name: test_types
-  - name: tests_win32-m82xe_n20
-    display_name: "Windows m82xe n20 (Unit tests)"
+  - name: tests_win32-m82rce_n20
+    display_name: "Windows m82rce n20 (Unit tests)"
     run_on: windows-vsCurrent-small
     tags: []
     expansions:
       executable_os_id: win32
-      mongosh_server_test_version: "8.2.x-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       node_js_version: "20.19.4"
       mongosh_skip_node_version_check: ""
     tasks:
@@ -12071,14 +12071,14 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_arm64_openssl3
-  - name: e2e_tests_ubuntu2404_arm64_small_openssl3_m820
-    display_name: "Ubuntu 24.04 arm64 820 openssl3 (E2E tests)"
+  - name: e2e_tests_ubuntu2404_arm64_small_openssl3_m820-rc4
+    display_name: "Ubuntu 24.04 arm64 820-rc4 openssl3 (E2E tests)"
     run_on: ubuntu2404-arm64-small
     tags: []
     expansions:
       executable_os_id: "linux-arm64-openssl3"
       node_js_version: "20.19.4"
-      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_arm64_openssl3
@@ -12104,14 +12104,14 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_arm64
-  - name: e2e_tests_amazon2023.0_arm64_small_m820
-    display_name: "Amazon Linux 2023 arm64 820 (E2E tests)"
+  - name: e2e_tests_amazon2023.0_arm64_small_m820-rc4
+    display_name: "Amazon Linux 2023 arm64 820-rc4 (E2E tests)"
     run_on: amazon2023.0-arm64-small
     tags: []
     expansions:
       executable_os_id: "linux-arm64"
       node_js_version: "20.19.4"
-      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_arm64
@@ -12192,14 +12192,14 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_ppc64le
-  - name: e2e_tests_rhel9_power_small_m820
-    display_name: "RHEL 9 PPC 820 (E2E tests)"
+  - name: e2e_tests_rhel9_power_small_m820-rc4
+    display_name: "RHEL 9 PPC 820-rc4 (E2E tests)"
     run_on: rhel9-power-small
     tags: []
     expansions:
       executable_os_id: "linux-ppc64le"
       node_js_version: "20.19.4"
-      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_ppc64le
@@ -12236,14 +12236,14 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_s390x
-  - name: e2e_tests_rhel9_zseries_small_m820
-    display_name: "RHEL 9 s390x 820 (E2E tests)"
+  - name: e2e_tests_rhel9_zseries_small_m820-rc4
+    display_name: "RHEL 9 s390x 820-rc4 (E2E tests)"
     run_on: rhel9-zseries-small
     tags: []
     expansions:
       executable_os_id: "linux-s390x"
       node_js_version: "20.19.4"
-      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_linux_s390x
@@ -12269,14 +12269,14 @@ buildvariants:
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_darwin_arm64
-  - name: e2e_tests_macos_14_arm64_m820
-    display_name: "MacOS 14 arm64 820 (E2E tests)"
+  - name: e2e_tests_macos_14_arm64_m820-rc4
+    display_name: "MacOS 14 arm64 820-rc4 (E2E tests)"
     run_on: macos-14-arm64
     tags: []
     expansions:
       executable_os_id: "darwin-arm64"
       node_js_version: "20.19.4"
-      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_darwin_arm64
@@ -12319,14 +12319,14 @@ buildvariants:
       - name: e2e_tests_win32
       - name: package_artifact_win32_x64
       - name: package_artifact_win32msi_x64
-  - name: e2e_tests_windows_vsCurrent_small_m820
-    display_name: "Windows VS 2022 820 (E2E tests)"
+  - name: e2e_tests_windows_vsCurrent_small_m820-rc4
+    display_name: "Windows VS 2022 820-rc4 (E2E tests)"
     run_on: windows-vsCurrent-small
     tags: []
     expansions:
       executable_os_id: "win32"
       node_js_version: "20.19.4"
-      mongosh_server_test_version: "8.2.0-enterprise"
+      mongosh_server_test_version: "8.2.0-rc4-enterprise"
       mongosh_test_e2e_force_fips: ""
     tasks:
       - name: e2e_tests_win32
diff --git a/.evergreen/constants.js b/.evergreen/constants.js
index 1901a01c7a..407bbf1142 100644
--- a/.evergreen/constants.js
+++ b/.evergreen/constants.js
@@ -37,8 +37,8 @@ exports.MONGODB_VERSIONS = [
   { shortName: '70xe', versionSpec: '7.0.x-enterprise' },
   { shortName: '80xc', versionSpec: '8.0.x' },
   { shortName: '80xe', versionSpec: '8.0.x-enterprise' },
-  { shortName: '82xc', versionSpec: '8.2.x' },
-  { shortName: '82xe', versionSpec: '8.2.x-enterprise' },
+  { shortName: '82rc', versionSpec: '8.2.0-rc4' },
+  { shortName: '82rce', versionSpec: '8.2.0-rc4-enterprise' },
   { shortName: 'latest', versionSpec: 'latest-alpha-enterprise' },
 ];