diff --git a/.evergreen.yml b/.evergreen.yml
index de2877374e..3539505e0d 100644
--- a/.evergreen.yml
+++ b/.evergreen.yml
@@ -142,8 +142,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_arg_parser.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_arg_parser.tgz
+        local_file: src/nyc-output-darwin_unit-n16_arg_parser.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_arg_parser.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -151,7 +151,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_arg_parser.tgz
+          tar xvzf nyc-output-darwin_unit-n16_arg_parser.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -170,8 +170,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_async_rewriter2.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_async_rewriter2.tgz
+        local_file: src/nyc-output-darwin_unit-n16_async_rewriter2.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_async_rewriter2.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -179,7 +179,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_async_rewriter2.tgz
+          tar xvzf nyc-output-darwin_unit-n16_async_rewriter2.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -198,8 +198,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_autocomplete.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_autocomplete.tgz
+        local_file: src/nyc-output-darwin_unit-n16_autocomplete.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_autocomplete.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -207,7 +207,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_autocomplete.tgz
+          tar xvzf nyc-output-darwin_unit-n16_autocomplete.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -226,8 +226,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_browser_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_browser_repl.tgz
+        local_file: src/nyc-output-darwin_unit-n16_browser_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_browser_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -235,7 +235,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_browser_repl.tgz
+          tar xvzf nyc-output-darwin_unit-n16_browser_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -254,8 +254,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_browser_runtime_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_browser_runtime_core.tgz
+        local_file: src/nyc-output-darwin_unit-n16_browser_runtime_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_browser_runtime_core.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -263,7 +263,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_browser_runtime_core.tgz
+          tar xvzf nyc-output-darwin_unit-n16_browser_runtime_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -282,8 +282,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_browser_runtime_electron.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_browser_runtime_electron.tgz
+        local_file: src/nyc-output-darwin_unit-n16_browser_runtime_electron.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_browser_runtime_electron.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -291,7 +291,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_browser_runtime_electron.tgz
+          tar xvzf nyc-output-darwin_unit-n16_browser_runtime_electron.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -310,8 +310,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_build.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_build.tgz
+        local_file: src/nyc-output-darwin_unit-n16_build.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_build.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -319,7 +319,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_build.tgz
+          tar xvzf nyc-output-darwin_unit-n16_build.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -338,8 +338,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m40xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-m40xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -347,13 +347,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m40xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-m40xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m40xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-m40xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -361,13 +361,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m40xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-m40xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m42xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-m42xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -375,13 +375,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m42xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-m42xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m42xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-m42xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -389,13 +389,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m42xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-m42xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m44xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-m44xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -403,13 +403,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m44xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-m44xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m44xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-m44xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -417,13 +417,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m44xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-m44xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m50xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-m50xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -431,13 +431,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m50xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-m50xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m50xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-m50xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -445,13 +445,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m50xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-m50xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-mlatest_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n12_cli_repl.tgz
+        local_file: src/nyc-output-darwin_unit-mlatest_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -459,7 +459,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-mlatest_n12_cli_repl.tgz
+          tar xvzf nyc-output-darwin_unit-mlatest_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -590,8 +590,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_editor.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_editor.tgz
+        local_file: src/nyc-output-darwin_unit-n16_editor.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_editor.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -599,7 +599,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_editor.tgz
+          tar xvzf nyc-output-darwin_unit-n16_editor.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -618,8 +618,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_errors.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_errors.tgz
+        local_file: src/nyc-output-darwin_unit-n16_errors.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_errors.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -627,7 +627,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_errors.tgz
+          tar xvzf nyc-output-darwin_unit-n16_errors.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -646,8 +646,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_history.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_history.tgz
+        local_file: src/nyc-output-darwin_unit-n16_history.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_history.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -655,7 +655,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_history.tgz
+          tar xvzf nyc-output-darwin_unit-n16_history.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -674,8 +674,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_i18n.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_i18n.tgz
+        local_file: src/nyc-output-darwin_unit-n16_i18n.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_i18n.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -683,7 +683,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_i18n.tgz
+          tar xvzf nyc-output-darwin_unit-n16_i18n.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -702,8 +702,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_js_multiline_to_singleline.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_js_multiline_to_singleline.tgz
+        local_file: src/nyc-output-darwin_unit-n16_js_multiline_to_singleline.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_js_multiline_to_singleline.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -711,7 +711,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_js_multiline_to_singleline.tgz
+          tar xvzf nyc-output-darwin_unit-n16_js_multiline_to_singleline.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -730,8 +730,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_logging.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_logging.tgz
+        local_file: src/nyc-output-darwin_unit-n16_logging.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_logging.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -739,7 +739,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_logging.tgz
+          tar xvzf nyc-output-darwin_unit-n16_logging.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -758,8 +758,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m40xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-m40xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -767,13 +767,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m40xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_unit-m40xc_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m40xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-m40xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -781,13 +781,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m40xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_unit-m40xe_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m42xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-m42xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -795,13 +795,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m42xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_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-darwin_unit-m42xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-m42xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -809,13 +809,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m42xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_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-darwin_unit-m44xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-m44xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -823,13 +823,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m44xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_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-darwin_unit-m44xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-m44xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -837,13 +837,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m44xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_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-darwin_unit-m50xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-m50xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -851,13 +851,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m50xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_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-darwin_unit-m50xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-m50xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -865,13 +865,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m50xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_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-darwin_unit-mlatest_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-darwin_unit-mlatest_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -879,7 +879,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-mlatest_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-darwin_unit-mlatest_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1010,8 +1010,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_service_provider_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_service_provider_core.tgz
+        local_file: src/nyc-output-darwin_unit-n16_service_provider_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_service_provider_core.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1019,7 +1019,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_service_provider_core.tgz
+          tar xvzf nyc-output-darwin_unit-n16_service_provider_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1038,8 +1038,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m40xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-m40xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1047,13 +1047,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m40xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-m40xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m40xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-m40xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1061,13 +1061,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m40xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-m40xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m42xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-m42xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1075,13 +1075,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m42xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-m42xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m42xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-m42xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1089,13 +1089,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m42xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-m42xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m44xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-m44xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1103,13 +1103,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m44xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-m44xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m44xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-m44xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1117,13 +1117,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m44xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-m44xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m50xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-m50xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1131,13 +1131,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m50xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-m50xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m50xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-m50xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1145,13 +1145,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m50xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-m50xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-mlatest_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n12_service_provider_server.tgz
+        local_file: src/nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1159,7 +1159,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-mlatest_n12_service_provider_server.tgz
+          tar xvzf nyc-output-darwin_unit-mlatest_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1290,8 +1290,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m40xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xc_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-m40xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1299,13 +1299,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m40xc_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-m40xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m40xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xe_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-m40xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m40xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1313,13 +1313,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m40xe_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-m40xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m42xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-m42xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1327,13 +1327,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m42xc_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-m42xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m42xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-m42xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m42xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1341,13 +1341,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m42xe_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-m42xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m44xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-m44xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1355,13 +1355,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m44xc_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-m44xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m44xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-m44xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m44xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1369,13 +1369,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m44xe_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-m44xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m50xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-m50xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1383,13 +1383,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m50xc_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-m50xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-m50xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-m50xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-m50xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1397,13 +1397,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-m50xe_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-m50xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-mlatest_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n12_shell_api.tgz
+        local_file: src/nyc-output-darwin_unit-mlatest_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-mlatest_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1411,7 +1411,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-mlatest_n12_shell_api.tgz
+          tar xvzf nyc-output-darwin_unit-mlatest_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1542,8 +1542,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_shell_evaluator.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_shell_evaluator.tgz
+        local_file: src/nyc-output-darwin_unit-n16_shell_evaluator.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_shell_evaluator.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1551,7 +1551,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_shell_evaluator.tgz
+          tar xvzf nyc-output-darwin_unit-n16_shell_evaluator.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1570,8 +1570,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_snippet_manager.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_snippet_manager.tgz
+        local_file: src/nyc-output-darwin_unit-n16_snippet_manager.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_snippet_manager.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1579,7 +1579,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_snippet_manager.tgz
+          tar xvzf nyc-output-darwin_unit-n16_snippet_manager.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1598,8 +1598,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-darwin_unit-n12_types.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n12_types.tgz
+        local_file: src/nyc-output-darwin_unit-n16_types.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-darwin_unit-n16_types.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1607,7 +1607,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-darwin_unit-n12_types.tgz
+          tar xvzf nyc-output-darwin_unit-n16_types.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1626,8 +1626,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_arg_parser.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_arg_parser.tgz
+        local_file: src/nyc-output-linux_unit-n16_arg_parser.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_arg_parser.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1635,7 +1635,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_arg_parser.tgz
+          tar xvzf nyc-output-linux_unit-n16_arg_parser.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1654,8 +1654,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_async_rewriter2.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_async_rewriter2.tgz
+        local_file: src/nyc-output-linux_unit-n16_async_rewriter2.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_async_rewriter2.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1663,7 +1663,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_async_rewriter2.tgz
+          tar xvzf nyc-output-linux_unit-n16_async_rewriter2.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1682,8 +1682,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_autocomplete.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_autocomplete.tgz
+        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:
@@ -1691,7 +1691,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_autocomplete.tgz
+          tar xvzf nyc-output-linux_unit-n16_autocomplete.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1710,8 +1710,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_browser_runtime_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_browser_runtime_core.tgz
+        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:
@@ -1719,7 +1719,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_browser_runtime_core.tgz
+          tar xvzf nyc-output-linux_unit-n16_browser_runtime_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1738,8 +1738,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_browser_runtime_electron.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_browser_runtime_electron.tgz
+        local_file: src/nyc-output-linux_unit-n16_browser_runtime_electron.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_browser_runtime_electron.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1747,7 +1747,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_browser_runtime_electron.tgz
+          tar xvzf nyc-output-linux_unit-n16_browser_runtime_electron.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1766,8 +1766,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_build.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_build.tgz
+        local_file: src/nyc-output-linux_unit-n16_build.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_build.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1775,7 +1775,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_build.tgz
+          tar xvzf nyc-output-linux_unit-n16_build.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -1794,8 +1794,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-m40xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1803,13 +1803,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-m40xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-m40xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1817,13 +1817,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-m40xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-m42xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1831,13 +1831,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-m42xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-m42xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1845,13 +1845,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-m42xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m44xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-m44xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1859,13 +1859,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-m44xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m44xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-m44xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1873,13 +1873,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-m44xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m50xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-m50xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1887,13 +1887,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-m50xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m50xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-m50xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1901,13 +1901,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-m50xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-mlatest_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n12_cli_repl.tgz
+        local_file: src/nyc-output-linux_unit-mlatest_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -1915,7 +1915,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-mlatest_n12_cli_repl.tgz
+          tar xvzf nyc-output-linux_unit-mlatest_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2046,8 +2046,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_editor.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_editor.tgz
+        local_file: src/nyc-output-linux_unit-n16_editor.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_editor.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2055,7 +2055,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_editor.tgz
+          tar xvzf nyc-output-linux_unit-n16_editor.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2074,8 +2074,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_errors.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_errors.tgz
+        local_file: src/nyc-output-linux_unit-n16_errors.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_errors.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2083,7 +2083,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_errors.tgz
+          tar xvzf nyc-output-linux_unit-n16_errors.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2102,8 +2102,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_history.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_history.tgz
+        local_file: src/nyc-output-linux_unit-n16_history.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_history.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2111,7 +2111,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_history.tgz
+          tar xvzf nyc-output-linux_unit-n16_history.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2130,8 +2130,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_i18n.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_i18n.tgz
+        local_file: src/nyc-output-linux_unit-n16_i18n.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_i18n.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2139,7 +2139,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_i18n.tgz
+          tar xvzf nyc-output-linux_unit-n16_i18n.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2158,8 +2158,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xc_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-m40xc_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2167,13 +2167,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xc_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-m40xc_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xe_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-m40xe_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2181,13 +2181,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xe_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-m40xe_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xc_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-m42xc_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2195,13 +2195,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xc_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-m42xc_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xe_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-m42xe_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2209,13 +2209,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xe_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-m42xe_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m44xc_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-m44xc_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2223,13 +2223,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xc_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-m44xc_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m44xe_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-m44xe_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2237,13 +2237,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xe_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-m44xe_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m50xc_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-m50xc_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2251,13 +2251,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xc_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-m50xc_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m50xe_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-m50xe_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2265,13 +2265,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xe_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-m50xe_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-mlatest_n12_java_shell.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n12_java_shell.tgz
+        local_file: src/nyc-output-linux_unit-mlatest_n16_java_shell.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_java_shell.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2279,7 +2279,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-mlatest_n12_java_shell.tgz
+          tar xvzf nyc-output-linux_unit-mlatest_n16_java_shell.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2410,8 +2410,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_js_multiline_to_singleline.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_js_multiline_to_singleline.tgz
+        local_file: src/nyc-output-linux_unit-n16_js_multiline_to_singleline.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_js_multiline_to_singleline.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2419,7 +2419,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_js_multiline_to_singleline.tgz
+          tar xvzf nyc-output-linux_unit-n16_js_multiline_to_singleline.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2438,8 +2438,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_logging.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_logging.tgz
+        local_file: src/nyc-output-linux_unit-n16_logging.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_logging.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2447,7 +2447,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_logging.tgz
+          tar xvzf nyc-output-linux_unit-n16_logging.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2466,8 +2466,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-m40xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2475,13 +2475,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_unit-m40xc_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-m40xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2489,13 +2489,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_unit-m40xe_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-m42xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2503,13 +2503,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_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-linux_unit-m42xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-m42xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2517,13 +2517,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_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-linux_unit-m44xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-m44xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2531,13 +2531,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_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-linux_unit-m44xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-m44xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2545,13 +2545,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_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-linux_unit-m50xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-m50xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2559,13 +2559,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_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-linux_unit-m50xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-m50xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2573,13 +2573,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_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-linux_unit-mlatest_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-linux_unit-mlatest_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2587,7 +2587,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-mlatest_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-linux_unit-mlatest_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2718,8 +2718,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_service_provider_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_service_provider_core.tgz
+        local_file: src/nyc-output-linux_unit-n16_service_provider_core.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_service_provider_core.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2727,7 +2727,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_service_provider_core.tgz
+          tar xvzf nyc-output-linux_unit-n16_service_provider_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2746,8 +2746,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-m40xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2755,13 +2755,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-m40xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-m40xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2769,13 +2769,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-m40xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2783,13 +2783,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-m42xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-m42xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2797,13 +2797,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-m42xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m44xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2811,13 +2811,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-m44xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m44xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2825,13 +2825,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-m44xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m50xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2839,13 +2839,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-m50xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m50xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2853,13 +2853,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-m50xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-mlatest_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n12_service_provider_server.tgz
+        local_file: src/nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -2867,7 +2867,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-mlatest_n12_service_provider_server.tgz
+          tar xvzf nyc-output-linux_unit-mlatest_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -2998,8 +2998,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-m40xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3007,13 +3007,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xc_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-m40xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m40xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-m40xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m40xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3021,13 +3021,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m40xe_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-m40xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-m42xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3035,13 +3035,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xc_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-m42xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m42xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-m42xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m42xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3049,13 +3049,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m42xe_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-m42xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m44xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-m44xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3063,13 +3063,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xc_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-m44xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m44xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-m44xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m44xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3077,13 +3077,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m44xe_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-m44xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m50xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-m50xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3091,13 +3091,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xc_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-m50xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-m50xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-m50xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-m50xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3105,13 +3105,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-m50xe_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-m50xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-mlatest_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n12_shell_api.tgz
+        local_file: src/nyc-output-linux_unit-mlatest_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-mlatest_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3119,7 +3119,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-mlatest_n12_shell_api.tgz
+          tar xvzf nyc-output-linux_unit-mlatest_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3250,8 +3250,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_shell_evaluator.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_shell_evaluator.tgz
+        local_file: src/nyc-output-linux_unit-n16_shell_evaluator.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_shell_evaluator.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3259,7 +3259,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_shell_evaluator.tgz
+          tar xvzf nyc-output-linux_unit-n16_shell_evaluator.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3278,8 +3278,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_snippet_manager.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_snippet_manager.tgz
+        local_file: src/nyc-output-linux_unit-n16_snippet_manager.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_snippet_manager.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3287,7 +3287,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_snippet_manager.tgz
+          tar xvzf nyc-output-linux_unit-n16_snippet_manager.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3306,8 +3306,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-linux_unit-n12_types.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n12_types.tgz
+        local_file: src/nyc-output-linux_unit-n16_types.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-linux_unit-n16_types.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3315,7 +3315,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-linux_unit-n12_types.tgz
+          tar xvzf nyc-output-linux_unit-n16_types.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3334,8 +3334,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_arg_parser.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_arg_parser.tgz
+        local_file: src/nyc-output-win32_unit-n16_arg_parser.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_arg_parser.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3343,7 +3343,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_arg_parser.tgz
+          tar xvzf nyc-output-win32_unit-n16_arg_parser.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3362,8 +3362,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_async_rewriter2.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_async_rewriter2.tgz
+        local_file: src/nyc-output-win32_unit-n16_async_rewriter2.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n16_async_rewriter2.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3371,7 +3371,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_async_rewriter2.tgz
+          tar xvzf nyc-output-win32_unit-n16_async_rewriter2.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3390,8 +3390,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_autocomplete.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_autocomplete.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:
@@ -3399,7 +3399,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_autocomplete.tgz
+          tar xvzf nyc-output-win32_unit-n16_autocomplete.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3418,8 +3418,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_browser_runtime_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_browser_runtime_core.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:
@@ -3427,7 +3427,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_browser_runtime_core.tgz
+          tar xvzf nyc-output-win32_unit-n16_browser_runtime_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3446,8 +3446,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_browser_runtime_electron.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_browser_runtime_electron.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:
@@ -3455,7 +3455,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_browser_runtime_electron.tgz
+          tar xvzf nyc-output-win32_unit-n16_browser_runtime_electron.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3474,8 +3474,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_build.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_build.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:
@@ -3483,7 +3483,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_build.tgz
+          tar xvzf nyc-output-win32_unit-n16_build.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3502,8 +3502,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m40xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xc_n12_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m40xc_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xc_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3511,13 +3511,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m40xc_n12_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m40xc_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m40xe_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xe_n12_cli_repl.tgz
+        local_file: src/nyc-output-win32_unit-m40xe_n16_cli_repl.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xe_n16_cli_repl.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3525,13 +3525,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m40xe_n12_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-m40xe_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n12_cli_repl.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:
@@ -3539,13 +3539,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n12_cli_repl.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_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n12_cli_repl.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:
@@ -3553,13 +3553,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n12_cli_repl.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_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n12_cli_repl.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:
@@ -3567,13 +3567,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n12_cli_repl.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_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n12_cli_repl.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:
@@ -3581,13 +3581,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n12_cli_repl.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_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n12_cli_repl.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:
@@ -3595,13 +3595,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n12_cli_repl.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_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n12_cli_repl.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:
@@ -3609,13 +3609,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n12_cli_repl.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-mlatest_n12_cli_repl.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n12_cli_repl.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:
@@ -3623,7 +3623,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n12_cli_repl.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_cli_repl.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3754,8 +3754,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_editor.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_editor.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:
@@ -3763,7 +3763,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_editor.tgz
+          tar xvzf nyc-output-win32_unit-n16_editor.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3782,8 +3782,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_errors.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_errors.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:
@@ -3791,7 +3791,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_errors.tgz
+          tar xvzf nyc-output-win32_unit-n16_errors.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3810,8 +3810,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_history.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_history.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:
@@ -3819,7 +3819,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_history.tgz
+          tar xvzf nyc-output-win32_unit-n16_history.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3838,8 +3838,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_i18n.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_i18n.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:
@@ -3847,7 +3847,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_i18n.tgz
+          tar xvzf nyc-output-win32_unit-n16_i18n.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3866,8 +3866,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_js_multiline_to_singleline.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_js_multiline_to_singleline.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:
@@ -3875,7 +3875,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_js_multiline_to_singleline.tgz
+          tar xvzf nyc-output-win32_unit-n16_js_multiline_to_singleline.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3894,8 +3894,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_logging.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_logging.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:
@@ -3903,7 +3903,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_logging.tgz
+          tar xvzf nyc-output-win32_unit-n16_logging.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -3922,8 +3922,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m40xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xc_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m40xc_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xc_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3931,13 +3931,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m40xc_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m40xc_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-m40xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xe_n12_node_runtime_worker_thread.tgz
+        local_file: src/nyc-output-win32_unit-m40xe_n16_node_runtime_worker_thread.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xe_n16_node_runtime_worker_thread.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -3945,13 +3945,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m40xe_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-m40xe_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_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n12_node_runtime_worker_thread.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:
@@ -3959,13 +3959,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n12_node_runtime_worker_thread.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-m42xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n12_node_runtime_worker_thread.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:
@@ -3973,13 +3973,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n12_node_runtime_worker_thread.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-m44xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n12_node_runtime_worker_thread.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:
@@ -3987,13 +3987,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n12_node_runtime_worker_thread.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-m44xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n12_node_runtime_worker_thread.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:
@@ -4001,13 +4001,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n12_node_runtime_worker_thread.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-m50xc_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n12_node_runtime_worker_thread.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:
@@ -4015,13 +4015,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n12_node_runtime_worker_thread.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-m50xe_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n12_node_runtime_worker_thread.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:
@@ -4029,13 +4029,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n12_node_runtime_worker_thread.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-mlatest_n12_node_runtime_worker_thread.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n12_node_runtime_worker_thread.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:
@@ -4043,7 +4043,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n12_node_runtime_worker_thread.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_node_runtime_worker_thread.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -4174,8 +4174,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_service_provider_core.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_service_provider_core.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:
@@ -4183,7 +4183,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_service_provider_core.tgz
+          tar xvzf nyc-output-win32_unit-n16_service_provider_core.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -4202,8 +4202,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m40xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xc_n12_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m40xc_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xc_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4211,13 +4211,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m40xc_n12_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m40xc_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m40xe_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xe_n12_service_provider_server.tgz
+        local_file: src/nyc-output-win32_unit-m40xe_n16_service_provider_server.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xe_n16_service_provider_server.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4225,13 +4225,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m40xe_n12_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-m40xe_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n12_service_provider_server.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:
@@ -4239,13 +4239,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n12_service_provider_server.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_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n12_service_provider_server.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:
@@ -4253,13 +4253,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n12_service_provider_server.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_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n12_service_provider_server.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:
@@ -4267,13 +4267,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n12_service_provider_server.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_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n12_service_provider_server.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:
@@ -4281,13 +4281,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n12_service_provider_server.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_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n12_service_provider_server.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:
@@ -4295,13 +4295,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n12_service_provider_server.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_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n12_service_provider_server.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:
@@ -4309,13 +4309,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n12_service_provider_server.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-mlatest_n12_service_provider_server.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n12_service_provider_server.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:
@@ -4323,7 +4323,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n12_service_provider_server.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_service_provider_server.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -4454,8 +4454,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m40xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xc_n12_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m40xc_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xc_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4463,13 +4463,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m40xc_n12_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m40xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m40xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xe_n12_shell_api.tgz
+        local_file: src/nyc-output-win32_unit-m40xe_n16_shell_api.tgz
+        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m40xe_n16_shell_api.tgz
         bucket: mciuploads
     - command: shell.exec
       params:
@@ -4477,13 +4477,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m40xe_n12_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m40xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m42xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xc_n12_shell_api.tgz
+        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:
@@ -4491,13 +4491,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xc_n12_shell_api.tgz
+          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/nyc-output-win32_unit-m42xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m42xe_n12_shell_api.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
     - command: shell.exec
       params:
@@ -4505,13 +4505,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m42xe_n12_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m42xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xc_n12_shell_api.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:
@@ -4519,13 +4519,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xc_n12_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m44xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m44xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m44xe_n12_shell_api.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: shell.exec
       params:
@@ -4533,13 +4533,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m44xe_n12_shell_api.tgz
+          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/nyc-output-win32_unit-m50xc_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xc_n12_shell_api.tgz
+        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
     - command: shell.exec
       params:
@@ -4547,13 +4547,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xc_n12_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m50xc_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-m50xe_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-m50xe_n12_shell_api.tgz
+        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
     - command: shell.exec
       params:
@@ -4561,13 +4561,13 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-m50xe_n12_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-m50xe_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-mlatest_n12_shell_api.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-mlatest_n12_shell_api.tgz
+        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:
@@ -4575,7 +4575,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-mlatest_n12_shell_api.tgz
+          tar xvzf nyc-output-win32_unit-mlatest_n16_shell_api.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -4706,8 +4706,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_shell_evaluator.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_shell_evaluator.tgz
+        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:
@@ -4715,7 +4715,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_shell_evaluator.tgz
+          tar xvzf nyc-output-win32_unit-n16_shell_evaluator.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -4734,8 +4734,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_snippet_manager.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_snippet_manager.tgz
+        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:
@@ -4743,7 +4743,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_snippet_manager.tgz
+          tar xvzf nyc-output-win32_unit-n16_snippet_manager.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -4762,8 +4762,8 @@ functions:
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/nyc-output-win32_unit-n12_types.tgz
-        remote_file: mongosh/binaries/${revision}/${revision_order_id}/nyc-output-win32_unit-n12_types.tgz
+        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
     - command: shell.exec
       params:
@@ -4771,7 +4771,7 @@ functions:
         shell: bash
         script: |
           set -e
-          tar xvzf nyc-output-win32_unit-n12_types.tgz
+          tar xvzf nyc-output-win32_unit-n16_types.tgz
     - command: s3.get
       params:
         aws_key: ${aws_key}
@@ -5142,7 +5142,7 @@ tasks:
       - func: checkout
       - func: compile_ts
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
 
   - name: check
     depends_on:
@@ -5152,11 +5152,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: check
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
 
   - name: check_coverage
     depends_on:
@@ -5166,17 +5166,17 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: check_coverage
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
 
   ###
   # UNIT TESTS
   # E.g. test_m40xc_n12 stands for mongod 4.0.x, community edition, Node.js 12
   ###
-  - name: test_n12_arg_parser
+  - name: test_n16_arg_parser
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5185,14 +5185,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_arg_parser"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_arg_parser"
           mongosh_run_only_in_package: "arg-parser"
   - name: test_n14_arg_parser
     tags: ["unit-test"]
@@ -5203,16 +5203,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_arg_parser"
           mongosh_run_only_in_package: "arg-parser"
-  - name: test_n12_async_rewriter2
+  - name: test_n16_async_rewriter2
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5221,14 +5221,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_async_rewriter2"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_async_rewriter2"
           mongosh_run_only_in_package: "async-rewriter2"
   - name: test_n14_async_rewriter2
     tags: ["unit-test"]
@@ -5239,16 +5239,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_async_rewriter2"
           mongosh_run_only_in_package: "async-rewriter2"
-  - name: test_n12_autocomplete
+  - name: test_n16_autocomplete
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5257,14 +5257,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_autocomplete"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_autocomplete"
           mongosh_run_only_in_package: "autocomplete"
   - name: test_n14_autocomplete
     tags: ["unit-test"]
@@ -5275,16 +5275,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_autocomplete"
           mongosh_run_only_in_package: "autocomplete"
-  - name: test_n12_browser_repl
+  - name: test_n16_browser_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5293,14 +5293,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_browser_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_browser_repl"
           mongosh_run_only_in_package: "browser-repl"
   - name: test_n14_browser_repl
     tags: ["unit-test"]
@@ -5311,16 +5311,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_browser_repl"
           mongosh_run_only_in_package: "browser-repl"
-  - name: test_n12_browser_runtime_core
+  - name: test_n16_browser_runtime_core
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5329,14 +5329,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_browser_runtime_core"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_browser_runtime_core"
           mongosh_run_only_in_package: "browser-runtime-core"
   - name: test_n14_browser_runtime_core
     tags: ["unit-test"]
@@ -5347,16 +5347,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_browser_runtime_core"
           mongosh_run_only_in_package: "browser-runtime-core"
-  - name: test_n12_browser_runtime_electron
+  - name: test_n16_browser_runtime_electron
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5365,14 +5365,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_browser_runtime_electron"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_browser_runtime_electron"
           mongosh_run_only_in_package: "browser-runtime-electron"
   - name: test_n14_browser_runtime_electron
     tags: ["unit-test"]
@@ -5383,16 +5383,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_browser_runtime_electron"
           mongosh_run_only_in_package: "browser-runtime-electron"
-  - name: test_n12_build
+  - name: test_n16_build
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5401,14 +5401,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_build"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_build"
           mongosh_run_only_in_package: "build"
   - name: test_n14_build
     tags: ["unit-test"]
@@ -5419,16 +5419,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_build"
           mongosh_run_only_in_package: "build"
-  - name: test_m40xc_n12_cli_repl
+  - name: test_m40xc_n16_cli_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5437,16 +5437,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xc_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xc_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_m40xe_n12_cli_repl
+  - name: test_m40xe_n16_cli_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5455,16 +5455,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xe_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xe_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_m42xc_n12_cli_repl
+  - name: test_m42xc_n16_cli_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5473,16 +5473,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xc_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xc_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_m42xe_n12_cli_repl
+  - name: test_m42xe_n16_cli_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5491,16 +5491,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xe_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xe_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_m44xc_n12_cli_repl
+  - name: test_m44xc_n16_cli_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5509,16 +5509,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xc_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xc_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_m44xe_n12_cli_repl
+  - name: test_m44xe_n16_cli_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5527,16 +5527,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xe_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xe_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_m50xc_n12_cli_repl
+  - name: test_m50xc_n16_cli_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5545,16 +5545,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xc_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xc_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_m50xe_n12_cli_repl
+  - name: test_m50xe_n16_cli_repl
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5563,16 +5563,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xe_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xe_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_mlatest_n12_cli_repl
+  - name: test_mlatest_n16_cli_repl
     tags: ["unit-test","mlatest"]
     depends_on:
       - name: compile_ts
@@ -5581,14 +5581,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "mlatest_n12_cli_repl"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "mlatest_n16_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_m40xc_n14_cli_repl
     tags: ["unit-test"]
@@ -5599,13 +5599,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xc_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_m40xe_n14_cli_repl
@@ -5617,13 +5617,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xe_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_m42xc_n14_cli_repl
@@ -5635,13 +5635,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xc_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_m42xe_n14_cli_repl
@@ -5653,13 +5653,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xe_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_m44xc_n14_cli_repl
@@ -5671,13 +5671,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xc_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_m44xe_n14_cli_repl
@@ -5689,13 +5689,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xe_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_m50xc_n14_cli_repl
@@ -5707,13 +5707,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xc_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_m50xe_n14_cli_repl
@@ -5725,13 +5725,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xe_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
   - name: test_mlatest_n14_cli_repl
@@ -5743,16 +5743,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "mlatest_n14_cli_repl"
           mongosh_run_only_in_package: "cli-repl"
-  - name: test_n12_connectivity_tests
+  - name: test_n16_connectivity_tests
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5761,14 +5761,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_connectivity_tests"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_connectivity_tests"
           mongosh_run_only_in_package: "connectivity-tests"
   - name: test_n14_connectivity_tests
     tags: ["unit-test"]
@@ -5779,16 +5779,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_connectivity_tests"
           mongosh_run_only_in_package: "connectivity-tests"
-  - name: test_n12_editor
+  - name: test_n16_editor
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5797,14 +5797,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_editor"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_editor"
           mongosh_run_only_in_package: "editor"
   - name: test_n14_editor
     tags: ["unit-test"]
@@ -5815,16 +5815,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_editor"
           mongosh_run_only_in_package: "editor"
-  - name: test_n12_errors
+  - name: test_n16_errors
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5833,14 +5833,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_errors"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_errors"
           mongosh_run_only_in_package: "errors"
   - name: test_n14_errors
     tags: ["unit-test"]
@@ -5851,16 +5851,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_errors"
           mongosh_run_only_in_package: "errors"
-  - name: test_n12_history
+  - name: test_n16_history
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5869,14 +5869,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_history"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_history"
           mongosh_run_only_in_package: "history"
   - name: test_n14_history
     tags: ["unit-test"]
@@ -5887,16 +5887,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_history"
           mongosh_run_only_in_package: "history"
-  - name: test_n12_i18n
+  - name: test_n16_i18n
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5905,14 +5905,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_i18n"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_i18n"
           mongosh_run_only_in_package: "i18n"
   - name: test_n14_i18n
     tags: ["unit-test"]
@@ -5923,16 +5923,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_i18n"
           mongosh_run_only_in_package: "i18n"
-  - name: test_m40xc_n12_java_shell
+  - name: test_m40xc_n16_java_shell
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5941,16 +5941,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xc_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xc_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_m40xe_n12_java_shell
+  - name: test_m40xe_n16_java_shell
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5959,16 +5959,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xe_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xe_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_m42xc_n12_java_shell
+  - name: test_m42xc_n16_java_shell
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5977,16 +5977,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xc_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xc_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_m42xe_n12_java_shell
+  - name: test_m42xe_n16_java_shell
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -5995,16 +5995,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xe_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xe_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_m44xc_n12_java_shell
+  - name: test_m44xc_n16_java_shell
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6013,16 +6013,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xc_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xc_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_m44xe_n12_java_shell
+  - name: test_m44xe_n16_java_shell
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6031,16 +6031,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xe_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xe_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_m50xc_n12_java_shell
+  - name: test_m50xc_n16_java_shell
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6049,16 +6049,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xc_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xc_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_m50xe_n12_java_shell
+  - name: test_m50xe_n16_java_shell
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6067,16 +6067,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xe_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xe_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_mlatest_n12_java_shell
+  - name: test_mlatest_n16_java_shell
     tags: ["unit-test","mlatest"]
     depends_on:
       - name: compile_ts
@@ -6085,14 +6085,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "mlatest_n12_java_shell"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "mlatest_n16_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_m40xc_n14_java_shell
     tags: ["unit-test"]
@@ -6103,13 +6103,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xc_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_m40xe_n14_java_shell
@@ -6121,13 +6121,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xe_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_m42xc_n14_java_shell
@@ -6139,13 +6139,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xc_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_m42xe_n14_java_shell
@@ -6157,13 +6157,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xe_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_m44xc_n14_java_shell
@@ -6175,13 +6175,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xc_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_m44xe_n14_java_shell
@@ -6193,13 +6193,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xe_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_m50xc_n14_java_shell
@@ -6211,13 +6211,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xc_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_m50xe_n14_java_shell
@@ -6229,13 +6229,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xe_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
   - name: test_mlatest_n14_java_shell
@@ -6247,16 +6247,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "mlatest_n14_java_shell"
           mongosh_run_only_in_package: "java-shell"
-  - name: test_n12_js_multiline_to_singleline
+  - name: test_n16_js_multiline_to_singleline
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6265,14 +6265,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_js_multiline_to_singleline"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_js_multiline_to_singleline"
           mongosh_run_only_in_package: "js-multiline-to-singleline"
   - name: test_n14_js_multiline_to_singleline
     tags: ["unit-test"]
@@ -6283,16 +6283,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_js_multiline_to_singleline"
           mongosh_run_only_in_package: "js-multiline-to-singleline"
-  - name: test_n12_logging
+  - name: test_n16_logging
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6301,14 +6301,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_logging"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_logging"
           mongosh_run_only_in_package: "logging"
   - name: test_n14_logging
     tags: ["unit-test"]
@@ -6319,16 +6319,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_logging"
           mongosh_run_only_in_package: "logging"
-  - name: test_m40xc_n12_mongosh
+  - name: test_m40xc_n16_mongosh
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6337,16 +6337,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xc_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xc_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_m40xe_n12_mongosh
+  - name: test_m40xe_n16_mongosh
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6355,16 +6355,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xe_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xe_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_m42xc_n12_mongosh
+  - name: test_m42xc_n16_mongosh
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6373,16 +6373,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xc_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xc_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_m42xe_n12_mongosh
+  - name: test_m42xe_n16_mongosh
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6391,16 +6391,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xe_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xe_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_m44xc_n12_mongosh
+  - name: test_m44xc_n16_mongosh
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6409,16 +6409,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xc_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xc_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_m44xe_n12_mongosh
+  - name: test_m44xe_n16_mongosh
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6427,16 +6427,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xe_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xe_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_m50xc_n12_mongosh
+  - name: test_m50xc_n16_mongosh
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6445,16 +6445,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xc_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xc_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_m50xe_n12_mongosh
+  - name: test_m50xe_n16_mongosh
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6463,16 +6463,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xe_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xe_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_mlatest_n12_mongosh
+  - name: test_mlatest_n16_mongosh
     tags: ["unit-test","mlatest"]
     depends_on:
       - name: compile_ts
@@ -6481,14 +6481,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "mlatest_n12_mongosh"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "mlatest_n16_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_m40xc_n14_mongosh
     tags: ["unit-test"]
@@ -6499,13 +6499,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xc_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_m40xe_n14_mongosh
@@ -6517,13 +6517,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xe_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_m42xc_n14_mongosh
@@ -6535,13 +6535,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xc_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_m42xe_n14_mongosh
@@ -6553,13 +6553,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xe_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_m44xc_n14_mongosh
@@ -6571,13 +6571,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xc_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_m44xe_n14_mongosh
@@ -6589,13 +6589,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xe_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_m50xc_n14_mongosh
@@ -6607,13 +6607,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xc_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_m50xe_n14_mongosh
@@ -6625,13 +6625,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xe_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
   - name: test_mlatest_n14_mongosh
@@ -6643,16 +6643,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "mlatest_n14_mongosh"
           mongosh_run_only_in_package: "mongosh"
