diff --git a/.evergreen.yml b/.evergreen.yml
index fe657e62f..5bf1dada7 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -91,7 +91,7 @@ functions:
         script: |
           source .evergreen/setup-env.sh
           npm run compile
-          tar cvzf compiled-ts.tgz packages/*/{lib,dist}
+          tar cvzf compiled-ts.tgz packages/*/{lib,dist,pkg,target}
     - command: s3.put
       params:
         aws_key: ${aws_key}
@@ -238,6 +238,314 @@ functions:
         script: |
           set -e
           tar xvzf nyc-output-darwin_unit-n16_async_rewriter2.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m42xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m42xc_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m42xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m42xe_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m44xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m44xc_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m44xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m44xe_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m50xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m50xc_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m50xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m50xe_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m60xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m60xc_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m60xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m60xe_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m70xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m70xc_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m70xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m70xe_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-mlatest_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-mlatest_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m42xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m42xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m42xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m42xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m44xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m44xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m44xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m44xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m50xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m50xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m50xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m50xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m60xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m60xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m60xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m60xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m60xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m70xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m70xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-m70xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m70xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-m70xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-darwin_unit-mlatest_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-darwin_unit-mlatest_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2286,8 +2594,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n20_autocomplete.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n20_autocomplete.tgz
+        local_file: src/nyc-output-linux_unit-m42xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2295,13 +2603,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n20_autocomplete.tgz
+          tar xvzf nyc-output-linux_unit-m42xc_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n16_autocomplete.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_autocomplete.tgz
+        local_file: src/nyc-output-linux_unit-m44xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2309,13 +2617,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n16_autocomplete.tgz
+          tar xvzf nyc-output-linux_unit-m44xc_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n20_browser_runtime_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n20_browser_runtime_core.tgz
+        local_file: src/nyc-output-linux_unit-m44xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2323,13 +2631,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n20_browser_runtime_core.tgz
+          tar xvzf nyc-output-linux_unit-m44xe_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n16_browser_runtime_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_browser_runtime_core.tgz
+        local_file: src/nyc-output-linux_unit-m50xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2337,13 +2645,293 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n16_browser_runtime_core.tgz
+          tar xvzf nyc-output-linux_unit-m50xc_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n20_browser_runtime_electron.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n20_browser_runtime_electron.tgz
+        local_file: src/nyc-output-linux_unit-m50xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m50xe_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m60xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m60xc_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m60xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m60xe_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m70xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m70xc_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m70xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m70xe_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-mlatest_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n20_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-mlatest_n20_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m42xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m42xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m44xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m44xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m44xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m44xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m50xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m50xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m50xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m50xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m60xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m60xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m60xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m60xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m60xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m70xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xc_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m70xc_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-m70xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m70xe_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-m70xe_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-mlatest_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_async_rewriter3.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-mlatest_n16_async_rewriter3.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-n20_autocomplete.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n20_autocomplete.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-n20_autocomplete.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-n16_autocomplete.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_autocomplete.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-n16_autocomplete.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-n20_browser_runtime_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n20_browser_runtime_core.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-n20_browser_runtime_core.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-n16_browser_runtime_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_browser_runtime_core.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-linux_unit-n16_browser_runtime_core.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-linux_unit-n20_browser_runtime_electron.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n20_browser_runtime_electron.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4442,8 +5030,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_autocomplete.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_autocomplete.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4451,13 +5039,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_autocomplete.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_autocomplete.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_autocomplete.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4465,13 +5053,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_autocomplete.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_browser_runtime_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_browser_runtime_core.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4479,13 +5067,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_browser_runtime_core.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_browser_runtime_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_browser_runtime_core.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4493,13 +5081,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_browser_runtime_core.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_browser_runtime_electron.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_browser_runtime_electron.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4507,13 +5095,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_browser_runtime_electron.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_browser_runtime_electron.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_browser_runtime_electron.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4521,13 +5109,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_browser_runtime_electron.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_build.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_build.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4535,13 +5123,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_build.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_build.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_build.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4549,13 +5137,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_build.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4563,13 +5151,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4577,13 +5165,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n20_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4591,13 +5179,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n20_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4605,13 +5193,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4619,13 +5207,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4633,13 +5221,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4647,13 +5235,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4661,13 +5249,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4675,13 +5263,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4689,13 +5277,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n20_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4703,13 +5291,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n20_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4717,13 +5305,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4731,13 +5319,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n16_async_rewriter3.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_async_rewriter3.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4745,13 +5333,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_async_rewriter3.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-n20_autocomplete.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_autocomplete.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4759,13 +5347,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-n20_autocomplete.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-n16_autocomplete.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_autocomplete.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4773,13 +5361,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-n16_autocomplete.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-n20_browser_runtime_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_browser_runtime_core.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4787,13 +5375,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-n20_browser_runtime_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-n16_browser_runtime_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_browser_runtime_core.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4801,13 +5389,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-n16_browser_runtime_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-n20_browser_runtime_electron.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_browser_runtime_electron.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4815,13 +5403,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-n20_browser_runtime_electron.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-n16_browser_runtime_electron.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_browser_runtime_electron.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4829,13 +5417,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-n16_browser_runtime_electron.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-n20_build.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_build.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4843,13 +5431,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-n20_build.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n16_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-n16_build.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_build.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4857,13 +5445,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n16_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-n16_build.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4871,13 +5459,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4885,13 +5473,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4899,13 +5487,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4913,13 +5501,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4927,13 +5515,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4941,13 +5529,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4955,13 +5543,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4969,13 +5557,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4983,13 +5571,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4997,13 +5585,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n20_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n20_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5011,13 +5599,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n20_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n20_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5025,13 +5613,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5039,13 +5627,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5053,13 +5641,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5067,13 +5655,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5081,13 +5669,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5095,13 +5683,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5109,13 +5697,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5123,13 +5711,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5137,13 +5725,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5151,13 +5739,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n16_e2e_tests.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_e2e_tests.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5165,13 +5753,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n16_e2e_tests.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_editor.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_editor.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5179,13 +5767,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_editor.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_editor.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_editor.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5193,13 +5781,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_editor.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_errors.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_errors.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5207,13 +5795,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_errors.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_errors.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_errors.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5221,13 +5809,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_errors.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_history.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_history.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5235,13 +5823,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_history.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_history.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_history.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5249,13 +5837,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_history.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_i18n.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_i18n.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5263,13 +5851,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_i18n.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_i18n.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_i18n.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5277,13 +5865,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_i18n.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_import_node_fetch.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_import_node_fetch.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5291,13 +5879,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_import_node_fetch.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_import_node_fetch.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_import_node_fetch.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5305,13 +5893,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_import_node_fetch.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_js_multiline_to_singleline.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_js_multiline_to_singleline.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n20_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5319,13 +5907,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_js_multiline_to_singleline.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n20_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_js_multiline_to_singleline.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_js_multiline_to_singleline.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5333,13 +5921,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_js_multiline_to_singleline.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_logging.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_logging.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5347,13 +5935,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_logging.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_logging.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_logging.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5361,13 +5949,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_logging.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5375,13 +5963,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5389,13 +5977,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5403,13 +5991,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5417,13 +6005,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5431,13 +6019,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5445,13 +6033,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5459,13 +6047,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n16_e2e_tests.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_e2e_tests.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5473,13 +6061,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_e2e_tests.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n20_editor.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_editor.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5487,13 +6075,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n20_editor.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n16_editor.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_editor.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5501,13 +6089,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n16_editor.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n20_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n20_errors.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_errors.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5515,13 +6103,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n20_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n20_errors.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n16_errors.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_errors.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5529,13 +6117,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n16_errors.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n20_history.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_history.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5543,13 +6131,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n20_history.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n16_history.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_history.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5557,13 +6145,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n16_history.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n20_i18n.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_i18n.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5571,13 +6159,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n20_i18n.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n16_i18n.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_i18n.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5585,13 +6173,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n16_i18n.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n20_import_node_fetch.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_import_node_fetch.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5599,13 +6187,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n20_import_node_fetch.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n16_import_node_fetch.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_import_node_fetch.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5613,13 +6201,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n16_import_node_fetch.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n20_js_multiline_to_singleline.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_js_multiline_to_singleline.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5627,13 +6215,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n20_js_multiline_to_singleline.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n16_js_multiline_to_singleline.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_js_multiline_to_singleline.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5641,13 +6229,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n16_js_multiline_to_singleline.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n20_logging.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_logging.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5655,13 +6243,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n20_logging.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n16_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-n16_logging.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_logging.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5669,13 +6257,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n16_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-n16_logging.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_service_provider_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_service_provider_core.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5683,13 +6271,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_service_provider_core.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_service_provider_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_service_provider_core.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5697,13 +6285,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_service_provider_core.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5711,13 +6299,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5725,13 +6313,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5739,13 +6327,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5753,13 +6341,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5767,13 +6355,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5781,13 +6369,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5795,13 +6383,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5809,13 +6397,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n20_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5823,13 +6411,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n20_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5837,13 +6425,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5851,13 +6439,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5865,13 +6453,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5879,13 +6467,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5893,13 +6481,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5907,13 +6495,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5921,13 +6509,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5935,13 +6523,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5949,13 +6537,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5963,13 +6551,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5977,13 +6565,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-n20_service_provider_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_service_provider_core.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -5991,13 +6579,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-n20_service_provider_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-n16_service_provider_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_service_provider_core.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6005,13 +6593,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-n16_service_provider_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6019,13 +6607,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6033,13 +6621,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6047,13 +6635,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6061,13 +6649,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6075,13 +6663,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6089,13 +6677,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6103,13 +6691,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6117,13 +6705,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6131,13 +6719,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6145,13 +6733,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n20_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6159,13 +6747,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n20_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n20_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6173,13 +6761,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xe_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6187,13 +6775,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6201,13 +6789,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6215,13 +6803,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xc_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6229,13 +6817,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6243,13 +6831,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xc_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6257,13 +6845,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xc_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m60xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m60xe_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6271,13 +6859,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m60xe_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m60xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xc_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6285,13 +6873,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xc_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m70xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m70xe_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6299,13 +6887,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m70xe_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m70xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n16_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6313,13 +6901,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n16_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_shell_evaluator.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_shell_evaluator.tgz
+        local_file: src/nyc-output-win32_unit-m42xc_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n20_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6327,13 +6915,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_shell_evaluator.tgz
+          tar xvzf nyc-output-win32_unit-m42xc_n20_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_shell_evaluator.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_shell_evaluator.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n20_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6341,13 +6929,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_shell_evaluator.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n20_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_snippet_manager.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_snippet_manager.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n20_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6355,13 +6943,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_snippet_manager.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n20_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_snippet_manager.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_snippet_manager.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n20_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6369,13 +6957,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_snippet_manager.tgz
+          tar xvzf nyc-output-win32_unit-m44xe_n20_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n20_types.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_types.tgz
+        local_file: src/nyc-output-win32_unit-m50xc_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n20_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6383,13 +6971,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n20_types.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n20_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n16_types.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_types.tgz
+        local_file: src/nyc-output-win32_unit-m50xe_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n20_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6397,160 +6985,111 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n16_types.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n20_shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-m60xc_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n20_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
         script: |
           set -e
-          tar cvzf full-nyc-output.tgz .nyc_output
-    - command: s3.put
+          tar xvzf nyc-output-win32_unit-m60xc_n20_shell_api.tgz
+    - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/full-nyc-output.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/full-nyc-output.tgz
+        local_file: src/nyc-output-win32_unit-m60xe_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n20_shell_api.tgz
         bucket: mciuploads
-        permissions: private
-        visibility: signed
-        content_type: application/x-gzip
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
-        env:
-          NODE_JS_VERSION: ${node_js_version}
         script: |
           set -e
-          {
-          source .evergreen/setup-env.sh
-          npm run report-coverage-ci
-          echo "Creating coverage tarball..."
-          tar cvzf coverage.tgz coverage
-          }
-    - command: s3.put
+          tar xvzf nyc-output-win32_unit-m60xe_n20_shell_api.tgz
+    - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/coverage.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/coverage.tgz
+        local_file: src/nyc-output-win32_unit-m70xc_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n20_shell_api.tgz
         bucket: mciuploads
-        permissions: private
-        visibility: signed
-        content_type: application/x-gzip
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
-        env:
-          NODE_JS_VERSION: ${node_js_version}
         script: |
           set -e
-          {
-          source .evergreen/setup-env.sh
-          npm run check-coverage
-          }
-
-  test_vscode:
+          tar xvzf nyc-output-win32_unit-m70xc_n20_shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-m70xe_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n20_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
-        env:
-          NODE_JS_VERSION: ${node_js_version}
         script: |
           set -e
-          {
-          source .evergreen/setup-env.sh
-          (cd scripts/docker && docker build -t ubuntu22.04-xvfb -f ubuntu22.04-xvfb.Dockerfile .)
-          docker run \
-            --rm -v $PWD:/tmp/build ubuntu22.04-xvfb \
-            -c 'cd /tmp/build && ./testing/test-vscode.sh'
-          }
-  test_connectivity:
-    - command: expansions.write
-      type: system
+          tar xvzf nyc-output-win32_unit-m70xe_n20_shell_api.tgz
+    - command: s3.get
       params:
-        file: tmp/expansions.yaml
-        redacted: true
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-mlatest_n20_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n20_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
-        env:
-          NODE_JS_VERSION: ${node_js_version}
-          TEST_MONGOSH_EXECUTABLE: ${test_mongosh_executable|}
-          KERBEROS_JUMPHOST_DOCKERFILE: ${kerberos_jumphost_dockerfile|}
         script: |
           set -e
-          {
-          source .evergreen/setup-env.sh
-          npm run test-connectivity
-          }
-  test_apistrict:
-    - command: expansions.write
-      type: system
+          tar xvzf nyc-output-win32_unit-mlatest_n20_shell_api.tgz
+    - command: s3.get
       params:
-        file: tmp/expansions.yaml
-        redacted: true
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-m42xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n16_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
-        env:
-          NODE_JS_VERSION: ${node_js_version}
         script: |
           set -e
-          {
-          source .evergreen/setup-env.sh
-          npm run test-apistrict-ci
-          }
-
-  ###
-  # ARTIFACT COMPILATION
-  #
-  # compile_artifact generates the executable binary and uploads it as TGZ to S3 for later use.
-  # Use download_compiled_artifact to download the TGZ from S3.
-  #
-  # Both functions expect the following arguments:
-  # - executable_os_id
-  ###
-  compile_artifact:
-    - command: expansions.write
-      type: system
-      params:
-        file: tmp/expansions.yaml
-        redacted: true
-    - command: subprocess.exec
-      params:
-        working_dir: src
-        binary: bash .evergreen/compile-artifact.sh
-        env:
-          DISTRO_ID: ${distro_id}
-          NODE_JS_VERSION: ${node_js_version}
-          MONGOSH_SHARED_OPENSSL: ${mongosh_shared_openssl}
-    - command: expansions.update
-      params:
-        ignore_missing_file: false
-        file: tmp/compiling-context.yml
-    - command: s3.put
+          tar xvzf nyc-output-win32_unit-m42xc_n16_shell_api.tgz
+    - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/dist.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/mongosh-${executable_os_id}${extra_upload_tag}.tgz
+        local_file: src/nyc-output-win32_unit-m42xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n16_shell_api.tgz
         bucket: mciuploads
-        permissions: public-read
-        content_type: application/x-gzip
-  download_compiled_artifact:
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-win32_unit-m42xe_n16_shell_api.tgz
     - command: s3.get
-      type: setup
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/dist.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/mongosh-${executable_os_id}${extra_upload_tag}.tgz
+        local_file: src/nyc-output-win32_unit-m44xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -6558,361 +7097,718 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf dist.tgz
-
-  ###
-  # E2E TEST EXECUTION
-  #
-  # Runs the E2E tests against the compiled artifact, i.e. expects the compiled artifact to be already present.
-  ###
-  run_e2e_tests:
-    - command: expansions.write
-      type: system
-      params:
-        file: tmp/expansions.yaml
-        redacted: true
-    - command: subprocess.exec
-      params:
-        working_dir: src
-        binary: bash .evergreen/run-e2e-tests.sh
-        env:
-          NODE_JS_VERSION: ${node_js_version}
-          AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
-          AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
-          DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl}
-          E2E_TASK_NAME: ${task_name}
-
-  ###
-  # PACKAGING AND UPLOADING
-  #
-  # package_and_upload_artifact generates a distributable package out of the compiled artifact,
-  # i.e. it expects it to have been downloaded already. The distributable package will be uploaded
-  # to a specifc Evergreen S3 bucket for later use.
-  #
-  # The URL to download the distributable package can be retrieved by get_artifact_url.
-  #
-  # package_and_upload_artifact expects the following arguments:
-  # - distro_id
-  # - package_variant
-  # - executable_os_id
-  #
-  # get_artifact_url expects the following arguments:
-  # - package_variant
-  ###
-  package_and_upload_artifact:
-    - command: expansions.write
-      type: setup
-      params:
-        file: tmp/expansions.yaml
-        redacted: true
-        # TODO: REPLACE WITH CALLING download_compiled_artifact BEFORE
+          tar xvzf nyc-output-win32_unit-m44xc_n16_shell_api.tgz
     - command: s3.get
-      type: setup
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/dist.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/mongosh-${executable_os_id}.tgz
+        local_file: src/nyc-output-win32_unit-m44xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n16_shell_api.tgz
         bucket: mciuploads
-    - command: subprocess.exec
+    - command: shell.exec
       params:
         working_dir: src
-        binary: bash .evergreen/package-and-upload-artifact.sh
-        env:
-          NODE_JS_VERSION: ${node_js_version}
-          DISTRO_ID_OVERRIDE: ${distro_id}
-          PACKAGE_VARIANT: ${package_variant}
-          MACOS_NOTARY_KEY: ${macos_notary_key}
-          MACOS_NOTARY_SECRET: ${macos_notary_secret}
-    - command: s3.put
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-win32_unit-m44xe_n16_shell_api.tgz
+    - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/artifact-url.txt
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/artifact-url-${package_variant}.txt
+        local_file: src/nyc-output-win32_unit-m50xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n16_shell_api.tgz
         bucket: mciuploads
-        permissions: public-read
-        content_type: application/x-gzip
-  get_artifact_url:
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-win32_unit-m50xc_n16_shell_api.tgz
     - command: s3.get
-      type: setup
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: artifact-url.txt
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/artifact-url-${source_package_variant}.txt
+        local_file: src/nyc-output-win32_unit-m50xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n16_shell_api.tgz
         bucket: mciuploads
-
-  write_preload_script:
     - command: shell.exec
-      # silent: true
-      type: setup
       params:
         working_dir: src
         shell: bash
-        env:
-          connectivity_test_atlas_username: ${connectivity_test_atlas_username}
-          connectivity_test_atlas_password: ${connectivity_test_atlas_password}
-          connectivity_test_atlas_hostname: ${connectivity_test_atlas_hostname}
         script: |
           set -e
-          .evergreen/create-preload-script.sh
-  spawn_host:
-    - command: host.create
-      type: setup
-      params:
-        provider: ec2
-        distro: ${distro}
-        security_group_ids:
-          - sg-097bff6dd0d1d31d0 # Magic string that's needed for SSH'ing.
-    - command: host.list
-      type: setup
+          tar xvzf nyc-output-win32_unit-m50xe_n16_shell_api.tgz
+    - command: s3.get
       params:
-        num_hosts: 1
-        path: buildhosts.yml # Write the host information to disk.
-        timeout_seconds: 1200
-        wait: true
-  run_pkg_tests_through_ssh:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-m60xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xc_n16_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
-      # silent: true
-      type: setup
       params:
         working_dir: src
         shell: bash
-        env:
-          __project_aws_ssh_key_value: ${__project_aws_ssh_key_value}
         script: |
           set -e
-          .evergreen/setup-ssh-key.sh
-    - command: subprocess.exec
+          tar xvzf nyc-output-win32_unit-m60xc_n16_shell_api.tgz
+    - command: s3.get
       params:
-        working_dir: src
-        binary: bash .evergreen/run-on-ssh-host.sh
-        env:
-          ADMIN_USER_NAME: ${admin_user_name}
-          ONHOST_SCRIPT_PATH: ${onhost_script_path}
-          PRELOAD_SCRIPT_PATH: ${preload_script_path}
-  test_artifact_docker:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-m60xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m60xe_n16_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
-      type: setup
       params:
         working_dir: src
         shell: bash
-        env:
-          NODE_JS_VERSION: ${node_js_version}
         script: |
           set -e
-          set -x
-          {
-          . .evergreen/setup-env.sh
-          . preload.sh
-          ./scripts/docker/build.sh ${dockerfile}
-          }
+          tar xvzf nyc-output-win32_unit-m60xe_n16_shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-m70xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xc_n16_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
-        env:
-          NODE_JS_VERSION: ${node_js_version}
         script: |
           set -e
-          set -x
-          {
-          . .evergreen/setup-env.sh
-          . preload.sh
-          ./scripts/docker/run.sh ${dockerfile} --smokeTests
-          }
-  test_artifact_macos:
+          tar xvzf nyc-output-win32_unit-m70xc_n16_shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-m70xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m70xe_n16_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
-      type: setup
       params:
         working_dir: src
         shell: bash
         script: |
           set -e
-          set -x
-          {
-          . preload.sh
-          curl -sSfL "$ARTIFACT_URL" > mongosh.zip
-          unzip mongosh.zip
-          }
+          tar xvzf nyc-output-win32_unit-m70xe_n16_shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-mlatest_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n16_shell_api.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
         script: |
           set -e