-  - name: test_m40xc_n12_node_runtime_worker_thread
+  - name: test_m40xc_n16_node_runtime_worker_thread
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6661,16 +6661,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xc_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xc_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_m40xe_n12_node_runtime_worker_thread
+  - name: test_m40xe_n16_node_runtime_worker_thread
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6679,16 +6679,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xe_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xe_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_m42xc_n12_node_runtime_worker_thread
+  - name: test_m42xc_n16_node_runtime_worker_thread
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6697,16 +6697,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xc_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xc_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_m42xe_n12_node_runtime_worker_thread
+  - name: test_m42xe_n16_node_runtime_worker_thread
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6715,16 +6715,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xe_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xe_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_m44xc_n12_node_runtime_worker_thread
+  - name: test_m44xc_n16_node_runtime_worker_thread
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6733,16 +6733,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xc_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xc_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_m44xe_n12_node_runtime_worker_thread
+  - name: test_m44xe_n16_node_runtime_worker_thread
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6751,16 +6751,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xe_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xe_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_m50xc_n12_node_runtime_worker_thread
+  - name: test_m50xc_n16_node_runtime_worker_thread
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6769,16 +6769,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xc_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xc_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_m50xe_n12_node_runtime_worker_thread
+  - name: test_m50xe_n16_node_runtime_worker_thread
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6787,16 +6787,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xe_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xe_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_mlatest_n12_node_runtime_worker_thread
+  - name: test_mlatest_n16_node_runtime_worker_thread
     tags: ["unit-test","mlatest"]
     depends_on:
       - name: compile_ts
@@ -6805,14 +6805,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "mlatest_n12_node_runtime_worker_thread"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "mlatest_n16_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_m40xc_n14_node_runtime_worker_thread
     tags: ["unit-test"]
@@ -6823,13 +6823,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xc_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_m40xe_n14_node_runtime_worker_thread
@@ -6841,13 +6841,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xe_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_m42xc_n14_node_runtime_worker_thread
@@ -6859,13 +6859,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xc_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_m42xe_n14_node_runtime_worker_thread
@@ -6877,13 +6877,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xe_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_m44xc_n14_node_runtime_worker_thread
@@ -6895,13 +6895,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xc_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_m44xe_n14_node_runtime_worker_thread
@@ -6913,13 +6913,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xe_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_m50xc_n14_node_runtime_worker_thread
@@ -6931,13 +6931,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xc_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_m50xe_n14_node_runtime_worker_thread
@@ -6949,13 +6949,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xe_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
   - name: test_mlatest_n14_node_runtime_worker_thread
@@ -6967,16 +6967,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "mlatest_n14_node_runtime_worker_thread"
           mongosh_run_only_in_package: "node-runtime-worker-thread"
-  - name: test_n12_service_provider_core
+  - name: test_n16_service_provider_core
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -6985,14 +6985,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_service_provider_core"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_service_provider_core"
           mongosh_run_only_in_package: "service-provider-core"
   - name: test_n14_service_provider_core
     tags: ["unit-test"]
@@ -7003,16 +7003,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_service_provider_core"
           mongosh_run_only_in_package: "service-provider-core"
-  - name: test_m40xc_n12_service_provider_server
+  - name: test_m40xc_n16_service_provider_server
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7021,16 +7021,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xc_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xc_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_m40xe_n12_service_provider_server
+  - name: test_m40xe_n16_service_provider_server
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7039,16 +7039,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xe_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xe_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_m42xc_n12_service_provider_server
+  - name: test_m42xc_n16_service_provider_server
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7057,16 +7057,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xc_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xc_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_m42xe_n12_service_provider_server
+  - name: test_m42xe_n16_service_provider_server
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7075,16 +7075,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xe_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xe_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_m44xc_n12_service_provider_server
+  - name: test_m44xc_n16_service_provider_server
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7093,16 +7093,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xc_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xc_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_m44xe_n12_service_provider_server
+  - name: test_m44xe_n16_service_provider_server
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7111,16 +7111,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xe_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xe_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_m50xc_n12_service_provider_server
+  - name: test_m50xc_n16_service_provider_server
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7129,16 +7129,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xc_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xc_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_m50xe_n12_service_provider_server
+  - name: test_m50xe_n16_service_provider_server
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7147,16 +7147,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xe_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xe_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_mlatest_n12_service_provider_server
+  - name: test_mlatest_n16_service_provider_server
     tags: ["unit-test","mlatest"]
     depends_on:
       - name: compile_ts
@@ -7165,14 +7165,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "mlatest_n12_service_provider_server"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "mlatest_n16_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_m40xc_n14_service_provider_server
     tags: ["unit-test"]
@@ -7183,13 +7183,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xc_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_m40xe_n14_service_provider_server
@@ -7201,13 +7201,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xe_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_m42xc_n14_service_provider_server
@@ -7219,13 +7219,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xc_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_m42xe_n14_service_provider_server
@@ -7237,13 +7237,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xe_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_m44xc_n14_service_provider_server
@@ -7255,13 +7255,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xc_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_m44xe_n14_service_provider_server
@@ -7273,13 +7273,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xe_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_m50xc_n14_service_provider_server
@@ -7291,13 +7291,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xc_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_m50xe_n14_service_provider_server
@@ -7309,13 +7309,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xe_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
   - name: test_mlatest_n14_service_provider_server
@@ -7327,16 +7327,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "mlatest_n14_service_provider_server"
           mongosh_run_only_in_package: "service-provider-server"
-  - name: test_m40xc_n12_shell_api
+  - name: test_m40xc_n16_shell_api
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7345,16 +7345,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xc_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xc_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_m40xe_n12_shell_api
+  - name: test_m40xe_n16_shell_api
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7363,16 +7363,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m40xe_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m40xe_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_m42xc_n12_shell_api
+  - name: test_m42xc_n16_shell_api
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7381,16 +7381,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xc_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xc_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_m42xe_n12_shell_api
+  - name: test_m42xe_n16_shell_api
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7399,16 +7399,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m42xe_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m42xe_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_m44xc_n12_shell_api
+  - name: test_m44xc_n16_shell_api
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7417,16 +7417,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xc_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xc_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_m44xe_n12_shell_api
+  - name: test_m44xe_n16_shell_api
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7435,16 +7435,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m44xe_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m44xe_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_m50xc_n12_shell_api
+  - name: test_m50xc_n16_shell_api
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7453,16 +7453,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xc_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xc_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_m50xe_n12_shell_api
+  - name: test_m50xe_n16_shell_api
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7471,16 +7471,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "m50xe_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "m50xe_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_mlatest_n12_shell_api
+  - name: test_mlatest_n16_shell_api
     tags: ["unit-test","mlatest"]
     depends_on:
       - name: compile_ts
@@ -7489,14 +7489,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "mlatest_n12_shell_api"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "mlatest_n16_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_m40xc_n14_shell_api
     tags: ["unit-test"]
@@ -7507,13 +7507,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xc_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_m40xe_n14_shell_api
@@ -7525,13 +7525,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m40xe_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_m42xc_n14_shell_api
@@ -7543,13 +7543,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xc_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_m42xe_n14_shell_api
@@ -7561,13 +7561,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.2.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m42xe_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_m44xc_n14_shell_api
@@ -7579,13 +7579,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xc_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_m44xe_n14_shell_api
@@ -7597,13 +7597,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "4.4.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m44xe_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_m50xc_n14_shell_api
@@ -7615,13 +7615,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x-community"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xc_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_m50xe_n14_shell_api
@@ -7633,13 +7633,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "5.0.x"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "m50xe_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
   - name: test_mlatest_n14_shell_api
@@ -7651,16 +7651,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: "latest-alpha"
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "mlatest_n14_shell_api"
           mongosh_run_only_in_package: "shell-api"
-  - name: test_n12_shell_evaluator
+  - name: test_n16_shell_evaluator
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7669,14 +7669,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_shell_evaluator"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_shell_evaluator"
           mongosh_run_only_in_package: "shell-evaluator"
   - name: test_n14_shell_evaluator
     tags: ["unit-test"]
@@ -7687,16 +7687,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_shell_evaluator"
           mongosh_run_only_in_package: "shell-evaluator"
-  - name: test_n12_snippet_manager
+  - name: test_n16_snippet_manager
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7705,14 +7705,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_snippet_manager"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_snippet_manager"
           mongosh_run_only_in_package: "snippet-manager"
   - name: test_n14_snippet_manager
     tags: ["unit-test"]
@@ -7723,16 +7723,16 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_snippet_manager"
           mongosh_run_only_in_package: "snippet-manager"
-  - name: test_n12_types
+  - name: test_n16_types
     tags: ["unit-test"]
     depends_on:
       - name: compile_ts
@@ -7741,14 +7741,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "12.22.11"
-          mongosh_skip_node_version_check: "1"
-          mongosh_test_id: "n12_types"
+          node_js_version: "16.15.0"
+          mongosh_skip_node_version_check: ""
+          mongosh_test_id: "n16_types"
           mongosh_run_only_in_package: "types"
   - name: test_n14_types
     tags: ["unit-test"]
@@ -7759,13 +7759,13 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test
         vars:
           mongosh_server_test_version: ""
-          node_js_version: "14.19.1"
-          mongosh_skip_node_version_check: ""
+          node_js_version: "14.19.2"
+          mongosh_skip_node_version_check: "1"
           mongosh_test_id: "n14_types"
           mongosh_run_only_in_package: "types"
 
@@ -7781,11 +7781,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "14.19.2"
           npm_deps_mode: all
       - func: test_vscode
         vars:
-          node_js_version: "12.22.11"
+          node_js_version: "14.19.2"
   - name: test_connectivity
     tags: ["extra-integration-test"]
     depends_on:
@@ -7795,7 +7795,7 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: test_connectivity
   - name: test_apistrict
@@ -7807,11 +7807,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_apistrict
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "latest-alpha"
           mongosh_test_force_api_strict: "1"
   - name: compile_artifact
@@ -7822,11 +7822,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: compile_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
 
   ###
   # E2E TESTS
@@ -7840,14 +7840,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "stable"
   - name: e2e_tests_darwin_x64_unstable
     tags: ["e2e-test"]
@@ -7858,14 +7858,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: darwin-x64
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "unstable"
   - name: e2e_tests_darwin_arm64
     tags: ["e2e-test"]
@@ -7876,14 +7876,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "stable"
   - name: e2e_tests_darwin_arm64_unstable
     tags: ["e2e-test"]
@@ -7894,14 +7894,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: darwin-arm64
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "unstable"
   - name: e2e_tests_linux_x64
     tags: ["e2e-test"]
@@ -7912,14 +7912,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "stable"
   - name: e2e_tests_linux_x64_unstable
     tags: ["e2e-test"]
@@ -7930,14 +7930,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-x64
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "unstable"
   - name: e2e_tests_linux_arm64
     tags: ["e2e-test"]
@@ -7948,14 +7948,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "stable"
   - name: e2e_tests_linux_arm64_unstable
     tags: ["e2e-test"]
@@ -7966,14 +7966,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-arm64
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "unstable"
   - name: e2e_tests_linux_ppc64le
     tags: ["e2e-test"]
@@ -7984,14 +7984,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "stable"
   - name: e2e_tests_linux_ppc64le_unstable
     tags: ["e2e-test"]
@@ -8002,14 +8002,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-ppc64le
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "unstable"
   - name: e2e_tests_linux_s390x
     tags: ["e2e-test"]
@@ -8020,14 +8020,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "stable"
   - name: e2e_tests_linux_s390x_unstable
     tags: ["e2e-test"]
@@ -8038,14 +8038,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: linux-s390x
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "unstable"
   - name: e2e_tests_win32
     tags: ["e2e-test"]
@@ -8056,14 +8056,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: win32
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "stable"
   - name: e2e_tests_win32_unstable
     tags: ["e2e-test"]
@@ -8074,14 +8074,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: win32
       - func: run_e2e_tests
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           mongosh_server_test_version: "unstable"
 
   ###
@@ -8096,10 +8096,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: darwin-x64
           executable_os_id: darwin-x64
   - name: package_and_upload_artifact_darwin_arm64
@@ -8111,10 +8111,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: darwin-arm64
           executable_os_id: darwin-arm64
   - name: package_and_upload_artifact_linux_x64
@@ -8126,10 +8126,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: linux-x64
           executable_os_id: linux-x64
   - name: package_and_upload_artifact_debian_x64
@@ -8141,10 +8141,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: debian-x64
           executable_os_id: linux-x64
   - name: package_and_upload_artifact_rhel7_x64
@@ -8156,10 +8156,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: rhel7-x64
           executable_os_id: linux-x64
   - name: package_and_upload_artifact_rhel8_x64
@@ -8171,10 +8171,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: rhel8-x64
           executable_os_id: linux-x64
   - name: package_and_upload_artifact_suse_x64