-          set -x
-          {
-          system_profiler SPSoftwareDataType # for debugging
-          . preload.sh
-          ./mongosh-*/bin/mongosh --smokeTests
-          }
-  test_artifact_rpmextract:
+          tar xvzf nyc-output-win32_unit-mlatest_n16_shell_api.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-n20_shell_evaluator.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_shell_evaluator.tgz
+        bucket: mciuploads
     - command: shell.exec
-      type: setup
       params:
         working_dir: src
         shell: bash
         script: |
           set -e
-          set -x
-          {
-          . preload.sh
-          curl -sSfL "$ARTIFACT_URL" > mongosh.rpm
-          rpm2cpio mongosh.rpm | cpio -idmv
-          }
+          tar xvzf nyc-output-win32_unit-n20_shell_evaluator.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-n16_shell_evaluator.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_shell_evaluator.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
         script: |
           set -e
-          set -x
-          {
-          . preload.sh
-          ./usr/bin/mongosh --smokeTests
-          }
-  test_artifact_debextract:
+          tar xvzf nyc-output-win32_unit-n16_shell_evaluator.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-n20_snippet_manager.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_snippet_manager.tgz
+        bucket: mciuploads
     - command: shell.exec
-      type: setup
       params:
         working_dir: src
         shell: bash
         script: |
           set -e
-          set -x
-          {
-          . preload.sh
-          curl -sSfL "$ARTIFACT_URL" > mongosh.deb
-          dpkg -x mongosh.deb .
-          }
+          tar xvzf nyc-output-win32_unit-n20_snippet_manager.tgz
+    - command: s3.get
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-n16_snippet_manager.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_snippet_manager.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
         script: |
           set -e
-          set -x
-          {
-          . preload.sh
-          ./usr/bin/mongosh --smokeTests
-          }
-
-  generate_license_and_vulnerability_report:
-    - command: expansions.write
-      type: system
+          tar xvzf nyc-output-win32_unit-n16_snippet_manager.tgz
+    - command: s3.get
       params:
-        file: tmp/expansions.yaml
-        redacted: true
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-n20_types.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n20_types.tgz
+        bucket: mciuploads
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
-        env:
-          NODE_JS_VERSION: ${node_js_version}
-          EVERGREEN_IS_PATCH: ${is_patch}
-          SNYK_TOKEN: ${snyk_token}
-          EVERGREEN_TASK_URL: https://evergreen.mongodb.com/task/${task_id}
-          JIRA_API_TOKEN: ${jira_api_token}
         script: |
           set -e
-          export NODE_JS_VERSION=${node_js_version}
-          source .evergreen/setup-env.sh
-
-          # validate licenses, we first remove THIRD_PARTY_NOTICES.md, so we are sure
-          # that we would only upload the newly generated file in case of success.
-          rm THIRD_PARTY_NOTICES.md
-          npm run update-third-party-notices
-
-          # generate vulnerability report
-          set +e
-          npm run generate-vulnerability-report
-          return_code=$?
-          set -e
-
-          # if on main and not triggered by a tag, also create a ticket for each vulnerability found
-          if [[ "${requester}" == "commit" ]]; then
-            export JIRA_BASE_URL="https://jira.mongodb.org"
-            export JIRA_PROJECT="MONGOSH"
-            export JIRA_VULNERABILITY_BUILD_INFO="- [Evergreen task|$EVERGREEN_TASK_URL]"
-            npm run create-vulnerability-tickets
-          else
-            cat .sbom/vulnerability-report.md
-          fi
-
-          # Fails if the report failed and is not a patch, including during releases:
-          if [[ "${is_patch}" != "true" ]]; then
-            exit $return_code
-          fi
-
-    - command: s3.put
+          tar xvzf nyc-output-win32_unit-n20_types.tgz
+    - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
+        local_file: src/nyc-output-win32_unit-n16_types.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_types.tgz
         bucket: mciuploads
-        permissions: private
-        visibility: signed
-        local_file: src/.sbom/dependencies.json
-        remote_file: ${project}/${revision}_${revision_order_id}/dependencies.json
-        content_type: application/json
-        optional: true
-    - command: s3.put
+    - command: shell.exec
       params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        bucket: mciuploads
-        permissions: private
-        visibility: signed
-        local_file: src/.sbom/snyk-test-result.json
-        remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.json
-        content_type: application/json
-        optional: true
-    - command: s3.put
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf nyc-output-win32_unit-n16_types.tgz
+    - command: shell.exec
       params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        bucket: mciuploads
-        permissions: private
-        visibility: signed
-        local_file: src/.sbom/snyk-test-result.html
-        remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.html
-        content_type: text/html
-        optional: true
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar cvzf full-nyc-output.tgz .nyc_output
     - command: s3.put
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
+        local_file: src/full-nyc-output.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/full-nyc-output.tgz
         bucket: mciuploads
         permissions: private
         visibility: signed
-        local_file: src/.sbom/vulnerability-report.md
-        remote_file: ${project}/${revision}_${revision_order_id}/vulnerability-report.md
-        content_type: text/markdown
-        optional: true
+        content_type: application/x-gzip
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+        script: |
+          set -e
+          {
+          source .evergreen/setup-env.sh
+          npm run report-coverage-ci
+          echo "Creating coverage tarball..."
+          tar cvzf coverage.tgz coverage
+          }
     - command: s3.put
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
+        local_file: src/coverage.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/coverage.tgz
         bucket: mciuploads
         permissions: private
         visibility: signed