@@ -8186,10 +8186,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: suse-x64
           executable_os_id: linux-x64
   - name: package_and_upload_artifact_amzn1_x64
@@ -8201,10 +8201,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: amzn1-x64
           executable_os_id: linux-x64
   - name: package_and_upload_artifact_linux_arm64
@@ -8216,10 +8216,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: linux-arm64
           executable_os_id: linux-arm64
   - name: package_and_upload_artifact_debian_arm64
@@ -8231,10 +8231,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: debian-arm64
           executable_os_id: linux-arm64
   - name: package_and_upload_artifact_rhel8_arm64
@@ -8246,10 +8246,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: rhel8-arm64
           executable_os_id: linux-arm64
   - name: package_and_upload_artifact_amzn2_arm64
@@ -8261,10 +8261,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: amzn2-arm64
           executable_os_id: linux-arm64
   - name: package_and_upload_artifact_linux_ppc64le
@@ -8276,10 +8276,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: linux-ppc64le
           executable_os_id: linux-ppc64le
   - name: package_and_upload_artifact_rhel8_ppc64le
@@ -8291,10 +8291,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: rhel8-ppc64le
           executable_os_id: linux-ppc64le
   - name: package_and_upload_artifact_linux_s390x
@@ -8306,10 +8306,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: linux-s390x
           executable_os_id: linux-s390x
   - name: package_and_upload_artifact_rhel7_s390x
@@ -8321,10 +8321,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: rhel7-s390x
           executable_os_id: linux-s390x
   - name: package_and_upload_artifact_win32_x64
@@ -8336,10 +8336,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: win32-x64
           executable_os_id: win32
   - name: package_and_upload_artifact_win32msi_x64
@@ -8351,10 +8351,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           distribution_build_variant: win32msi-x64
           executable_os_id: win32
 
@@ -8398,11 +8398,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: ubuntu18.04-deb
   - name: pkg_test_docker_ubuntu20_04_deb
     tags: ["smoke-test"]
@@ -8417,11 +8417,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: ubuntu20.04-deb
   - name: pkg_test_docker_debian9_deb
     tags: ["smoke-test"]
@@ -8436,11 +8436,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: debian9-deb
   - name: pkg_test_docker_debian10_deb
     tags: ["smoke-test"]
@@ -8455,11 +8455,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: debian10-deb
   - name: pkg_test_docker_debian11_deb
     tags: ["smoke-test"]
@@ -8474,11 +8474,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: debian11-deb
   - name: pkg_test_docker_centos7_rpm
     tags: ["smoke-test"]
@@ -8493,11 +8493,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: centos7-rpm
   - name: pkg_test_docker_amazonlinux2_rpm
     tags: ["smoke-test"]
@@ -8512,11 +8512,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: amazonlinux2-rpm
   - name: pkg_test_docker_rocky8_rpm
     tags: ["smoke-test"]
@@ -8531,11 +8531,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: rocky8-rpm
   - name: pkg_test_docker_fedora34_rpm
     tags: ["smoke-test"]
@@ -8550,11 +8550,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: fedora34-rpm
   - name: pkg_test_docker_suse12_rpm
     tags: ["smoke-test"]
@@ -8569,11 +8569,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: suse12-rpm
   - name: pkg_test_docker_suse15_rpm
     tags: ["smoke-test"]
@@ -8588,11 +8588,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: suse15-rpm
   - name: pkg_test_docker_amazonlinux1_rpm
     tags: ["smoke-test"]
@@ -8607,11 +8607,11 @@ tasks:
       - func: write_preload_script
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           dockerfile: amazonlinux1-rpm
   - name: pkg_test_debextract_debian_arm64
     tags: ["smoke-test"]
@@ -8732,11 +8732,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: release_draft
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
   - name: release_publish
     tags: ["publish"]
     git_tag_only: true
@@ -8748,11 +8748,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
           npm_deps_mode: all
       - func: release_publish
         vars:
-          node_js_version: "14.19.1"
+          node_js_version: "16.15.0"
 
 # Need to run builds for every possible build variant.
 buildvariants:
@@ -8763,29 +8763,29 @@ buildvariants:
       executable_os_id: darwin-x64
     tasks:
       - name: check
-      - name: test_n12_arg_parser
+      - name: test_n16_arg_parser
       - name: test_n14_arg_parser
-      - name: test_n12_async_rewriter2
+      - name: test_n16_async_rewriter2
       - name: test_n14_async_rewriter2
-      - name: test_n12_autocomplete
+      - name: test_n16_autocomplete
       - name: test_n14_autocomplete
-      - name: test_n12_browser_repl
+      - name: test_n16_browser_repl
       - name: test_n14_browser_repl
-      - name: test_n12_browser_runtime_core
+      - name: test_n16_browser_runtime_core
       - name: test_n14_browser_runtime_core
-      - name: test_n12_browser_runtime_electron
+      - name: test_n16_browser_runtime_electron
       - name: test_n14_browser_runtime_electron
-      - name: test_n12_build
+      - name: test_n16_build
       - name: test_n14_build
-      - name: test_m40xc_n12_cli_repl
-      - name: test_m40xe_n12_cli_repl
-      - name: test_m42xc_n12_cli_repl
-      - name: test_m42xe_n12_cli_repl
-      - name: test_m44xc_n12_cli_repl
-      - name: test_m44xe_n12_cli_repl
-      - name: test_m50xc_n12_cli_repl
-      - name: test_m50xe_n12_cli_repl
-      - name: test_mlatest_n12_cli_repl
+      - name: test_m40xc_n16_cli_repl
+      - name: test_m40xe_n16_cli_repl
+      - name: test_m42xc_n16_cli_repl
+      - name: test_m42xe_n16_cli_repl
+      - name: test_m44xc_n16_cli_repl
+      - name: test_m44xe_n16_cli_repl
+      - name: test_m50xc_n16_cli_repl
+      - name: test_m50xe_n16_cli_repl
+      - name: test_mlatest_n16_cli_repl
       - name: test_m40xc_n14_cli_repl
       - name: test_m40xe_n14_cli_repl
       - name: test_m42xc_n14_cli_repl
@@ -8795,27 +8795,27 @@ buildvariants:
       - name: test_m50xc_n14_cli_repl
       - name: test_m50xe_n14_cli_repl
       - name: test_mlatest_n14_cli_repl
-      - name: test_n12_editor
+      - name: test_n16_editor
       - name: test_n14_editor
-      - name: test_n12_errors
+      - name: test_n16_errors
       - name: test_n14_errors
-      - name: test_n12_history
+      - name: test_n16_history
       - name: test_n14_history
-      - name: test_n12_i18n
+      - name: test_n16_i18n
       - name: test_n14_i18n
-      - name: test_n12_js_multiline_to_singleline
+      - name: test_n16_js_multiline_to_singleline
       - name: test_n14_js_multiline_to_singleline
-      - name: test_n12_logging
+      - name: test_n16_logging
       - name: test_n14_logging
-      - name: test_m40xc_n12_node_runtime_worker_thread
-      - name: test_m40xe_n12_node_runtime_worker_thread
-      - name: test_m42xc_n12_node_runtime_worker_thread
-      - name: test_m42xe_n12_node_runtime_worker_thread
-      - name: test_m44xc_n12_node_runtime_worker_thread
-      - name: test_m44xe_n12_node_runtime_worker_thread
-      - name: test_m50xc_n12_node_runtime_worker_thread
-      - name: test_m50xe_n12_node_runtime_worker_thread
-      - name: test_mlatest_n12_node_runtime_worker_thread
+      - name: test_m40xc_n16_node_runtime_worker_thread
+      - name: test_m40xe_n16_node_runtime_worker_thread
+      - name: test_m42xc_n16_node_runtime_worker_thread
+      - name: test_m42xe_n16_node_runtime_worker_thread
+      - name: test_m44xc_n16_node_runtime_worker_thread
+      - name: test_m44xe_n16_node_runtime_worker_thread
+      - name: test_m50xc_n16_node_runtime_worker_thread
+      - name: test_m50xe_n16_node_runtime_worker_thread
+      - name: test_mlatest_n16_node_runtime_worker_thread
       - name: test_m40xc_n14_node_runtime_worker_thread
       - name: test_m40xe_n14_node_runtime_worker_thread
       - name: test_m42xc_n14_node_runtime_worker_thread
@@ -8825,17 +8825,17 @@ buildvariants:
       - name: test_m50xc_n14_node_runtime_worker_thread
       - name: test_m50xe_n14_node_runtime_worker_thread
       - name: test_mlatest_n14_node_runtime_worker_thread
-      - name: test_n12_service_provider_core
+      - name: test_n16_service_provider_core
       - name: test_n14_service_provider_core
-      - name: test_m40xc_n12_service_provider_server
-      - name: test_m40xe_n12_service_provider_server
-      - name: test_m42xc_n12_service_provider_server
-      - name: test_m42xe_n12_service_provider_server
-      - name: test_m44xc_n12_service_provider_server
-      - name: test_m44xe_n12_service_provider_server
-      - name: test_m50xc_n12_service_provider_server
-      - name: test_m50xe_n12_service_provider_server
-      - name: test_mlatest_n12_service_provider_server
+      - name: test_m40xc_n16_service_provider_server
+      - name: test_m40xe_n16_service_provider_server
+      - name: test_m42xc_n16_service_provider_server
+      - name: test_m42xe_n16_service_provider_server
+      - name: test_m44xc_n16_service_provider_server
+      - name: test_m44xe_n16_service_provider_server
+      - name: test_m50xc_n16_service_provider_server
+      - name: test_m50xe_n16_service_provider_server
+      - name: test_mlatest_n16_service_provider_server
       - name: test_m40xc_n14_service_provider_server
       - name: test_m40xe_n14_service_provider_server
       - name: test_m42xc_n14_service_provider_server
@@ -8845,15 +8845,15 @@ buildvariants:
       - name: test_m50xc_n14_service_provider_server
       - name: test_m50xe_n14_service_provider_server
       - name: test_mlatest_n14_service_provider_server
-      - name: test_m40xc_n12_shell_api
-      - name: test_m40xe_n12_shell_api
-      - name: test_m42xc_n12_shell_api
-      - name: test_m42xe_n12_shell_api
-      - name: test_m44xc_n12_shell_api
-      - name: test_m44xe_n12_shell_api
-      - name: test_m50xc_n12_shell_api
-      - name: test_m50xe_n12_shell_api
-      - name: test_mlatest_n12_shell_api
+      - name: test_m40xc_n16_shell_api
+      - name: test_m40xe_n16_shell_api
+      - name: test_m42xc_n16_shell_api
+      - name: test_m42xe_n16_shell_api
+      - name: test_m44xc_n16_shell_api
+      - name: test_m44xe_n16_shell_api
+      - name: test_m50xc_n16_shell_api
+      - name: test_m50xe_n16_shell_api
+      - name: test_mlatest_n16_shell_api
       - name: test_m40xc_n14_shell_api
       - name: test_m40xe_n14_shell_api
       - name: test_m42xc_n14_shell_api
@@ -8863,11 +8863,11 @@ buildvariants:
       - name: test_m50xc_n14_shell_api
       - name: test_m50xe_n14_shell_api
       - name: test_mlatest_n14_shell_api
-      - name: test_n12_shell_evaluator
+      - name: test_n16_shell_evaluator
       - name: test_n14_shell_evaluator
-      - name: test_n12_snippet_manager
+      - name: test_n16_snippet_manager
       - name: test_n14_snippet_manager
-      - name: test_n12_types
+      - name: test_n16_types
       - name: test_n14_types
   - name: darwin
     display_name: "MacOS Mojave"
@@ -8902,27 +8902,27 @@ buildvariants:
     tasks:
       - name: compile_ts
       - name: check
-      - name: test_n12_arg_parser
+      - name: test_n16_arg_parser
       - name: test_n14_arg_parser
-      - name: test_n12_async_rewriter2
+      - name: test_n16_async_rewriter2
       - name: test_n14_async_rewriter2
-      - name: test_n12_autocomplete
+      - name: test_n16_autocomplete
       - name: test_n14_autocomplete
-      - name: test_n12_browser_runtime_core
+      - name: test_n16_browser_runtime_core
       - name: test_n14_browser_runtime_core
-      - name: test_n12_browser_runtime_electron
+      - name: test_n16_browser_runtime_electron
       - name: test_n14_browser_runtime_electron
-      - name: test_n12_build
+      - name: test_n16_build
       - name: test_n14_build