-        local_file: src/THIRD_PARTY_NOTICES.md
-        remote_file: ${project}/${revision}_${revision_order_id}/THIRD_PARTY_NOTICES.md
-        content_type: text/markdown
-        optional: true
-
-  release_draft:
-    - command: expansions.write
-      type: system
-      params:
-        file: tmp/expansions.yaml
-        redacted: true
+        content_type: application/x-gzip
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
-        script: |
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+        script: |
+          set -e
+          {
+          source .evergreen/setup-env.sh
+          npm run check-coverage
+          }
+
+  test_vscode:
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+        script: |
+          set -e
+          {
+          source .evergreen/setup-env.sh
+          (cd scripts/docker && docker build -t ubuntu22.04-xvfb -f ubuntu22.04-xvfb.Dockerfile .)
+          docker run \
+            --rm -v $PWD:/tmp/build ubuntu22.04-xvfb \
+            -c 'cd /tmp/build && ./testing/test-vscode.sh'
+          }
+  test_connectivity:
+    - command: expansions.write
+      type: system
+      params:
+        file: tmp/expansions.yaml
+        redacted: true
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+          TEST_MONGOSH_EXECUTABLE: ${test_mongosh_executable|}
+          KERBEROS_JUMPHOST_DOCKERFILE: ${kerberos_jumphost_dockerfile|}
+        script: |
+          set -e
+          {
+          source .evergreen/setup-env.sh
+          npm run test-connectivity
+          }
+  test_apistrict:
+    - command: expansions.write
+      type: system
+      params:
+        file: tmp/expansions.yaml
+        redacted: true
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+        script: |
+          set -e
+          {
+          source .evergreen/setup-env.sh
+          npm run test-apistrict-ci
+          }
+
+  ###
+  # ARTIFACT COMPILATION
+  #
+  # compile_artifact generates the executable binary and uploads it as TGZ to S3 for later use.
+  # Use download_compiled_artifact to download the TGZ from S3.
+  #
+  # Both functions expect the following arguments:
+  # - executable_os_id
+  ###
+  compile_artifact:
+    - command: expansions.write
+      type: system
+      params:
+        file: tmp/expansions.yaml
+        redacted: true
+    - command: subprocess.exec
+      params:
+        working_dir: src
+        binary: bash .evergreen/compile-artifact.sh
+        env:
+          DISTRO_ID: ${distro_id}
+          NODE_JS_VERSION: ${node_js_version}
+          MONGOSH_SHARED_OPENSSL: ${mongosh_shared_openssl}
+    - command: expansions.update
+      params:
+        ignore_missing_file: false
+        file: tmp/compiling-context.yml
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/dist.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/mongosh-${executable_os_id}${extra_upload_tag}.tgz
+        bucket: mciuploads
+        permissions: public-read
+        content_type: application/x-gzip
+  download_compiled_artifact:
+    - command: s3.get
+      type: setup
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/dist.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/mongosh-${executable_os_id}${extra_upload_tag}.tgz
+        bucket: mciuploads
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          tar xvzf dist.tgz
+
+  ###
+  # E2E TEST EXECUTION
+  #
+  # Runs the E2E tests against the compiled artifact, i.e. expects the compiled artifact to be already present.
+  ###
+  run_e2e_tests:
+    - command: expansions.write
+      type: system
+      params:
+        file: tmp/expansions.yaml
+        redacted: true
+    - command: subprocess.exec
+      params:
+        working_dir: src
+        binary: bash .evergreen/run-e2e-tests.sh
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+          AWS_AUTH_IAM_ACCESS_KEY_ID: ${devtools_ci_aws_key}
+          AWS_AUTH_IAM_SECRET_ACCESS_KEY: ${devtools_ci_aws_secret}
+          DISABLE_OPENSSL_SHARED_CONFIG_FOR_BUNDLED_OPENSSL: ${disable_openssl_shared_config_for_bundled_openssl}
+          E2E_TASK_NAME: ${task_name}
+
+  ###
+  # PACKAGING AND UPLOADING
+  #
+  # package_and_upload_artifact generates a distributable package out of the compiled artifact,
+  # i.e. it expects it to have been downloaded already. The distributable package will be uploaded
+  # to a specifc Evergreen S3 bucket for later use.
+  #
+  # The URL to download the distributable package can be retrieved by get_artifact_url.
+  #
+  # package_and_upload_artifact expects the following arguments:
+  # - distro_id
+  # - package_variant
+  # - executable_os_id
+  #
+  # get_artifact_url expects the following arguments:
+  # - package_variant
+  ###
+  package_and_upload_artifact:
+    - command: expansions.write
+      type: setup
+      params:
+        file: tmp/expansions.yaml
+        redacted: true
+        # TODO: REPLACE WITH CALLING download_compiled_artifact BEFORE
+    - command: s3.get
+      type: setup
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/dist.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/mongosh-${executable_os_id}.tgz
+        bucket: mciuploads
+    - command: subprocess.exec
+      params:
+        working_dir: src
+        binary: bash .evergreen/package-and-upload-artifact.sh
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+          DISTRO_ID_OVERRIDE: ${distro_id}
+          PACKAGE_VARIANT: ${package_variant}
+          MACOS_NOTARY_KEY: ${macos_notary_key}
+          MACOS_NOTARY_SECRET: ${macos_notary_secret}
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/artifact-url.txt
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/artifact-url-${package_variant}.txt
+        bucket: mciuploads
+        permissions: public-read
+        content_type: application/x-gzip
+  get_artifact_url:
+    - command: s3.get
+      type: setup
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: artifact-url.txt
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/artifact-url-${source_package_variant}.txt
+        bucket: mciuploads
+
+  write_preload_script:
+    - command: shell.exec
+      # silent: true
+      type: setup
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          connectivity_test_atlas_username: ${connectivity_test_atlas_username}
+          connectivity_test_atlas_password: ${connectivity_test_atlas_password}
+          connectivity_test_atlas_hostname: ${connectivity_test_atlas_hostname}
+        script: |
+          set -e
+          .evergreen/create-preload-script.sh
+  spawn_host:
+    - command: host.create
+      type: setup
+      params:
+        provider: ec2
+        distro: ${distro}
+        security_group_ids:
+          - sg-097bff6dd0d1d31d0 # Magic string that's needed for SSH'ing.
+    - command: host.list
+      type: setup
+      params:
+        num_hosts: 1
+        path: buildhosts.yml # Write the host information to disk.
+        timeout_seconds: 1200
+        wait: true
+  run_pkg_tests_through_ssh:
+    - command: shell.exec
+      # silent: true
+      type: setup
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          __project_aws_ssh_key_value: ${__project_aws_ssh_key_value}
+        script: |
+          set -e
+          .evergreen/setup-ssh-key.sh
+    - command: subprocess.exec
+      params:
+        working_dir: src
+        binary: bash .evergreen/run-on-ssh-host.sh
+        env:
+          ADMIN_USER_NAME: ${admin_user_name}
+          ONHOST_SCRIPT_PATH: ${onhost_script_path}
+          PRELOAD_SCRIPT_PATH: ${preload_script_path}
+  test_artifact_docker:
+    - command: shell.exec
+      type: setup
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+        script: |
+          set -e
+          set -x
+          {
+          . .evergreen/setup-env.sh
+          . preload.sh
+          ./scripts/docker/build.sh ${dockerfile}
+          }
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+        script: |
+          set -e
+          set -x
+          {
+          . .evergreen/setup-env.sh
+          . preload.sh
+          ./scripts/docker/run.sh ${dockerfile} --smokeTests
+          }
+  test_artifact_macos:
+    - command: shell.exec
+      type: setup
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          set -x
+          {
+          . preload.sh
+          curl -sSfL "$ARTIFACT_URL" > mongosh.zip
+          unzip mongosh.zip
+          }
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          set -x
+          {
+          system_profiler SPSoftwareDataType # for debugging
+          . preload.sh
+          ./mongosh-*/bin/mongosh --smokeTests
+          }
+  test_artifact_rpmextract:
+    - command: shell.exec
+      type: setup
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          set -x
+          {
+          . preload.sh
+          curl -sSfL "$ARTIFACT_URL" > mongosh.rpm
+          rpm2cpio mongosh.rpm | cpio -idmv
+          }
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          set -x
+          {
+          . preload.sh
+          ./usr/bin/mongosh --smokeTests
+          }
+  test_artifact_debextract:
+    - command: shell.exec
+      type: setup
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          set -x
+          {
+          . preload.sh
+          curl -sSfL "$ARTIFACT_URL" > mongosh.deb
+          dpkg -x mongosh.deb .
+          }
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
+          set -e
+          set -x
+          {
+          . preload.sh
+          ./usr/bin/mongosh --smokeTests
+          }
+
+  generate_license_and_vulnerability_report:
+    - command: expansions.write
+      type: system
+      params:
+        file: tmp/expansions.yaml
+        redacted: true
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          NODE_JS_VERSION: ${node_js_version}
+          EVERGREEN_IS_PATCH: ${is_patch}
+          SNYK_TOKEN: ${snyk_token}
+          EVERGREEN_TASK_URL: https://evergreen.mongodb.com/task/${task_id}
+          JIRA_API_TOKEN: ${jira_api_token}
+        script: |
+          set -e
+          export NODE_JS_VERSION=${node_js_version}
+          source .evergreen/setup-env.sh
+
+          # validate licenses, we first remove THIRD_PARTY_NOTICES.md, so we are sure
+          # that we would only upload the newly generated file in case of success.
+          rm THIRD_PARTY_NOTICES.md
+          npm run update-third-party-notices
+
+          # generate vulnerability report
+          set +e
+          npm run generate-vulnerability-report
+          return_code=$?
+          set -e
+
+          # if on main and not triggered by a tag, also create a ticket for each vulnerability found
+          if [[ "${requester}" == "commit" ]]; then
+            export JIRA_BASE_URL="https://jira.mongodb.org"
+            export JIRA_PROJECT="MONGOSH"
+            export JIRA_VULNERABILITY_BUILD_INFO="- [Evergreen task|$EVERGREEN_TASK_URL]"
+            npm run create-vulnerability-tickets
+          else
+            cat .sbom/vulnerability-report.md
+          fi
+
+          # Fails if the report failed and is not a patch, including during releases:
+          if [[ "${is_patch}" != "true" ]]; then
+            exit $return_code
+          fi
+
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        bucket: mciuploads
+        permissions: private
+        visibility: signed
+        local_file: src/.sbom/dependencies.json
+        remote_file: ${project}/${revision}_${revision_order_id}/dependencies.json
+        content_type: application/json
+        optional: true
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        bucket: mciuploads
+        permissions: private
+        visibility: signed
+        local_file: src/.sbom/snyk-test-result.json
+        remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.json
+        content_type: application/json
+        optional: true
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        bucket: mciuploads
+        permissions: private
+        visibility: signed
+        local_file: src/.sbom/snyk-test-result.html
+        remote_file: ${project}/${revision}_${revision_order_id}/snyk-test-result.html
+        content_type: text/html
+        optional: true
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        bucket: mciuploads
+        permissions: private
+        visibility: signed
+        local_file: src/.sbom/vulnerability-report.md
+        remote_file: ${project}/${revision}_${revision_order_id}/vulnerability-report.md
+        content_type: text/markdown
+        optional: true
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        bucket: mciuploads
+        permissions: private
+        visibility: signed
+        local_file: src/THIRD_PARTY_NOTICES.md
+        remote_file: ${project}/${revision}_${revision_order_id}/THIRD_PARTY_NOTICES.md
+        content_type: text/markdown
+        optional: true
+
+  release_draft:
+    - command: expansions.write
+      type: system
+      params:
+        file: tmp/expansions.yaml
+        redacted: true
+    - command: shell.exec
+      params:
+        working_dir: src
+        shell: bash
+        script: |
           set -e
           {
           export NODE_JS_VERSION=${node_js_version}
@@ -6998,11 +7894,144 @@ tasks:
   - name: compile_ts
     commands:
       - func: checkout
-      - func: compile_ts
+      - func: compile_ts
+        vars:
+          node_js_version: "20.12.0"
+
+  - name: check
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: check
+        vars:
+          node_js_version: "20.12.0"
+
+  - name: check_coverage
+    depends_on:
+      - name: ".unit-test"
+        variant: "*"
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: check_coverage
+        vars:
+          node_js_version: "20.12.0"
+
+  ###
+  # UNIT TESTS
+  # E.g. test_m60xc_n16 stands for mongod 6.0.x, community edition, Node.js 16
+  ###
+  - name: test_n20_arg_parser
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: test
+        vars:
+          mongosh_server_test_version: ""
+          node_js_version: "20.12.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n20_arg_parser"
+          mongosh_run_only_in_package: "arg-parser"
+  - name: test_n16_arg_parser
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: ""
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_arg_parser"
+          mongosh_run_only_in_package: "arg-parser"
+  - name: test_n20_async_rewriter2
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: test
+        vars:
+          mongosh_server_test_version: ""
+          node_js_version: "20.12.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n20_async_rewriter2"
+          mongosh_run_only_in_package: "async-rewriter2"
+  - name: test_n16_async_rewriter2
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: ""
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_async_rewriter2"
+          mongosh_run_only_in_package: "async-rewriter2"
+  - name: test_m42xc_n20_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: test
+        vars:
+          mongosh_server_test_version: "4.2.x"
+          node_js_version: "20.12.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xc_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m42xe_n20_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
         vars:
           node_js_version: "20.12.0"
-
-  - name: check
+      - func: test
+        vars:
+          mongosh_server_test_version: "4.2.x-enterprise"
+          node_js_version: "20.12.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xe_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m44xc_n20_async_rewriter3
+    tags: ["unit-test"]
     depends_on:
       - name: compile_ts
         variant: linux_unit
@@ -7011,28 +8040,31 @@ tasks:
       - func: install
         vars:
           node_js_version: "20.12.0"
-      - func: check
+      - func: test
         vars:
+          mongosh_server_test_version: "4.4.x"
           node_js_version: "20.12.0"
-
-  - name: check_coverage
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xc_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m44xe_n20_async_rewriter3
+    tags: ["unit-test"]
     depends_on:
-      - name: ".unit-test"
-        variant: "*"
+      - name: compile_ts
+        variant: linux_unit
     commands:
       - func: checkout
       - func: install
         vars:
           node_js_version: "20.12.0"
-      - func: check_coverage
+      - func: test
         vars:
+          mongosh_server_test_version: "4.4.x-enterprise"
           node_js_version: "20.12.0"
-
-  ###
-  # UNIT TESTS
-  # E.g. test_m60xc_n16 stands for mongod 6.0.x, community edition, Node.js 16
-  ###
-  - name: test_n20_arg_parser
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xe_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m50xc_n20_async_rewriter3
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7044,12 +8076,12 @@ tasks:
           node_js_version: "20.12.0"
       - func: test
         vars:
-          mongosh_server_test_version: ""
+          mongosh_server_test_version: "5.0.x"
           node_js_version: "20.12.0"
           mongosh_skip_node_version_check: ""
-          mongosh_test_id: "n20_arg_parser"
-          mongosh_run_only_in_package: "arg-parser"
-  - name: test_n16_arg_parser
+          mongosh_test_id: "m50xc_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m50xe_n20_async_rewriter3
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7058,15 +8090,15 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "16.20.2"
+          node_js_version: "20.12.0"
       - func: test
         vars:
-          mongosh_server_test_version: ""
-          node_js_version: "16.20.2"
+          mongosh_server_test_version: "5.0.x-enterprise"
+          node_js_version: "20.12.0"
           mongosh_skip_node_version_check: ""
-          mongosh_test_id: "n16_arg_parser"
-          mongosh_run_only_in_package: "arg-parser"
-  - name: test_n20_async_rewriter2
+          mongosh_test_id: "m50xe_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m60xc_n20_async_rewriter3
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7078,12 +8110,80 @@ tasks:
           node_js_version: "20.12.0"
       - func: test
         vars:
-          mongosh_server_test_version: ""
+          mongosh_server_test_version: "6.0.x"
           node_js_version: "20.12.0"
           mongosh_skip_node_version_check: ""
-          mongosh_test_id: "n20_async_rewriter2"
-          mongosh_run_only_in_package: "async-rewriter2"
-  - name: test_n16_async_rewriter2
+          mongosh_test_id: "m60xc_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m60xe_n20_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: test
+        vars:
+          mongosh_server_test_version: "6.0.x-enterprise"
+          node_js_version: "20.12.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m60xe_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m70xc_n20_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: test
+        vars:
+          mongosh_server_test_version: "7.0.x"
+          node_js_version: "20.12.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m70xc_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m70xe_n20_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: test
+        vars:
+          mongosh_server_test_version: "7.0.x-enterprise"
+          node_js_version: "20.12.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m70xe_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_mlatest_n20_async_rewriter3
+    tags: ["unit-test","mlatest"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "20.12.0"
+      - func: test
+        vars:
+          mongosh_server_test_version: "latest-alpha-enterprise"
+          node_js_version: "20.12.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "mlatest_n20_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m42xc_n16_async_rewriter3
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7095,11 +8195,181 @@ tasks:
           node_js_version: "16.20.2"
       - func: test
         vars:
-          mongosh_server_test_version: ""
+          mongosh_server_test_version: "4.2.x"
           node_js_version: "16.20.2"
           mongosh_skip_node_version_check: ""
-          mongosh_test_id: "n16_async_rewriter2"
-          mongosh_run_only_in_package: "async-rewriter2"
+          mongosh_test_id: "m42xc_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m42xe_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "4.2.x-enterprise"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xe_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m44xc_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "4.4.x"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xc_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m44xe_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "4.4.x-enterprise"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xe_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m50xc_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "5.0.x"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xc_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m50xe_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "5.0.x-enterprise"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xe_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m60xc_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "6.0.x"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m60xc_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m60xe_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "6.0.x-enterprise"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m60xe_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m70xc_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "7.0.x"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m70xc_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_m70xe_n16_async_rewriter3
+    tags: ["unit-test"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "7.0.x-enterprise"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m70xe_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
+  - name: test_mlatest_n16_async_rewriter3
+    tags: ["unit-test","mlatest"]
+    depends_on:
+      - name: compile_ts
+        variant: linux_unit
+    commands:
+      - func: checkout
+      - func: install
+        vars:
+          node_js_version: "16.20.2"
+      - func: test
+        vars:
+          mongosh_server_test_version: "latest-alpha-enterprise"
+          node_js_version: "16.20.2"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "mlatest_n16_async_rewriter3"
+          mongosh_run_only_in_package: "async-rewriter3"
   - name: test_n20_autocomplete
     tags: ["unit-test"]
     depends_on:
@@ -13331,6 +14601,28 @@ buildvariants:
       - name: test_n16_arg_parser
       - name: test_n20_async_rewriter2
       - name: test_n16_async_rewriter2
+      - name: test_m42xc_n20_async_rewriter3
+      - name: test_m42xe_n20_async_rewriter3
+      - name: test_m44xc_n20_async_rewriter3
+      - name: test_m44xe_n20_async_rewriter3
+      - name: test_m50xc_n20_async_rewriter3
+      - name: test_m50xe_n20_async_rewriter3
+      - name: test_m60xc_n20_async_rewriter3
+      - name: test_m60xe_n20_async_rewriter3
+      - name: test_m70xc_n20_async_rewriter3
+      - name: test_m70xe_n20_async_rewriter3
+      - name: test_mlatest_n20_async_rewriter3
+      - name: test_m42xc_n16_async_rewriter3
+      - name: test_m42xe_n16_async_rewriter3
+      - name: test_m44xc_n16_async_rewriter3
+      - name: test_m44xe_n16_async_rewriter3
+      - name: test_m50xc_n16_async_rewriter3
+      - name: test_m50xe_n16_async_rewriter3
+      - name: test_m60xc_n16_async_rewriter3
+      - name: test_m60xe_n16_async_rewriter3
+      - name: test_m70xc_n16_async_rewriter3
+      - name: test_m70xe_n16_async_rewriter3
+      - name: test_mlatest_n16_async_rewriter3
       - name: test_n20_autocomplete
       - name: test_n16_autocomplete
       - name: test_n20_browser_repl
@@ -13503,6 +14795,26 @@ buildvariants:
       - name: test_n16_arg_parser
       - name: test_n20_async_rewriter2
       - name: test_n16_async_rewriter2
+      - name: test_m42xc_n20_async_rewriter3
+      - name: test_m44xc_n20_async_rewriter3
+      - name: test_m44xe_n20_async_rewriter3
+      - name: test_m50xc_n20_async_rewriter3
+      - name: test_m50xe_n20_async_rewriter3
+      - name: test_m60xc_n20_async_rewriter3
+      - name: test_m60xe_n20_async_rewriter3
+      - name: test_m70xc_n20_async_rewriter3
+      - name: test_m70xe_n20_async_rewriter3
+      - name: test_mlatest_n20_async_rewriter3
+      - name: test_m42xc_n16_async_rewriter3
+      - name: test_m44xc_n16_async_rewriter3
+      - name: test_m44xe_n16_async_rewriter3
+      - name: test_m50xc_n16_async_rewriter3
+      - name: test_m50xe_n16_async_rewriter3
+      - name: test_m60xc_n16_async_rewriter3
+      - name: test_m60xe_n16_async_rewriter3
+      - name: test_m70xc_n16_async_rewriter3
+      - name: test_m70xe_n16_async_rewriter3
+      - name: test_mlatest_n16_async_rewriter3
       - name: test_n20_autocomplete
       - name: test_n16_autocomplete
       - name: test_n20_browser_runtime_core
@@ -13949,6 +15261,28 @@ buildvariants:
       - name: test_n16_arg_parser
       - name: test_n20_async_rewriter2
       - name: test_n16_async_rewriter2
+      - name: test_m42xc_n20_async_rewriter3
+      - name: test_m42xe_n20_async_rewriter3
+      - name: test_m44xc_n20_async_rewriter3
+      - name: test_m44xe_n20_async_rewriter3
+      - name: test_m50xc_n20_async_rewriter3
+      - name: test_m50xe_n20_async_rewriter3
+      - name: test_m60xc_n20_async_rewriter3
+      - name: test_m60xe_n20_async_rewriter3
+      - name: test_m70xc_n20_async_rewriter3
+      - name: test_m70xe_n20_async_rewriter3
+      - name: test_mlatest_n20_async_rewriter3
+      - name: test_m42xc_n16_async_rewriter3
+      - name: test_m42xe_n16_async_rewriter3
+      - name: test_m44xc_n16_async_rewriter3
+      - name: test_m44xe_n16_async_rewriter3
+      - name: test_m50xc_n16_async_rewriter3
+      - name: test_m50xe_n16_async_rewriter3
+      - name: test_m60xc_n16_async_rewriter3
+      - name: test_m60xe_n16_async_rewriter3
+      - name: test_m70xc_n16_async_rewriter3
+      - name: test_m70xe_n16_async_rewriter3
+      - name: test_mlatest_n16_async_rewriter3
       - name: test_n20_autocomplete
       - name: test_n16_autocomplete
       - name: test_n20_browser_runtime_core
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index 7175abd98..cc18aa6e2 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -158,7 +158,7 @@ functions:
         script: |
           source .evergreen/setup-env.sh
           npm run compile
-          tar cvzf compiled-ts.tgz packages/*/{lib,dist}
+          tar cvzf compiled-ts.tgz packages/*/{lib,dist,pkg,target}
     - command: s3.put
       params:
         aws_key: ${aws_key}
diff --git a/.evergreen/install-node.sh b/.evergreen/install-node.sh
index be6aaa2ac..074f113c2 100755
--- a/.evergreen/install-node.sh
+++ b/.evergreen/install-node.sh
@@ -19,6 +19,10 @@ else
   if which realpath; then # No realpath on macOS, but also not needed there
     export HOME="$(realpath "$HOME")" # Needed to de-confuse nvm when /home is a symlink
   fi
+
+  echo "Setting up Rust"
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh /dev/stdin -y
+
   # Some Node.js driver versions leave a ~/.npmrc file lying around
   # that breaks nvm because it contains a 'prefix=' option (pointing
   # to a directory that no longer exists anyway).
diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh
index 92e7d0b2f..7d68972c3 100755
--- a/.evergreen/setup-env.sh
+++ b/.evergreen/setup-env.sh
@@ -9,6 +9,8 @@ if [ "$OS" != "Windows_NT" ]; then
   if which realpath; then # No realpath on macOS, but also not needed there
     export HOME="$(realpath "$HOME")" # Needed to de-confuse nvm when /home is a symlink
   fi
+  source $HOME/.cargo/env
+
   export NVM_DIR="$BASEDIR/.nvm"
   echo "Setting NVM environment home: $NVM_DIR"
   [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
diff --git a/config/webpack.base.config.js b/config/webpack.base.config.js
index 90058c95f..715661801 100644
--- a/config/webpack.base.config.js
+++ b/config/webpack.base.config.js
@@ -11,7 +11,11 @@ module.exports = {
         test: /\.ts$/,
         use: [{ loader: 'ts-loader' }],
         exclude: [/node_modules/]
-      }
+      },
+      /*{
+        test: /\.wasm$/,
+        type: 'asset/source',
+      },*/
     ]
   },
 
@@ -51,6 +55,7 @@ module.exports = {
   },
 
   output: {
+    chunkFormat: false,
     strictModuleErrorHandling: true,
     strictModuleExceptionHandling: true,
   },
@@ -63,5 +68,9 @@ module.exports = {
       analyzerMode: 'static',
       openAnalyzer: false
     })