-      - name: test_m40xc_n12_cli_repl
-      - name: test_m40xe_n12_cli_repl
-      - name: test_m42xc_n12_cli_repl
-      - name: test_m42xe_n12_cli_repl
-      - name: test_m44xc_n12_cli_repl
-      - name: test_m44xe_n12_cli_repl
-      - name: test_m50xc_n12_cli_repl
-      - name: test_m50xe_n12_cli_repl
-      - name: test_mlatest_n12_cli_repl
+      - name: test_m40xc_n16_cli_repl
+      - name: test_m40xe_n16_cli_repl
+      - name: test_m42xc_n16_cli_repl
+      - name: test_m42xe_n16_cli_repl
+      - name: test_m44xc_n16_cli_repl
+      - name: test_m44xe_n16_cli_repl
+      - name: test_m50xc_n16_cli_repl
+      - name: test_m50xe_n16_cli_repl
+      - name: test_mlatest_n16_cli_repl
       - name: test_m40xc_n14_cli_repl
       - name: test_m40xe_n14_cli_repl
       - name: test_m42xc_n14_cli_repl
@@ -8932,23 +8932,23 @@ buildvariants:
       - name: test_m50xc_n14_cli_repl
       - name: test_m50xe_n14_cli_repl
       - name: test_mlatest_n14_cli_repl
-      - name: test_n12_editor
+      - name: test_n16_editor
       - name: test_n14_editor
-      - name: test_n12_errors
+      - name: test_n16_errors
       - name: test_n14_errors
-      - name: test_n12_history
+      - name: test_n16_history
       - name: test_n14_history
-      - name: test_n12_i18n
+      - name: test_n16_i18n
       - name: test_n14_i18n
-      - name: test_m40xc_n12_java_shell
-      - name: test_m40xe_n12_java_shell
-      - name: test_m42xc_n12_java_shell
-      - name: test_m42xe_n12_java_shell
-      - name: test_m44xc_n12_java_shell
-      - name: test_m44xe_n12_java_shell
-      - name: test_m50xc_n12_java_shell
-      - name: test_m50xe_n12_java_shell
-      - name: test_mlatest_n12_java_shell
+      - name: test_m40xc_n16_java_shell
+      - name: test_m40xe_n16_java_shell
+      - name: test_m42xc_n16_java_shell
+      - name: test_m42xe_n16_java_shell
+      - name: test_m44xc_n16_java_shell
+      - name: test_m44xe_n16_java_shell
+      - name: test_m50xc_n16_java_shell
+      - name: test_m50xe_n16_java_shell
+      - name: test_mlatest_n16_java_shell
       - name: test_m40xc_n14_java_shell
       - name: test_m40xe_n14_java_shell
       - name: test_m42xc_n14_java_shell
@@ -8958,19 +8958,19 @@ buildvariants:
       - name: test_m50xc_n14_java_shell
       - name: test_m50xe_n14_java_shell
       - name: test_mlatest_n14_java_shell
-      - name: test_n12_js_multiline_to_singleline
+      - name: test_n16_js_multiline_to_singleline
       - name: test_n14_js_multiline_to_singleline
-      - name: test_n12_logging
+      - name: test_n16_logging
       - name: test_n14_logging
-      - name: test_m40xc_n12_node_runtime_worker_thread
-      - name: test_m40xe_n12_node_runtime_worker_thread
-      - name: test_m42xc_n12_node_runtime_worker_thread
-      - name: test_m42xe_n12_node_runtime_worker_thread
-      - name: test_m44xc_n12_node_runtime_worker_thread
-      - name: test_m44xe_n12_node_runtime_worker_thread
-      - name: test_m50xc_n12_node_runtime_worker_thread
-      - name: test_m50xe_n12_node_runtime_worker_thread
-      - name: test_mlatest_n12_node_runtime_worker_thread
+      - name: test_m40xc_n16_node_runtime_worker_thread
+      - name: test_m40xe_n16_node_runtime_worker_thread
+      - name: test_m42xc_n16_node_runtime_worker_thread
+      - name: test_m42xe_n16_node_runtime_worker_thread
+      - name: test_m44xc_n16_node_runtime_worker_thread
+      - name: test_m44xe_n16_node_runtime_worker_thread
+      - name: test_m50xc_n16_node_runtime_worker_thread
+      - name: test_m50xe_n16_node_runtime_worker_thread
+      - name: test_mlatest_n16_node_runtime_worker_thread
       - name: test_m40xc_n14_node_runtime_worker_thread
       - name: test_m40xe_n14_node_runtime_worker_thread
       - name: test_m42xc_n14_node_runtime_worker_thread
@@ -8980,17 +8980,17 @@ buildvariants:
       - name: test_m50xc_n14_node_runtime_worker_thread
       - name: test_m50xe_n14_node_runtime_worker_thread
       - name: test_mlatest_n14_node_runtime_worker_thread
-      - name: test_n12_service_provider_core
+      - name: test_n16_service_provider_core
       - name: test_n14_service_provider_core
-      - name: test_m40xc_n12_service_provider_server
-      - name: test_m40xe_n12_service_provider_server
-      - name: test_m42xc_n12_service_provider_server
-      - name: test_m42xe_n12_service_provider_server
-      - name: test_m44xc_n12_service_provider_server
-      - name: test_m44xe_n12_service_provider_server
-      - name: test_m50xc_n12_service_provider_server
-      - name: test_m50xe_n12_service_provider_server
-      - name: test_mlatest_n12_service_provider_server
+      - name: test_m40xc_n16_service_provider_server
+      - name: test_m40xe_n16_service_provider_server
+      - name: test_m42xc_n16_service_provider_server
+      - name: test_m42xe_n16_service_provider_server
+      - name: test_m44xc_n16_service_provider_server
+      - name: test_m44xe_n16_service_provider_server
+      - name: test_m50xc_n16_service_provider_server
+      - name: test_m50xe_n16_service_provider_server
+      - name: test_mlatest_n16_service_provider_server
       - name: test_m40xc_n14_service_provider_server
       - name: test_m40xe_n14_service_provider_server
       - name: test_m42xc_n14_service_provider_server
@@ -9000,15 +9000,15 @@ buildvariants:
       - name: test_m50xc_n14_service_provider_server
       - name: test_m50xe_n14_service_provider_server
       - name: test_mlatest_n14_service_provider_server
-      - name: test_m40xc_n12_shell_api
-      - name: test_m40xe_n12_shell_api
-      - name: test_m42xc_n12_shell_api
-      - name: test_m42xe_n12_shell_api
-      - name: test_m44xc_n12_shell_api
-      - name: test_m44xe_n12_shell_api
-      - name: test_m50xc_n12_shell_api
-      - name: test_m50xe_n12_shell_api
-      - name: test_mlatest_n12_shell_api
+      - name: test_m40xc_n16_shell_api
+      - name: test_m40xe_n16_shell_api
+      - name: test_m42xc_n16_shell_api
+      - name: test_m42xe_n16_shell_api
+      - name: test_m44xc_n16_shell_api
+      - name: test_m44xe_n16_shell_api
+      - name: test_m50xc_n16_shell_api
+      - name: test_m50xe_n16_shell_api
+      - name: test_mlatest_n16_shell_api
       - name: test_m40xc_n14_shell_api
       - name: test_m40xe_n14_shell_api
       - name: test_m42xc_n14_shell_api
@@ -9018,11 +9018,11 @@ buildvariants:
       - name: test_m50xc_n14_shell_api
       - name: test_m50xe_n14_shell_api
       - name: test_mlatest_n14_shell_api
-      - name: test_n12_shell_evaluator
+      - name: test_n16_shell_evaluator
       - name: test_n14_shell_evaluator
-      - name: test_n12_snippet_manager
+      - name: test_n16_snippet_manager
       - name: test_n14_snippet_manager
-      - name: test_n12_types
+      - name: test_n16_types
       - name: test_n14_types
       - name: test_vscode
       - name: test_connectivity
@@ -9184,27 +9184,27 @@ buildvariants:
       executable_os_id: win32
     tasks:
       - name: check
-      - name: test_n12_arg_parser
+      - name: test_n16_arg_parser
       - name: test_n14_arg_parser
-      - name: test_n12_async_rewriter2
+      - name: test_n16_async_rewriter2
       - name: test_n14_async_rewriter2
-      - name: test_n12_autocomplete
+      - name: test_n16_autocomplete
       - name: test_n14_autocomplete
-      - name: test_n12_browser_runtime_core
+      - name: test_n16_browser_runtime_core
       - name: test_n14_browser_runtime_core
-      - name: test_n12_browser_runtime_electron
+      - name: test_n16_browser_runtime_electron
       - name: test_n14_browser_runtime_electron
-      - name: test_n12_build
+      - name: test_n16_build
       - name: test_n14_build
-      - name: test_m40xc_n12_cli_repl
-      - name: test_m40xe_n12_cli_repl
-      - name: test_m42xc_n12_cli_repl
-      - name: test_m42xe_n12_cli_repl
-      - name: test_m44xc_n12_cli_repl
-      - name: test_m44xe_n12_cli_repl
-      - name: test_m50xc_n12_cli_repl
-      - name: test_m50xe_n12_cli_repl
-      - name: test_mlatest_n12_cli_repl
+      - name: test_m40xc_n16_cli_repl
+      - name: test_m40xe_n16_cli_repl
+      - name: test_m42xc_n16_cli_repl
+      - name: test_m42xe_n16_cli_repl
+      - name: test_m44xc_n16_cli_repl
+      - name: test_m44xe_n16_cli_repl
+      - name: test_m50xc_n16_cli_repl
+      - name: test_m50xe_n16_cli_repl
+      - name: test_mlatest_n16_cli_repl
       - name: test_m40xc_n14_cli_repl
       - name: test_m40xe_n14_cli_repl
       - name: test_m42xc_n14_cli_repl
@@ -9214,27 +9214,27 @@ buildvariants:
       - name: test_m50xc_n14_cli_repl
       - name: test_m50xe_n14_cli_repl
       - name: test_mlatest_n14_cli_repl
-      - name: test_n12_editor
+      - name: test_n16_editor
       - name: test_n14_editor
-      - name: test_n12_errors
+      - name: test_n16_errors
       - name: test_n14_errors
-      - name: test_n12_history
+      - name: test_n16_history
       - name: test_n14_history
-      - name: test_n12_i18n
+      - name: test_n16_i18n
       - name: test_n14_i18n
-      - name: test_n12_js_multiline_to_singleline
+      - name: test_n16_js_multiline_to_singleline
       - name: test_n14_js_multiline_to_singleline
-      - name: test_n12_logging
+      - name: test_n16_logging
       - name: test_n14_logging
-      - name: test_m40xc_n12_node_runtime_worker_thread
-      - name: test_m40xe_n12_node_runtime_worker_thread
-      - name: test_m42xc_n12_node_runtime_worker_thread
-      - name: test_m42xe_n12_node_runtime_worker_thread
-      - name: test_m44xc_n12_node_runtime_worker_thread
-      - name: test_m44xe_n12_node_runtime_worker_thread
-      - name: test_m50xc_n12_node_runtime_worker_thread
-      - name: test_m50xe_n12_node_runtime_worker_thread
-      - name: test_mlatest_n12_node_runtime_worker_thread
+      - name: test_m40xc_n16_node_runtime_worker_thread
+      - name: test_m40xe_n16_node_runtime_worker_thread
+      - name: test_m42xc_n16_node_runtime_worker_thread
+      - name: test_m42xe_n16_node_runtime_worker_thread
+      - name: test_m44xc_n16_node_runtime_worker_thread
+      - name: test_m44xe_n16_node_runtime_worker_thread
+      - name: test_m50xc_n16_node_runtime_worker_thread
+      - name: test_m50xe_n16_node_runtime_worker_thread
+      - name: test_mlatest_n16_node_runtime_worker_thread
       - name: test_m40xc_n14_node_runtime_worker_thread
       - name: test_m40xe_n14_node_runtime_worker_thread
       - name: test_m42xc_n14_node_runtime_worker_thread
@@ -9244,17 +9244,17 @@ buildvariants:
       - name: test_m50xc_n14_node_runtime_worker_thread
       - name: test_m50xe_n14_node_runtime_worker_thread
       - name: test_mlatest_n14_node_runtime_worker_thread
-      - name: test_n12_service_provider_core
+      - name: test_n16_service_provider_core
       - name: test_n14_service_provider_core
-      - name: test_m40xc_n12_service_provider_server
-      - name: test_m40xe_n12_service_provider_server
-      - name: test_m42xc_n12_service_provider_server
-      - name: test_m42xe_n12_service_provider_server
-      - name: test_m44xc_n12_service_provider_server
-      - name: test_m44xe_n12_service_provider_server
-      - name: test_m50xc_n12_service_provider_server
-      - name: test_m50xe_n12_service_provider_server
-      - name: test_mlatest_n12_service_provider_server
+      - name: test_m40xc_n16_service_provider_server
+      - name: test_m40xe_n16_service_provider_server
+      - name: test_m42xc_n16_service_provider_server
+      - name: test_m42xe_n16_service_provider_server
+      - name: test_m44xc_n16_service_provider_server
+      - name: test_m44xe_n16_service_provider_server
+      - name: test_m50xc_n16_service_provider_server
+      - name: test_m50xe_n16_service_provider_server
+      - name: test_mlatest_n16_service_provider_server
       - name: test_m40xc_n14_service_provider_server
       - name: test_m40xe_n14_service_provider_server
       - name: test_m42xc_n14_service_provider_server
@@ -9264,15 +9264,15 @@ buildvariants:
       - name: test_m50xc_n14_service_provider_server
       - name: test_m50xe_n14_service_provider_server
       - name: test_mlatest_n14_service_provider_server
-      - name: test_m40xc_n12_shell_api
-      - name: test_m40xe_n12_shell_api
-      - name: test_m42xc_n12_shell_api
-      - name: test_m42xe_n12_shell_api
-      - name: test_m44xc_n12_shell_api
-      - name: test_m44xe_n12_shell_api
-      - name: test_m50xc_n12_shell_api
-      - name: test_m50xe_n12_shell_api
-      - name: test_mlatest_n12_shell_api
+      - name: test_m40xc_n16_shell_api
+      - name: test_m40xe_n16_shell_api
+      - name: test_m42xc_n16_shell_api
+      - name: test_m42xe_n16_shell_api
+      - name: test_m44xc_n16_shell_api
+      - name: test_m44xe_n16_shell_api
+      - name: test_m50xc_n16_shell_api
+      - name: test_m50xe_n16_shell_api
+      - name: test_mlatest_n16_shell_api
       - name: test_m40xc_n14_shell_api
       - name: test_m40xe_n14_shell_api
       - name: test_m42xc_n14_shell_api
@@ -9282,11 +9282,11 @@ buildvariants:
       - name: test_m50xc_n14_shell_api
       - name: test_m50xe_n14_shell_api
       - name: test_mlatest_n14_shell_api
-      - name: test_n12_shell_evaluator
+      - name: test_n16_shell_evaluator
       - name: test_n14_shell_evaluator
-      - name: test_n12_snippet_manager
+      - name: test_n16_snippet_manager
       - name: test_n14_snippet_manager
-      - name: test_n12_types
+      - name: test_n16_types
       - name: test_n14_types
   - name: win32
     display_name: "Windows VS 2019"
diff --git a/.evergreen/compile-artifact.sh b/.evergreen/compile-artifact.sh
index 182e2db19f..0b237d7413 100755
--- a/.evergreen/compile-artifact.sh
+++ b/.evergreen/compile-artifact.sh
@@ -13,40 +13,9 @@ if uname -a | grep -q 'Linux.*x86_64'; then
   export CXX="$PWD/tmp/.sccache/sccache g++"
 fi
 
-if uname -p | sed -e 's/s390/matches/' -e 's/ppc/matches/' | grep -q matches; then
-  # On s390x and PPC machines in evergreen, there is a Python 3.x installation
-  # in /opt/mongodbtoolchain/v3/bin, but it's broken in the sense that its bz2
-  # package cannot be loaded, which we need for building Node.js.
-  # We therefore do some PATH wiggling here to make sure that the python
-  # executable used by the Node.js configure script is python 2.x.
-  # This is not a sustainable long-term solution, because Node.js drops Python 2
-  # support for build scripts with Node.js 15 and above.
-  # TODO: Open a build ticket about this, referencing patch/output from
-  # https://spruce.mongodb.com/version/608ad4613e8e8601d5cd3d6f/tasks.
-  rm -rf tmp/python-container
-  mkdir -p tmp/python-container
-  (cd tmp/python-container && ln -s /usr/bin/python python && ln -s python python2.7 && ln -s python python2)
-  export PATH="$PWD/tmp/python-container:$PATH"
-  export FORCE_PYTHON2=1
-
-  echo "Using python version:"
-  python --version
-fi
-
-if [ "$OS" == "Windows_NT" ]; then
-  # Windows machines only have Python 3.10 and 2.7, since Python 3.9
-  # was removed from them. Python 3.10 support may or may not be
-  # backported to Node.js 14: https://github.com/nodejs/node/pull/40296/
-  # For now, let's use Python 2.7.
-  export PATH="/cygdrive/c/Python27/Scripts:/cygdrive/c/Python27:$PATH"
-  export FORCE_PYTHON2=1
-
-  echo "Using python version:"
-  python --version
-fi
-
 export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true"
-npm run evergreen-release compile
+mkdir -pv /tmp/m # Node.js compilation can fail on long path prefixes
+(env TMP=/tmp/m TMPDIR=/tmp/m npm run evergreen-release compile && rm -rf /tmp/m) || (rm -rf /tmp/m; false)
 dist/mongosh --version
 dist/mongosh --build-info
 dist/mongosh --build-info | grep -q '"distributionKind": "compiled"'
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
index b84dd3b0d5..e73854e08e 100644
--- a/.evergreen/evergreen.yml.in
+++ b/.evergreen/evergreen.yml.in
@@ -2,8 +2,8 @@
 <%
 const path = require('path');
 
-const NODE_JS_VERSION_14 = '14.19.1';
-const NODE_JS_VERSION_12 = '12.22.11';
+const NODE_JS_VERSION_14 = '14.19.2';
+const NODE_JS_VERSION_16 = '16.15.0';
 
 const MONGODB_VERSIONS = [
   { shortName: '40xc', versionSpec: '4.0.x-community' },
@@ -17,8 +17,8 @@ const MONGODB_VERSIONS = [
   { shortName: 'latest', versionSpec: 'latest-alpha' }
 ];
 const NODE_VERSIONS = [
-  { shortName: '12', versionSpec: NODE_JS_VERSION_12, skipNodeVersionCheck: '1' },
-  { shortName: '14', versionSpec: NODE_JS_VERSION_14, skipNodeVersionCheck: '' }
+  { shortName: '16', versionSpec: NODE_JS_VERSION_16, skipNodeVersionCheck: '' },
+  { shortName: '14', versionSpec: NODE_JS_VERSION_14, skipNodeVersionCheck: '1' }
 ];
 
 const pathToPackages = path.join(__dirname, '..', 'packages');
@@ -630,7 +630,7 @@ tasks:
       - func: checkout
       - func: compile_ts
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
 
   - name: check
     depends_on:
@@ -640,11 +640,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: all
       - func: check
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
 
   - name: check_coverage
     depends_on:
@@ -654,11 +654,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: cli_build
       - func: check_coverage
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
 
   ###
   # UNIT TESTS
@@ -697,11 +697,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_12) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
           npm_deps_mode: all
       - func: test_vscode
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_12) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
   - name: test_connectivity
     tags: ["extra-integration-test"]
     depends_on:
@@ -711,7 +711,7 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: all
       - func: test_connectivity
   - name: test_apistrict
@@ -723,11 +723,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: cli_build
       - func: test_apistrict
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           mongosh_server_test_version: "latest-alpha"
           mongosh_test_force_api_strict: "1"
   - name: compile_artifact
@@ -738,11 +738,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: cli_build
       - func: compile_artifact
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
 
   ###
   # E2E TESTS
@@ -759,14 +759,14 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: cli_build
       - func: download_compiled_artifact
         vars:
           executable_os_id: <% out(executableOsId) %>
       - func: run_e2e_tests
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           mongosh_server_test_version: "<% out(mVersion) %>"
   <% } } %>
 
@@ -784,10 +784,10 @@ tasks:
       - func: install
         vars:
           npm_deps_mode: cli_build
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
       - func: package_and_upload_artifact
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           distribution_build_variant: <% out(distributionBuildVariant) %>
           executable_os_id: <% out(executableOsId) %>
   <% } } %>
@@ -823,11 +823,11 @@ tasks:
        case 'docker': { %>
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: cli_build
       - func: test_artifact_docker
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           dockerfile: <% out(dockerfile) %>
     <% }; break;
     // We don't have docker for platforms other than x64, so for those we just
@@ -862,11 +862,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: all
       - func: release_draft
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
   - name: release_publish
     tags: ["publish"]
     git_tag_only: true
@@ -878,11 +878,11 @@ tasks:
       - func: checkout
       - func: install
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
           npm_deps_mode: all
       - func: release_publish
         vars:
-          node_js_version: "<% out(NODE_JS_VERSION_14) %>"
+          node_js_version: "<% out(NODE_JS_VERSION_16) %>"
 
 # Need to run builds for every possible build variant.
 buildvariants:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 91099e3dbd..66693697df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ Please include as much information as possible about your environment.
 
 ## Node.js versions
 
-We support Node.js 12.x+ for the individual packages, and Node.js 14.x only for
+We support Node.js 14.x+ for the individual packages, and Node.js 16.x only for
 the CLI repl specifically. These versions are mentioned:
 
 - In the individual packages’ package.json files
diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json
index 0cf0ba7cd3..219c921f5c 100644
--- a/packages/arg-parser/package.json
+++ b/packages/arg-parser/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
     "unitTestsOnly": true
diff --git a/packages/async-rewriter2/package.json b/packages/async-rewriter2/package.json
index 216754620a..a086ad7e89 100644
--- a/packages/async-rewriter2/package.json
+++ b/packages/async-rewriter2/package.json
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
     "unitTestsOnly": true
diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json
index 7666cb37a1..650daa5131 100644
--- a/packages/autocomplete/package.json
+++ b/packages/autocomplete/package.json
@@ -14,7 +14,7 @@
     "url": "https://github.com/mongodb-js/mongosh"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "scripts": {
     "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 60000 -r ts-node/register \"./{src,lib}/**/*.spec.ts\"",
diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json
index abf901cf06..30e57331f8 100644
--- a/packages/browser-repl/package.json
+++ b/packages/browser-repl/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0-dev.0",
   "description": "Browser presentation component for Mongo Shell",
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "main": "lib/mongosh-browser-repl.js",
   "scripts": {
diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json
index 6831f4db5e..7f81017029 100644
--- a/packages/browser-runtime-core/package.json
+++ b/packages/browser-runtime-core/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "config": {
     "unsafe-perm": true
diff --git a/packages/browser-runtime-electron/package.json b/packages/browser-runtime-electron/package.json
index e888e8c8b0..281aebc93a 100644
--- a/packages/browser-runtime-electron/package.json
+++ b/packages/browser-runtime-electron/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "config": {
     "unsafe-perm": true
diff --git a/packages/build/package.json b/packages/build/package.json
index 46ec3ca211..cffccbbd1a 100644
--- a/packages/build/package.json
+++ b/packages/build/package.json
@@ -27,7 +27,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "dependency-check": {
     "entries": [
diff --git a/packages/build/src/compile/signable-compiler.ts b/packages/build/src/compile/signable-compiler.ts
index 35a3568657..551544fe87 100644
--- a/packages/build/src/compile/signable-compiler.ts
+++ b/packages/build/src/compile/signable-compiler.ts
@@ -1,5 +1,6 @@
 /* eslint-disable no-nested-ternary */
 import os from 'os';
+import { promises as fs } from 'fs';
 import Module from 'module';
 import pkgUp from 'pkg-up';
 import path from 'path';
@@ -27,6 +28,27 @@ async function preCompileHook(nodeSourceTree: string) {
   if (code !== 0) {
     throw new Error(`pre-compile hook failed with code ${code}`);
   }
+
+  const patchDirectory = path.resolve(__dirname, '..', '..', '..', '..', 'scripts', 'nodejs-patches');
+  // Sort all entries in the directory so that they are applied
+  // in order 001-(...).patch, 002-(...).patch, etc.
+  const patchFiles = (await fs.readdir(patchDirectory)).sort();
+  for (const entry of patchFiles) {
+    const patchFile = path.resolve(patchDirectory, entry);
+    console.warn(`Applying patch from ${patchFile}...`);
+    // NB: git apply doesn't need to be run in a git repository in order to work
+    const proc = childProcess.spawn(
+      'git', ['apply', patchFile],
+      {
+        cwd: nodeSourceTree,
+        stdio: 'inherit'
+      }
+    );
+    const [ code ] = await once(proc, 'exit');
+    if (code !== 0) {
+      throw new Error(`applying patch failed with code ${code}`);
+    }
+  }
 }
 
 async function findModulePath(lernaPkg: string, mod: string): Promise<string> {
diff --git a/packages/build/src/homebrew/generate-formula.spec.ts b/packages/build/src/homebrew/generate-formula.spec.ts
index 3fab42681d..86da940b12 100644
--- a/packages/build/src/homebrew/generate-formula.spec.ts
+++ b/packages/build/src/homebrew/generate-formula.spec.ts
@@ -21,11 +21,11 @@ class Mongosh < Formula
     sha256 mojave:        "9c46c746cf8f65a8418cb39237471cd6338135e398f2ace965a6c580e1165951"
   end
 
-  depends_on "node@14"
+  depends_on "node@16"
 
   def install
-    system "#{Formula["node@14"].bin}/npm", "install", *Language::Node.std_npm_install_args(libexec)
-    (bin/"mongosh").write_env_script libexec/"bin/mongosh", PATH: "#{Formula["node@14"].opt_bin}:$PATH"
+    system "#{Formula["node@16"].bin}/npm", "install", *Language::Node.std_npm_install_args(libexec)
+    (bin/"mongosh").write_env_script libexec/"bin/mongosh", PATH: "#{Formula["node@16"].opt_bin}:$PATH"
   end
 
   test do
@@ -67,11 +67,11 @@ class Mongosh < Formula
     sha256 mojave:        "9c46c746cf8f65a8418cb39237471cd6338135e398f2ace965a6c580e1165951"
   end
 
-  depends_on "node@14"
+  depends_on "node@16"
 
   def install
-    system "#{Formula["node@14"].bin}/npm", "install", *Language::Node.std_npm_install_args(libexec)
-    (bin/"mongosh").write_env_script libexec/"bin/mongosh", PATH: "#{Formula["node@14"].opt_bin}:$PATH"
+    system "#{Formula["node@16"].bin}/npm", "install", *Language::Node.std_npm_install_args(libexec)
+    (bin/"mongosh").write_env_script libexec/"bin/mongosh", PATH: "#{Formula["node@16"].opt_bin}:$PATH"
   end
 
   test do
diff --git a/packages/cli-repl/package-lock.json b/packages/cli-repl/package-lock.json
index a89f433b09..37222beec2 100644
--- a/packages/cli-repl/package-lock.json
+++ b/packages/cli-repl/package-lock.json
@@ -43,7 +43,7 @@
 				"mongodb-csfle-library-dummy": "^1.0.1"
 			},
 			"engines": {
-				"node": ">=14.15.0"
+				"node": ">=16.15.0"
 			},
 			"optionalDependencies": {
 				"get-console-process-list": "^1.0.4",
diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json
index 21a58f1bd8..b850113500 100644
--- a/packages/cli-repl/package.json
+++ b/packages/cli-repl/package.json
@@ -36,7 +36,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=16.15.0"
   },
   "mongosh": {
     "ciRequiredOptionalDependencies": {
diff --git a/packages/connectivity-tests/test/all.sh b/packages/connectivity-tests/test/all.sh
index 272b9bdc36..863d767f59 100755
--- a/packages/connectivity-tests/test/all.sh
+++ b/packages/connectivity-tests/test/all.sh
@@ -16,7 +16,7 @@ cd test-envs
 
 git checkout f029f9e3a9cc006a6aeb60d941b4f8d87ae4bc95
 
-source "$CONNECTIVITY_TEST_SOURCE_DIR/ldap.sh"
-source "$CONNECTIVITY_TEST_SOURCE_DIR/localhost.sh"
-source "$CONNECTIVITY_TEST_SOURCE_DIR/atlas.sh"
-source "$CONNECTIVITY_TEST_SOURCE_DIR/kerberos.sh"
+"$CONNECTIVITY_TEST_SOURCE_DIR/ldap.sh"
+"$CONNECTIVITY_TEST_SOURCE_DIR/localhost.sh"
+"$CONNECTIVITY_TEST_SOURCE_DIR/atlas.sh"
+"$CONNECTIVITY_TEST_SOURCE_DIR/kerberos.sh"
diff --git a/packages/connectivity-tests/test/atlas.sh b/packages/connectivity-tests/test/atlas.sh
old mode 100644
new mode 100755
index a426a5dad1..93ae5c7e48
--- a/packages/connectivity-tests/test/atlas.sh
+++ b/packages/connectivity-tests/test/atlas.sh
@@ -29,7 +29,7 @@ if
 then
   echo "Atlas credentials are not provided"
 
-  if [[ -z "${IS_CI}" ]] || [[ -z "${CI}" ]]; then
+  if [[ -n "${IS_CI}" ]] || [[ -n "${CI}" ]]; then
     exit 1
   else
     exit 0
diff --git a/packages/connectivity-tests/test/kerberos/Dockerfile b/packages/connectivity-tests/test/kerberos/Dockerfile
index 8f956de2f3..1bf613f8f7 100644
--- a/packages/connectivity-tests/test/kerberos/Dockerfile
+++ b/packages/connectivity-tests/test/kerberos/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:16
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
diff --git a/packages/editor/package.json b/packages/editor/package.json
index ee55cd326d..acba95fd16 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=16.15.0"
   },
   "mongosh": {
     "unitTestsOnly": true
diff --git a/packages/errors/package.json b/packages/errors/package.json
index b1ca47e6e5..69dddb9393 100644
--- a/packages/errors/package.json
+++ b/packages/errors/package.json
@@ -14,7 +14,7 @@
     "url": "https://github.com/mongodb-js/mongosh"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "scripts": {
     "test": "mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 -r ts-node/register \"./src/**/*.spec.ts\"",
diff --git a/packages/history/package.json b/packages/history/package.json
index d46c30ce91..ba5c487071 100644
--- a/packages/history/package.json
+++ b/packages/history/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
     "unitTestsOnly": true
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 2c7c6b3a7e..764ae2a676 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "dependency-check": {
     "entries": [
diff --git a/packages/java-shell/package-lock.json b/packages/java-shell/package-lock.json
index 66ba21cf1e..6bb3d8e32f 100644
--- a/packages/java-shell/package-lock.json
+++ b/packages/java-shell/package-lock.json
@@ -13,7 +13,7 @@
 				"uglifyify": "latest"
 			},
 			"engines": {
-				"node": ">=12.4.0"
+				"node": ">=14.15.1"
 			}
 		},
 		"node_modules/acorn": {
diff --git a/packages/java-shell/package.json b/packages/java-shell/package.json
index 2b42af4a35..41d49a45d5 100644
--- a/packages/java-shell/package.json
+++ b/packages/java-shell/package.json
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
     "variants": [
diff --git a/packages/js-multiline-to-singleline/package.json b/packages/js-multiline-to-singleline/package.json
index 23563e66cf..427626e0e2 100644
--- a/packages/js-multiline-to-singleline/package.json
+++ b/packages/js-multiline-to-singleline/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
     "unitTestsOnly": true
diff --git a/packages/logging/package.json b/packages/logging/package.json
index b625157645..d6e52e2fc5 100644
--- a/packages/logging/package.json
+++ b/packages/logging/package.json
@@ -14,7 +14,7 @@
     "url": "https://github.com/mongodb-js/mongosh"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "dependencies": {
     "@mongodb-js/devtools-connect": "^1.4.2",
diff --git a/packages/mongosh/package.json b/packages/mongosh/package.json
index e0919bc0bf..95008f5881 100644
--- a/packages/mongosh/package.json
+++ b/packages/mongosh/package.json
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=14.15.0"
+    "node": ">=16.15.0"
   },
   "mongosh": {
     "variants": []
diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json
index d4d507b460..94e5657ead 100644
--- a/packages/node-runtime-worker-thread/package.json
+++ b/packages/node-runtime-worker-thread/package.json
@@ -14,7 +14,7 @@
     "url": "https://github.com/mongodb-js/mongosh"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "scripts": {
     "test": "cross-env TS_NODE_PROJECT=./tsconfig.test.json mocha -r \"../../scripts/import-expansions.js\" --timeout 15000 -r ts-node/register \"./src/**/*.spec.ts\"",
diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json
index f63abf8029..1a72ada494 100644
--- a/packages/service-provider-core/package.json
+++ b/packages/service-provider-core/package.json
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
     "unitTestsOnly": true,
diff --git a/packages/service-provider-server/package-lock.json b/packages/service-provider-server/package-lock.json
index eadfe8b534..abe676cf49 100644
--- a/packages/service-provider-server/package-lock.json
+++ b/packages/service-provider-server/package-lock.json
@@ -17,7 +17,7 @@
 				"saslprep": "mongodb-js/saslprep#v1.0.4"
 			},
 			"engines": {
-				"node": ">=12.4.0"
+				"node": ">=14.15.1"
 			},
 			"optionalDependencies": {
 				"kerberos": "^2.0.0",
diff --git a/packages/service-provider-server/package.json b/packages/service-provider-server/package.json
index 076afe6caf..9818fb92aa 100644
--- a/packages/service-provider-server/package.json
+++ b/packages/service-provider-server/package.json
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "dependency-check": {
     "entries": [
diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json
index 51592c042f..5e24fe5260 100644
--- a/packages/shell-api/package.json
+++ b/packages/shell-api/package.json
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "precommit": [
     "build"
diff --git a/packages/shell-evaluator/package.json b/packages/shell-evaluator/package.json
index d18672e3ce..15f7b7621b 100644
--- a/packages/shell-evaluator/package.json
+++ b/packages/shell-evaluator/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
     "unitTestsOnly": true
diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json
index c24074282f..bce1e627ef 100644
--- a/packages/snippet-manager/package.json
+++ b/packages/snippet-manager/package.json
@@ -23,7 +23,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "mongosh": {
     "unitTestsOnly": true
diff --git a/packages/types/package.json b/packages/types/package.json
index 9bc0ed60d1..3e28a2c8bf 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -11,7 +11,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=12.4.0"
+    "node": ">=14.15.1"
   },
   "repository": {
     "type": "git",
diff --git a/scripts/docker/rocky8-package.Dockerfile b/scripts/docker/rocky8-package.Dockerfile
index 8ee09679de..8e1ce1c8e4 100644
--- a/scripts/docker/rocky8-package.Dockerfile
+++ b/scripts/docker/rocky8-package.Dockerfile
@@ -7,7 +7,7 @@ RUN dnf -y install epel-release
 RUN dnf -y install python3 rpm-build dpkg-devel dpkg-dev git
 
 # Add Node.js
-RUN curl -sL https://rpm.nodesource.com/setup_14.x | bash -
+RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash -
 RUN dnf install -y nodejs
 RUN npm i -g npm@8.x
 # For some reason npm@8 failed silently (!) when $HOME was
diff --git a/scripts/docker/ubuntu18.04-xvfb.Dockerfile b/scripts/docker/ubuntu18.04-xvfb.Dockerfile
index 0ede1101ff..4eaf976e38 100644
--- a/scripts/docker/ubuntu18.04-xvfb.Dockerfile
+++ b/scripts/docker/ubuntu18.04-xvfb.Dockerfile
@@ -6,8 +6,8 @@ RUN apt-get -y -qq install git curl apt-transport-https ca-certificates apt-util
 
 # Add Node.js
 RUN curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
-RUN echo "deb https://deb.nodesource.com/node_12.x bionic main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN echo "deb-src https://deb.nodesource.com/node_12.x bionic main" | tee -a /etc/apt/sources.list.d/nodesource.list
+RUN echo "deb https://deb.nodesource.com/node_14.x bionic main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN echo "deb-src https://deb.nodesource.com/node_14.x bionic main" | tee -a /etc/apt/sources.list.d/nodesource.list
 
 # Install Node.js and vscode dependencies
 RUN apt-get update
diff --git a/scripts/nodejs-patches/001-configure-bz2.patch b/scripts/nodejs-patches/001-configure-bz2.patch
new file mode 100644
index 0000000000..8ed943144a
--- /dev/null
+++ b/scripts/nodejs-patches/001-configure-bz2.patch
@@ -0,0 +1,33 @@
+diff --git a/configure.py b/configure.py
+index 95b31769cb57..cf11e9527c71 100755
+--- a/configure.py
++++ b/configure.py
+@@ -11,7 +11,7 @@ import re
+ import shlex
+ import subprocess
+ import shutil
+-import bz2
++#import bz2
+ import io
+
+ from distutils.version import StrictVersion
+@@ -1789,12 +1789,18 @@ def configure_intl(o):
+       shutil.rmtree(icu_tmp_path)
+     os.mkdir(icu_tmp_path)
+     icu_data_path = os.path.join(icu_tmp_path, icu_data_file_l)
+-    with open(icu_data_path, 'wb') as outf:
++    if os.name == 'nt':
++      print('Decompressing icu data using python bz2')
++      import bz2
++      with open(icu_data_path, 'wb') as outf:
+         inf = bz2.BZ2File(compressed_data, 'rb')
+         try:
+           shutil.copyfileobj(inf, outf)
+         finally:
+           inf.close()
++    else:
++      print('Decompressing icu data using bzip2 -d')
++      subprocess.run(["sh", "-c", "bzip2 -d < '%s' > '%s'" % (compressed_data, icu_data_path)]).check_returncode()
+     # Now, proceed..
+
+   # relative to dep..