-  ]
+  ],
+
+  experiments: {
+    asyncWebAssembly: true
+  },
 };
diff --git a/package-lock.json b/package-lock.json
index fe4f25793..7926b2a5f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "workspaces": [
         "configs/eslint-config-mongosh",
         "configs/tsconfig-mongosh",
+        "packages/async-rewriter3",
         "scripts/docker",
         "packages/async-rewriter2",
         "packages/build",
@@ -6979,6 +6980,10 @@
       "resolved": "packages/async-rewriter2",
       "link": true
     },
+    "node_modules/@mongosh/async-rewriter3": {
+      "resolved": "packages/async-rewriter3",
+      "link": true
+    },
     "node_modules/@mongosh/autocomplete": {
       "resolved": "packages/autocomplete",
       "link": true
@@ -10792,6 +10797,89 @@
       "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==",
       "dev": true
     },
+    "node_modules/@wasm-tool/wasm-pack-plugin": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@wasm-tool/wasm-pack-plugin/-/wasm-pack-plugin-1.7.0.tgz",
+      "integrity": "sha512-WikzYsw7nTd5CZxH75h7NxM/FLJAgqfWt+/gk3EL3wYKxiIlpMIYPja+sHQl3ARiicIYy4BDfxkbAVjRYlouTA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "command-exists": "^1.2.7",
+        "watchpack": "^2.1.1",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/@wasm-tool/wasm-pack-plugin/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@wasm-tool/wasm-pack-plugin/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@wasm-tool/wasm-pack-plugin/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@wasm-tool/wasm-pack-plugin/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@wasm-tool/wasm-pack-plugin/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@wasm-tool/wasm-pack-plugin/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@wasm-tool/wasm-pack-plugin/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
@@ -30862,6 +30950,19 @@
         "node": ">=14.15.1"
       }
     },
+    "packages/async-rewriter3": {
+      "name": "@mongosh/async-rewriter3",
+      "version": "0.0.0-dev.0",
+      "license": "Apache-2.0",
+      "devDependencies": {
+        "@wasm-tool/wasm-pack-plugin": "^1.7.0",
+        "depcheck": "^1.4.3",
+        "webpack-merge": "^5.8.0"
+      },
+      "engines": {
+        "node": ">=14.15.1"
+      }
+    },
     "packages/autocomplete": {
       "name": "@mongosh/autocomplete",
       "version": "0.0.0-dev.0",
@@ -31729,6 +31830,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@mongosh/async-rewriter2": "0.0.0-dev.0",
+        "@mongosh/async-rewriter3": "0.0.0-dev.0",
         "@mongosh/history": "0.0.0-dev.0",
         "@mongosh/shell-api": "0.0.0-dev.0"
       },
@@ -37330,6 +37432,14 @@
         "prettier": "^2.8.8"
       }
     },
+    "@mongosh/async-rewriter3": {
+      "version": "file:packages/async-rewriter3",
+      "requires": {
+        "@wasm-tool/wasm-pack-plugin": "^1.7.0",
+        "depcheck": "^1.4.3",
+        "webpack-merge": "^5.8.0"
+      }
+    },
     "@mongosh/autocomplete": {
       "version": "file:packages/autocomplete",
       "requires": {
@@ -37952,6 +38062,7 @@
         "@mongodb-js/prettier-config-devtools": "^1.0.1",
         "@mongodb-js/tsconfig-mongosh": "^1.0.0",
         "@mongosh/async-rewriter2": "0.0.0-dev.0",
+        "@mongosh/async-rewriter3": "0.0.0-dev.0",
         "@mongosh/history": "0.0.0-dev.0",
         "@mongosh/shell-api": "0.0.0-dev.0",
         "@mongosh/types": "0.0.0-dev.0",
@@ -41098,6 +41209,76 @@
       "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==",
       "dev": true
     },
+    "@wasm-tool/wasm-pack-plugin": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@wasm-tool/wasm-pack-plugin/-/wasm-pack-plugin-1.7.0.tgz",
+      "integrity": "sha512-WikzYsw7nTd5CZxH75h7NxM/FLJAgqfWt+/gk3EL3wYKxiIlpMIYPja+sHQl3ARiicIYy4BDfxkbAVjRYlouTA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "command-exists": "^1.2.7",
+        "watchpack": "^2.1.1",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+          "dev": true
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.11.6",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
diff --git a/package.json b/package.json
index 95be43e41..df9eefd27 100644
--- a/package.json
+++ b/package.json
@@ -128,6 +128,7 @@
   "workspaces": [
     "configs/eslint-config-mongosh",
     "configs/tsconfig-mongosh",
+    "packages/async-rewriter3",
     "scripts/docker",
     "packages/async-rewriter2",
     "packages/build",
diff --git a/packages/async-rewriter3/.gitignore b/packages/async-rewriter3/.gitignore
new file mode 100644
index 000000000..747ad0650
--- /dev/null
+++ b/packages/async-rewriter3/.gitignore
@@ -0,0 +1,4 @@
+
+dist
+pkg
+target
diff --git a/packages/async-rewriter3/Cargo.lock b/packages/async-rewriter3/Cargo.lock
new file mode 100644
index 000000000..f623b28fc
--- /dev/null
+++ b/packages/async-rewriter3/Cargo.lock
@@ -0,0 +1,538 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
+
+[[package]]
+name = "async-rewriter3"
+version = "0.1.0"
+dependencies = [
+ "rslint_parser",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bumpalo"
+version = "3.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "colored"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
+dependencies = [
+ "lazy_static",
+ "windows-sys",
+]
+
+[[package]]
+name = "erasable"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f11890ce181d47a64e5d1eb4b6caba0e7bae911a356723740d058a5d0340b7d"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lexical"
+version = "5.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f404a90a744e32e8be729034fc33b90cf2a56418fbf594d69aa3c0214ad414e5"
+dependencies = [
+ "cfg-if",
+ "lexical-core",
+]
+
+[[package]]
+name = "lexical-core"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe"
+dependencies = [
+ "arrayvec",
+ "bitflags",
+ "cfg-if",
+ "ryu",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "num-bigint"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rowan"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0734142c18710f7214dc21908e2f054e973b908dbb1a602a3e6691615aaaae"
+dependencies = [
+ "hashbrown",
+ "rustc-hash",
+ "smol_str",
+ "text-size",
+ "triomphe",
+]
+
+[[package]]
+name = "rslint_errors"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9af98fe431564308331574c2a5457d360fd3bc56e9314b8386e9b36f28cf0c3a"
+dependencies = [
+ "colored",
+ "rslint_rowan",
+ "rslint_text_edit",
+ "termcolor",
+ "unicode-width",
+]
+
+[[package]]
+name = "rslint_lexer"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c35d2e4bf39c8669dfc24b6d1886e00beb931aacb46b9dba65beb7b8d2ba4f"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "rslint_errors",
+ "rslint_syntax",
+]
+
+[[package]]
+name = "rslint_parser"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21563e0df87aa30700615a6d1262dd0ce0c8b207e7caec3fb4a1ab455bf891ab"
+dependencies = [
+ "lexical",
+ "num-bigint",
+ "rslint_errors",
+ "rslint_lexer",
+ "rslint_rowan",
+ "rslint_syntax",
+]
+
+[[package]]
+name = "rslint_rowan"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2de60577b88df53597d840c39463418df3a1891dab6e0a70b1cea59bdc57329"
+dependencies = [
+ "erasable",
+ "rustc-hash",
+ "slice-dst",
+ "smol_str",
+ "text-size",
+]
+
+[[package]]
+name = "rslint_syntax"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef4e7347949e798c91080a042b3e37f2e135fec3d3170a0ae2bf57d91826a79e"
+
+[[package]]
+name = "rslint_text_edit"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7484b77973d9a416510a5d968c394972b5c6ec548c56ce6361c61b8f6745789f"
+dependencies = [
+ "rowan",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "ryu"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.197"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.197"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "slice-dst"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec1a6721a6d7c2997cea654e3eda6a827432c5dd0a0ed923ddd9b1d691203412"
+dependencies = [
+ "autocfg",
+ "erasable",
+]
+
+[[package]]
+name = "smol_str"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "syn"
+version = "2.0.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "text-size"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
+
+[[package]]
+name = "triomphe"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
diff --git a/packages/async-rewriter3/Cargo.toml b/packages/async-rewriter3/Cargo.toml
new file mode 100644
index 000000000..0af3e1e40
--- /dev/null
+++ b/packages/async-rewriter3/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "async-rewriter3"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib"]
+
+# adapted from https://github.com/rustwasm/rust-webpack-template/blob/24f3af83206b52e0241d95ee10cebf930ec8bf08/template/Cargo.toml
+[dependencies]
+rslint_parser = "0.3.1"
+wasm-bindgen = "0.2.92"
+
+[profile.release]
+lto = true
diff --git a/packages/async-rewriter3/index.d.ts b/packages/async-rewriter3/index.d.ts
new file mode 100644
index 000000000..a89977678
--- /dev/null
+++ b/packages/async-rewriter3/index.d.ts
@@ -0,0 +1,4 @@
+export = class AsyncRewriter {
+  process(code: string): Promise<string>;
+  runtimeSupportCode(): string;
+}
diff --git a/packages/async-rewriter3/lib/index.js b/packages/async-rewriter3/lib/index.js
new file mode 100644
index 000000000..edf85c55b
--- /dev/null
+++ b/packages/async-rewriter3/lib/index.js
@@ -0,0 +1,34 @@
+'use strict';
+const v8 = require('v8');
+if (typeof __webpack_require__ !== 'undefined') {
+  __webpack_require__.v = async(exports, wasmModuleId, wasmModuleHash, importsObj) => {
+    const bytes = Buffer.from(ExtraAssets[`${wasmModuleHash}.module.wasm`], 'base64');
+    const res = await WebAssembly.instantiate(bytes, importsObj);
+    return Object.assign(exports, res.instance.exports);
+  };
+}
+
+let importPromise;
+if (v8.startupSnapshot?.isBuildingSnapshot?.()) {
+  v8.startupSnapshot.addDeserializeCallback(() => {
+    importPromise = import('../pkg/index.js');
+  });
+} else {
+  importPromise = import('../pkg/index.js');
+}
+
+module.exports = class AsyncWriter {
+  async process(code) {
+    if (!importPromise) {
+      throw new Error('WASM import not defined' +
+        v8.startupSnapshot?.isBuildingSnapshot?.() ?
+          ' (not supported while snapshotting)' :
+          '');
+    }
+    const { async_rewrite } = await importPromise;
+    return async_rewrite(code, false);
+  }
+  runtimeSupportCode() {
+    return '';
+  }
+};
diff --git a/packages/async-rewriter3/package.json b/packages/async-rewriter3/package.json
new file mode 100644
index 000000000..242557381
--- /dev/null
+++ b/packages/async-rewriter3/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "@mongosh/async-rewriter3",
+  "version": "0.0.0-dev.0",
+  "description": "MongoDB Shell Async Rewriter Package",
+  "homepage": "https://github.com/mongodb-js/mongosh",
+  "license": "Apache-2.0",
+  "main": "dist/index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mongodb-js/mongosh"
+  },
+  "engines": {
+    "node": ">=14.15.1"
+  },
+  "scripts": {
+    "compile": "npm run webpack-build",
+    "prewebpack": "rm -rf dist pkg",
+    "webpack": "webpack",
+    "postwebpack": "rm -f dist/*.html && node scripts/webpack-include-wasm.js",
+    "webpack-build": "npm run webpack -- --mode production",
+    "webpack-build-dev": "npm run webpack -- --mode development"
+  },
+  "devDependencies": {
+    "@wasm-tool/wasm-pack-plugin": "^1.7.0",
+    "depcheck": "^1.4.3",
+    "webpack-merge": "^5.8.0"
+  }
+}
diff --git a/packages/async-rewriter3/scripts/webpack-include-wasm.js b/packages/async-rewriter3/scripts/webpack-include-wasm.js
new file mode 100644
index 000000000..547914c98
--- /dev/null
+++ b/packages/async-rewriter3/scripts/webpack-include-wasm.js
@@ -0,0 +1,16 @@
+'use strict';
+const { readFileSync, readdirSync, writeFileSync } = require('fs');
+const path = require('path');
+
+const dist = path.join(__dirname, '..', 'dist');
+const files = Object.create(null);
+for (const file of readdirSync(dist)) {
+  const filename = path.join(dist, file);
+  if (filename.endsWith('.wasm')) {
+    files[file] = readFileSync(filename).toString('base64');
+  }
+}
+
+const indexFilename = path.join(dist, 'index.js')
+const indexPrev = readFileSync(indexFilename, 'utf8');
+writeFileSync(indexFilename, `((ExtraAssets) => { ${indexPrev}; })(${JSON.stringify(files)});`);
diff --git a/packages/async-rewriter3/src/lib.rs b/packages/async-rewriter3/src/lib.rs
new file mode 100644
index 000000000..a164d32ae
--- /dev/null
+++ b/packages/async-rewriter3/src/lib.rs
@@ -0,0 +1,395 @@
+use std::{borrow::Borrow, collections::VecDeque};
+use wasm_bindgen::prelude::*;
+use rslint_parser::{ast::{ArrowExpr, AssignExpr, CallExpr, ClassDecl, Expr, ExprOrBlock, ExprStmt, FnDecl, FnExpr, ObjectPatternProp, Pattern, PropName, ReturnStmt, UnaryExpr, VarDecl}, parse_text, AstNode, SyntaxNode, TextSize};
+
+#[derive(Debug)]
+enum InsertionText {
+    Static(&'static str),
+    Dynamic(String)
+}
+
+#[derive(Debug)]
+struct Insertion {
+    offset: TextSize,
+    text: InsertionText,
+    original_ordering: Option<u32>
+}
+
+impl Insertion {
+    pub const fn new(offset: TextSize, text: &'static str) -> Insertion {
+        Insertion {
+            offset,
+            text: InsertionText::Static(text),
+            original_ordering: None
+        }
+    }
+
+    pub const fn new_dynamic(offset: TextSize, text: String) -> Insertion {
+        Insertion {
+            offset,
+            text: InsertionText::Dynamic(text),
+            original_ordering: None
+        }
+    }
+}
+
+struct InsertionList {
+    list: VecDeque<Insertion>,
+    vars: Vec<String>
+}
+
+impl InsertionList {
+    pub const fn new() -> InsertionList {
+        InsertionList {
+            list: VecDeque::new(),
+            vars: Vec::new()
+        }
+    }
+
+    fn append(&mut self, other: &mut Self) {
+        self.list.append(&mut other.list);
+        self.vars.append(&mut other.vars);
+    }
+
+    fn push_back(&mut self, insertion: Insertion) {
+        self.list.push_back(insertion);
+    }
+
+    fn pop_back(&mut self) {
+        self.list.pop_back();
+    }
+
+    fn add_variable(&mut self, variable: String) {
+        self.vars.push(variable);
+    }
+}
+
+fn is_block(body: &ExprOrBlock) -> bool {
+    return matches!(body, ExprOrBlock::Block(_));
+}
+
+fn make_start_fn_insertion(offset: TextSize) -> Insertion {
+    Insertion::new(offset, r#"
+    ;const _syntheticPromise = Symbol.for('@@mongosh.syntheticPromise');
+
+    function _markSyntheticPromise(p) {
+        return Object.defineProperty(p, _syntheticPromise, {
+            value: true,
+        });
+    }
+
+    function _isp(p) {
+        return p && p[_syntheticPromise];
+    }
+
+    let _functionState = 'sync', _synchronousReturnValue, _ex;
+
+    const _asynchronousReturnValue = (async () => {
+    try {
+    "#
+)
+}
+
+fn make_end_fn_insertion(offset: TextSize) -> Insertion {
+    Insertion::new(
+        offset,
+        r#"
+        } catch (err) {
+            if (_functionState === 'sync') {
+                // Forward synchronous exceptions.
+                _synchronousReturnValue = err;
+                _functionState = 'threw';
+            } else {
+                throw err;
+            }
+            } finally {
+            if (_functionState !== 'threw') {
+                _functionState = 'returned';
+            }
+        }
+
+        })();
+
+        if (_functionState === 'returned') {
+            return _synchronousReturnValue;
+        } else if (_functionState === 'threw') {
+            throw _synchronousReturnValue;
+        }
+
+        _functionState = 'async';
+        return _markSyntheticPromise(_asynchronousReturnValue);
+        "#
+    )
+}
+
+fn fn_start_insertion(body: &ExprOrBlock) -> InsertionList {
+    let mut ret = InsertionList::new();
+    let mut offset = body.syntax().text_range().start();
+    if !is_block(body) {
+        ret.push_back(Insertion::new(offset, "{"));
+    } else {
+        offset = offset.checked_add(1.into()).unwrap();
+    }
+    ret.push_back(make_start_fn_insertion(offset));
+    if !is_block(body) {
+        ret.push_back(Insertion::new(
+            offset,
+             "return ("
+        ));
+    }
+    ret
+}
+fn fn_end_insertion(body: &ExprOrBlock) -> InsertionList {
+    let mut ret = InsertionList::new();
+    let mut offset = body.syntax().text_range().end();
+    if is_block(body) {
+        offset = offset.checked_sub(1.into()).unwrap();
+    } else {
+        ret.push_back(Insertion::new(offset, ");"));
+    }
+    ret.push_back(make_end_fn_insertion(offset));
+    if !is_block(body) {
+        ret.push_back(Insertion::new(offset, "}"));
+    }
+    ret
+}
+
+fn add_all_variables_from_declaration(patterns: impl Iterator<Item = impl Borrow<Pattern>>) -> InsertionList {
+    let mut ret = InsertionList::new();
+    for pattern in patterns {
+        match pattern.borrow() {
+            Pattern::SinglePattern(p) => {
+                p.name().map(|name| ret.add_variable(name.to_string()));
+            },
+            Pattern::RestPattern(p) => {
+                if let Some(pat) = p.pat() {
+                    ret.append(&mut add_all_variables_from_declaration([&pat].into_iter()));
+                }
+            },
+            Pattern::AssignPattern(p) => {
+                if let Some(key) = p.key() {
+                    ret.append(&mut add_all_variables_from_declaration([&key].into_iter()));
+                }
+            },
+            Pattern::ObjectPattern(p) => {
+                for element in p.elements() {
+                    match element {
+                        ObjectPatternProp::AssignPattern(p) => {
+                            ret.append(&mut add_all_variables_from_declaration([&Pattern::AssignPattern(p)].into_iter()));
+                        }
+                        ObjectPatternProp::KeyValuePattern(p) => {
+                            if let Some(key) = p.key() {
+                                match key {
+                                    PropName::Ident(ident) => {
+                                        ret.add_variable(ident.text());
+                                    }
+                                    PropName::Computed(_) => panic!(),
+                                    PropName::Literal(_) => panic!(),
+                                }
+                            }
+                        },
+                        ObjectPatternProp::RestPattern(p) => {
+                            ret.append(&mut add_all_variables_from_declaration([&Pattern::RestPattern(p)].into_iter()));
+                        },
+                        ObjectPatternProp::SinglePattern(p) => {
+                            ret.append(&mut add_all_variables_from_declaration([&Pattern::SinglePattern(p)].into_iter()));
+                        },
+                    }
+                }
+            },
+            Pattern::ArrayPattern(p) => {
+                ret.append(&mut add_all_variables_from_declaration(p.elements()));
+            },
+            Pattern::ExprPattern(_) => panic!(),
+        }
+    }
+    ret
+}
+
+fn collect_insertions(node: &SyntaxNode, nesting_depth: u32) -> InsertionList {
+    let is_function_node = FnExpr::can_cast(node.kind()) || FnDecl::can_cast(node.kind()) || ArrowExpr::can_cast(node.kind());
+    let has_function_parent = nesting_depth > 0;
+    let mut insertions = InsertionList::new();
+    for child in node.children() {
+        let range = child.text_range();
+        let child_insertions = &mut collect_insertions(&child, nesting_depth + if is_function_node { 1 } else { 0 });
+        if FnDecl::can_cast(child.kind()) {
+            let as_fn = FnDecl::cast(child).unwrap();
+            let body = ExprOrBlock::Block(as_fn.body().unwrap());
+            if !has_function_parent {
+                match as_fn.ident_token() {
+                    None => {},
+                    Some(name) => {
+                        insertions.push_back(Insertion::new_dynamic(range.start(),
+                            [name.text(), " = "].concat()
+                        ));
+                        insertions.add_variable(name.to_string());
+                    }
+                }
+            }
+            if as_fn.async_token().is_none() {
+                insertions.append(&mut fn_start_insertion(&body));
+                insertions.append(child_insertions);
+                insertions.append(&mut fn_end_insertion(&body));
+            } else {
+                insertions.append(child_insertions);
+            }
+            continue;
+        }
+        if ClassDecl::can_cast(child.kind()) && !has_function_parent {
+            let as_class_decl = ClassDecl::cast(child).unwrap();
+            match as_class_decl.name() {
+                None => {},
+                Some(name) => {
+                    insertions.push_back(Insertion::new_dynamic(range.start(),
+                        [name.text().as_str(), " = "].concat()
+                    ));
+                    insertions.add_variable(name.to_string());
+                }
+            }
+            insertions.append(child_insertions);
+            continue;
+        }
+        if VarDecl::can_cast(child.kind()) && !has_function_parent {
+            let as_var_decl = VarDecl::cast(child).unwrap();
+            let declarator_range =
+                as_var_decl.const_token().map(|t| t.text_range())
+                .or(as_var_decl.let_token().map(|t| t.text_range()))
+                .or(as_var_decl.var_token().map(|t| t.text_range()));
+
+            if declarator_range.is_some() {
+                insertions.push_back(Insertion::new(declarator_range.unwrap().start(), "/*"));
+                insertions.push_back(Insertion::new(declarator_range.unwrap().end(), "*/("));
+                insertions.append(&mut add_all_variables_from_declaration(as_var_decl.declared().filter_map(|d| d.pattern())));
+            }
+            insertions.append(child_insertions);
+            if declarator_range.is_some() {
+                insertions.push_back(Insertion::new(as_var_decl.declared().map(|d| d.range().end()).max().unwrap(), ")"));
+            }
+            continue;
+        }
+        if ExprStmt::can_cast(child.kind()) && !has_function_parent {
+            let as_expr_stmt = ExprStmt::cast(child).unwrap();
+            let expr_range = as_expr_stmt.expr().map(|e| e.syntax().text_range());
+            if let Some(start) = expr_range.map(|r| r.start()) {
+                insertions.push_back(Insertion::new(start, "_cr = ("));
+            }
+            insertions.append(child_insertions);
+            if let Some(end) = expr_range.map(|r| r.end()) {
+                insertions.push_back(Insertion::new(end, ")"));
+            }
+            continue;
+        }
+
+        match Expr::cast(child) {
+            None => {
+                insertions.append(child_insertions);
+            }
+            Some(as_expr) => {
+                let is_returned_expression = ReturnStmt::can_cast(as_expr.syntax().parent().unwrap().kind());
+                let is_called_expression = CallExpr::can_cast(as_expr.syntax().parent().unwrap().kind());
+                let mut is_dot_call_expression = false;
+                if is_returned_expression {
+                    insertions.push_back(Insertion::new(range.start(), "(_synchronousReturnValue = "));
+                }
+                let is_lhs_of_assign_expr = (AssignExpr::can_cast(as_expr.syntax().parent().unwrap().kind()) &&
+                    AssignExpr::cast(as_expr.syntax().parent().unwrap()).unwrap().lhs().unwrap().syntax().text_range() ==
+                    as_expr.syntax().text_range()) || UnaryExpr::can_cast(as_expr.syntax().parent().unwrap().kind());
+
+                if !is_lhs_of_assign_expr {
+                    insertions.push_back(Insertion::new(range.start(), "(_ex = "));
+                }
+
+                match as_expr {
+                    Expr::ArrowExpr(as_fn) => {
+                        if as_fn.async_token().is_none() {
+                            let body = as_fn.body().unwrap();
+                            insertions.append(&mut fn_start_insertion(&body));
+                            insertions.append(child_insertions);
+                            insertions.append(&mut fn_end_insertion(&body));
+                        }
+                    }
+                    Expr::FnExpr(as_fn) => {
+                        if as_fn.async_token().is_none() {
+                            let body = ExprOrBlock::Block(as_fn.body().unwrap());
+                            insertions.append(&mut fn_start_insertion(&body));
+                            insertions.append(child_insertions);
+                            insertions.append(&mut fn_end_insertion(&body));
+                        }
+                    },
+                    Expr::DotExpr(_) => {
+                        if is_called_expression {
+                            is_dot_call_expression = true;
+                            insertions.pop_back();
+                        }
+                        insertions.append(child_insertions);
+                    }
+                    _ => {
+                        insertions.append(child_insertions);
+                    },
+                }
+                if !is_dot_call_expression && !is_lhs_of_assign_expr {
+                    insertions.push_back(Insertion::new(range.end(), ", _isp(_ex) ? await _ex : _ex)"));
+                }
+                if is_returned_expression {
+                    insertions.push_back(Insertion::new(
+                        range.end(),
+                        ", _functionState === 'async' ? _synchronousReturnValue : null)"
+                    ));
+                }
+            }
+        }
+    }
+    return insertions;
+}
+
+#[wasm_bindgen]
+pub fn async_rewrite(input: String, with_debug_tags: bool) -> String {
+    let parsed = parse_text(input.as_str(), 0);
+    let mut insertions = InsertionList::new();
+    let mut collected_insertions = collect_insertions(&parsed.syntax(), 0);
+    {
+        let vars = &collected_insertions.vars;
+        for var in vars {
+            insertions.push_back(Insertion::new_dynamic(TextSize::new(0), [
+                "var ", var.as_str(), ";"
+            ].concat()));
+        }
+    }
+    let end = input.len().try_into().unwrap();
+    insertions.push_back(Insertion::new(TextSize::new(0), "(() => {"));
+    insertions.push_back(make_start_fn_insertion(TextSize::new(0)));
+    insertions.push_back(Insertion::new(TextSize::new(0), "var _cr;"));
+    insertions.append(&mut collected_insertions);
+    insertions.push_back(Insertion::new(TextSize::new(end), "; return _synchronousReturnValue = _cr;"));
+    insertions.push_back(make_end_fn_insertion(input.len().try_into().unwrap()));
+    insertions.push_back(Insertion::new(TextSize::new(end), "})()"));
+
+    let mut i = 0;
+    for insertion in &mut insertions.list {
+        i += 1;
+        insertion.original_ordering = Some(i);
+    }
+    insertions.list.make_contiguous().sort_by(|a, b| a.offset.cmp(&b.offset));
+
+    let mut result = input.to_string();
+    let mut debug_tag = "".to_string();
+    for insertion in insertions.list.iter().rev() {
+        let text;
+        match &insertion.text {
+            InsertionText::Dynamic(str) => { text = str.as_str(); }
+            InsertionText::Static(str) => { text = str; }
+        }
+        let (before, after) = result.split_at(insertion.offset.into());
+        if with_debug_tags {
+            debug_tag = [
+                "/*i", insertion.original_ordering.unwrap().to_string().as_str(), "@",
+                u32::from(insertion.offset).to_string().as_str(),
+                if text.contains("/*") { "" } else { "*/" }
+            ].concat();
+        }
+        result = [before, debug_tag.as_str(), text, debug_tag.as_str(), after].concat();
+    }
+
+    result
+}
diff --git a/packages/async-rewriter3/webpack.config.js b/packages/async-rewriter3/webpack.config.js
new file mode 100644
index 000000000..be28b0162
--- /dev/null
+++ b/packages/async-rewriter3/webpack.config.js
@@ -0,0 +1,23 @@
+'use strict';
+const { merge } = require('webpack-merge');
+const path = require('path');
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
+
+const baseWebpackConfig = require('../../config/webpack.base.config');
+
+/** @type import('webpack').Configuration */
+const config = {
+  output: {
+    path: path.resolve(__dirname, 'dist'),
+    filename: 'index.js',
+    library: {
+      type: 'commonjs2',
+    },
+  },
+  plugins: [new WasmPackPlugin({
+    crateDirectory: __dirname
+  })],
+  entry: './lib/index.js',
+};
+
+module.exports = merge(baseWebpackConfig, config);
diff --git a/packages/cli-repl/src/smoke-tests.ts b/packages/cli-repl/src/smoke-tests.ts
index afe24638b..dfe0ef5c7 100644
--- a/packages/cli-repl/src/smoke-tests.ts
+++ b/packages/cli-repl/src/smoke-tests.ts
@@ -176,9 +176,9 @@ export async function runSmokeTests({
       perfTestIterations: 0,
     },
     {
-      name: 'async_rewrite',
+      name: 'async_rewrite_foreach',
       input:
-        'for (let i = 0; i < 100; i++) __asyncRewrite(String([].forEach)); print("done")',
+        'for (let i = 0; i < 100; i++) __asyncRewrite(String([].forEach).replace("function", "function forEach")); print("done")',
       output: /done/,
       includeStderr: false,
       testArgs: ['--exposeAsyncRewriter', '--nodb'],
@@ -245,7 +245,7 @@ export async function runSmokeTests({
             perfTestIterations: 20,
             tags: ['startup'],
           },
-          {
+          /*{
             name: 'db_cursor_iteration_repl',
             input: `let count = 0; for (const item of ${manyDocsCursor(
               12345
@@ -272,7 +272,7 @@ export async function runSmokeTests({
             ],
             perfTestIterations: 20,
             tags: ['db', 'cursor_iteration'],
-          },
+          },*/
           {
             name: 'db_repeat_command',
             input: `let res;for (const item of [...Array(5000).keys()]) res = EJSON.stringify(db.hello()); print(res)`,
diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json
index c572642bb..fc3fb8c34 100644
--- a/packages/shell-evaluator/package.json
+++ b/packages/shell-evaluator/package.json
@@ -46,6 +46,7 @@
   },
   "dependencies": {
     "@mongosh/async-rewriter2": "0.0.0-dev.0",
+    "@mongosh/async-rewriter3": "0.0.0-dev.0",
     "@mongosh/history": "0.0.0-dev.0",
     "@mongosh/shell-api": "0.0.0-dev.0"
   }
diff --git a/packages/shell-evaluator/src/shell-evaluator.ts b/packages/shell-evaluator/src/shell-evaluator.ts
index 4bb479c98..3bfcd5202 100644
--- a/packages/shell-evaluator/src/shell-evaluator.ts
+++ b/packages/shell-evaluator/src/shell-evaluator.ts
@@ -4,7 +4,10 @@ import {
   ShellResult,
   EvaluationListener,
 } from '@mongosh/shell-api';
-import AsyncWriter from '@mongosh/async-rewriter2';
+import AsyncWriter2 from '@mongosh/async-rewriter2';
+import AsyncWriter3 from '@mongosh/async-rewriter3';
+
+type AsyncWriter = AsyncWriter2 | AsyncWriter3;
 
 type EvaluationFunction = (
   input: string,
@@ -23,14 +26,17 @@ try {
 } catch {
   /* not Node.js */
 }
+
+/*
 if (v8?.startupSnapshot?.isBuildingSnapshot?.()) {
   v8.startupSnapshot.addSerializeCallback(() => {
     // Ensure that any lazy loading performed by Babel is part of the snapshot
-    eval(new AsyncWriter().runtimeSupportCode());
-    eval(new AsyncWriter().process('1+1'));
+    eval(new AsyncWriter2().runtimeSupportCode());
+    eval(new AsyncWriter2().process('1+1'));
     hasAlreadyRunGlobalRuntimeSupportEval = true;
   });
 }
+*/
 
 type ResultHandler<EvaluationResultType> = (
   value: any
@@ -51,7 +57,10 @@ class ShellEvaluator<EvaluationResultType = ShellResult> {
   ) {
     this.instanceState = instanceState;
     this.resultHandler = resultHandler;
-    this.asyncWriter = new AsyncWriter();
+    const AsyncWriterCls = !process.env.MONGOSH_NO_EXPERIMENT_ASYNC_REWRITER3
+      ? AsyncWriter3
+      : AsyncWriter2;
+    this.asyncWriter = new AsyncWriterCls();
     this.hasAppliedAsyncWriterRuntimeSupport = false;
     this.exposeAsyncRewriter = !!exposeAsyncRewriter;
     this.markTime = markTime;
@@ -93,11 +102,12 @@ class ShellEvaluator<EvaluationResultType = ShellResult> {
     }
 
     if (this.exposeAsyncRewriter) {
-      (context as any).__asyncRewrite = () => this.asyncWriter.process(input);
+      (context as any).__asyncRewrite = (input: string) =>
+        this.asyncWriter.process(input);
     }
 
     this.markTime?.(TimingCategories.AsyncRewrite, 'start async rewrite');
-    let rewrittenInput = this.asyncWriter.process(input);
+    let rewrittenInput = await this.asyncWriter.process(input);
     this.markTime?.(TimingCategories.AsyncRewrite, 'done async rewrite');
 
     const hiddenCommands = RegExp(HIDDEN_COMMANDS, 'g');
@@ -113,7 +123,7 @@ class ShellEvaluator<EvaluationResultType = ShellResult> {
         TimingCategories.AsyncRewrite,
         'start runtimeSupportCode processing'
       );
-      const supportCode = this.asyncWriter.runtimeSupportCode();
+      const supportCode = new AsyncWriter2().runtimeSupportCode();
       // Eval twice: We need the modified prototypes to be present in both
       // the evaluation context and the current one, because e.g. the value of
       // db.test.find().toArray() is a Promise for an Array from the context
diff --git a/scripts/sort-workspaces.js b/scripts/sort-workspaces.js
index cda1e8079..6ff330d37 100755
--- a/scripts/sort-workspaces.js
+++ b/scripts/sort-workspaces.js
@@ -22,7 +22,7 @@ async function main() {
   ));
 
   // should use the scopes in lerna.json
-  const { stdout } = await exec('npx -y lerna ls --all --no-since --toposort --json');
+  const { stdout } = await exec('npx -y lerna ls --all --toposort --json');
   packageJSON.workspaces = JSON.parse(stdout).map(({ location }) => path.relative(monorepoRoot, location));
 
   await fs.writeFile(