diff --git a/.evergreen/config_generator/components/funcs/install_c_driver.py b/.evergreen/config_generator/components/funcs/install_c_driver.py
index eccc96caaf..94af9fbdc5 100644
--- a/.evergreen/config_generator/components/funcs/install_c_driver.py
+++ b/.evergreen/config_generator/components/funcs/install_c_driver.py
@@ -7,14 +7,13 @@
 from typing import Mapping
 
 
-# If updating mongoc_version_minimum, also update:
+# If updating mongoc_version_minimum to a new release (not pinning to an unreleased commit), also update:
 # - BSON_REQUIRED_VERSION and MONGOC_REQUIRED_VERSION in CMakeLists.txt
 # - the version of pkg:github/mongodb/mongo-c-driver in etc/purls.txt
 # - the default value of --c-driver-build-ref in etc/make_release.py
-# Only MONGOC_DOWNLOAD_VERSION needs to be updated when pinning to an unreleased commit.
 # If pinning to an unreleased commit, create a "Blocked" JIRA ticket with
 # a "depends on" link to the appropriate C Driver version release ticket.
-MONGOC_VERSION_MINIMUM = '2.0.2'
+MONGOC_VERSION_MINIMUM = '912209d5dc985758bc3d70b105dc5166e3ded7c3'  # TODO: bump to 2.1.0 once released.
 
 
 class InstallCDriver(Function):
diff --git a/.evergreen/config_generator/components/funcs/test.py b/.evergreen/config_generator/components/funcs/test.py
index 8c65210db5..5a7eac6168 100644
--- a/.evergreen/config_generator/components/funcs/test.py
+++ b/.evergreen/config_generator/components/funcs/test.py
@@ -33,6 +33,7 @@ class Test(Function):
             'MONGODB_API_VERSION',
             'platform',
             'TEST_WITH_ASAN',
+            'TEST_WITH_CSFLE',
             'TEST_WITH_UBSAN',
             'TEST_WITH_VALGRIND',
             'use_mongocryptd',
diff --git a/.evergreen/config_generator/components/integration.py b/.evergreen/config_generator/components/integration.py
index c4bc19103a..3427551460 100644
--- a/.evergreen/config_generator/components/integration.py
+++ b/.evergreen/config_generator/components/integration.py
@@ -24,8 +24,7 @@
 LINUX_MATRIX = [
     # Linux x86_64 (full).
     # RHEL 8 x86_64: 4.0+.
-    ('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], [       '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
-    ('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain',        ], ['4.0',                                                   ], ['single', 'replica', 'sharded']),  # CSFLE: 4.2+.
+    ('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
 
     # Linux ARM64 (full).
     # Linux ARM64: 4.4+.
diff --git a/.evergreen/config_generator/components/sanitizers.py b/.evergreen/config_generator/components/sanitizers.py
index 0309c102eb..f02efbd0e1 100644
--- a/.evergreen/config_generator/components/sanitizers.py
+++ b/.evergreen/config_generator/components/sanitizers.py
@@ -22,7 +22,7 @@
 # pylint: disable=line-too-long
 # fmt: off
 MATRIX = [
-    ('rhel80', ['asan', 'ubsan'], ['shared', 'static'], ['4.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
+    ('rhel80', ['asan', 'ubsan'], ['static'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
 ]
 # fmt: on
 # pylint: enable=line-too-long
@@ -57,9 +57,9 @@ def tasks():
             updates += [KeyValueParam(key=key, value=value)
                         for key, value in [('cc_compiler', cc_compiler), ('cxx_compiler', cxx_compiler)]]
 
-            icd_vars = {'SKIP_INSTALL_LIBMONGOCRYPT': 1}
-            compile_vars = {'ENABLE_TESTS': 'ON', 'RUN_DISTCHECK': 1}
+            compile_vars = {'ENABLE_TESTS': 'ON'}
             test_vars = {
+                'TEST_WITH_CSFLE': 'ON',
                 'MONGOCXX_TEST_TOPOLOGY': topology,
                 'example_projects_cc': 'clang',
                 'example_projects_cxx': 'clang++',
@@ -96,7 +96,7 @@ def tasks():
             commands += [
                 Setup.call(),
                 StartMongod.call(mongodb_version=mongodb_version, topology=topology),
-                InstallCDriver.call(vars=icd_vars),
+                InstallCDriver.call(),
                 InstallUV.call(),
                 Compile.call(vars=compile_vars),
                 FetchDET.call(),
diff --git a/.evergreen/config_generator/components/valgrind.py b/.evergreen/config_generator/components/valgrind.py
index 48140b8a0b..3e0085bd5e 100644
--- a/.evergreen/config_generator/components/valgrind.py
+++ b/.evergreen/config_generator/components/valgrind.py
@@ -23,7 +23,7 @@
 # fmt: off
 MATRIX = [
     # min-max-latest
-    ('rhel80', None, ['shared'], ['4.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
+    ('rhel80', None, ['shared'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
 ]
 # fmt: on
 # pylint: enable=line-too-long
diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml
index 16633e220a..e41e593ff6 100644
--- a/.evergreen/generated_configs/functions.yml
+++ b/.evergreen/generated_configs/functions.yml
@@ -483,7 +483,7 @@ functions:
       type: setup
       params:
         updates:
-          - { key: mongoc_version_minimum, value: 2.0.2 }
+          - { key: mongoc_version_minimum, value: 912209d5dc985758bc3d70b105dc5166e3ded7c3 }
     - command: subprocess.exec
       type: setup
       params:
@@ -692,6 +692,7 @@ functions:
         - MONGODB_API_VERSION
         - platform
         - TEST_WITH_ASAN
+        - TEST_WITH_CSFLE
         - TEST_WITH_UBSAN
         - TEST_WITH_VALGRIND
         - use_mongocryptd
diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
index 50b97ebf1e..0b8d8ee2c2 100644
--- a/.evergreen/generated_configs/tasks.yml
+++ b/.evergreen/generated_configs/tasks.yml
@@ -3853,86 +3853,6 @@ tasks:
           TEST_WITH_CSFLE: "ON"
           example_projects_cxx_standard: 11
           use_mongocryptd: true
-  - name: integration-rhel80-debug-shared-cxx11-4.0-replica
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, shared, cxx11, "4.0", replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 11
-          RUN_DISTCHECK: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          REQUIRED_CXX_STANDARD: 11
-          example_projects_cxx_standard: 11
-  - name: integration-rhel80-debug-shared-cxx11-4.0-sharded
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, shared, cxx11, "4.0", sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 11
-          RUN_DISTCHECK: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          REQUIRED_CXX_STANDARD: 11
-          example_projects_cxx_standard: 11
-  - name: integration-rhel80-debug-shared-cxx11-4.0-single
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, shared, cxx11, "4.0", single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 11
-          RUN_DISTCHECK: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          REQUIRED_CXX_STANDARD: 11
-          example_projects_cxx_standard: 11
   - name: integration-rhel80-debug-shared-cxx11-4.2-replica
     run_on: rhel80-large
     tags: [integration, rhel80, linux, debug, shared, cxx11, "4.2", replica]
@@ -5103,86 +5023,6 @@ tasks:
           MONGOCXX_TEST_TOPOLOGY: single
           REQUIRED_CXX_STANDARD: 11
           example_projects_cxx_standard: 11
-  - name: integration-rhel80-debug-shared-cxx17-4.0-replica
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, shared, cxx17, "4.0", replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 17
-          RUN_DISTCHECK: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          REQUIRED_CXX_STANDARD: 17
-          example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-shared-cxx17-4.0-sharded
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, shared, cxx17, "4.0", sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 17
-          RUN_DISTCHECK: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          REQUIRED_CXX_STANDARD: 17
-          example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-shared-cxx17-4.0-single
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, shared, cxx17, "4.0", single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 17
-          RUN_DISTCHECK: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          REQUIRED_CXX_STANDARD: 17
-          example_projects_cxx_standard: 17
   - name: integration-rhel80-debug-shared-cxx17-4.2-replica
     run_on: rhel80-large
     tags: [integration, rhel80, linux, debug, shared, cxx17, "4.2", replica]
@@ -6324,92 +6164,6 @@ tasks:
           MONGOCXX_TEST_TOPOLOGY: single
           REQUIRED_CXX_STANDARD: 17
           example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx11-4.0-replica
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx11, "4.0", replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 11
-          RUN_DISTCHECK: 1
-          USE_STATIC_LIBS: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          REQUIRED_CXX_STANDARD: 11
-          USE_STATIC_LIBS: 1
-          example_projects_cxx_standard: 11
-  - name: integration-rhel80-debug-static-cxx11-4.0-sharded
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx11, "4.0", sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 11
-          RUN_DISTCHECK: 1
-          USE_STATIC_LIBS: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          REQUIRED_CXX_STANDARD: 11
-          USE_STATIC_LIBS: 1
-          example_projects_cxx_standard: 11
-  - name: integration-rhel80-debug-static-cxx11-4.0-single
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx11, "4.0", single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: "4.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 11
-          RUN_DISTCHECK: 1
-          USE_STATIC_LIBS: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          REQUIRED_CXX_STANDARD: 11
-          USE_STATIC_LIBS: 1
-          example_projects_cxx_standard: 11
   - name: integration-rhel80-debug-static-cxx11-4.2-replica
     run_on: rhel80-large
     tags: [integration, rhel80, linux, debug, static, cxx11, "4.2", replica]
@@ -7635,9 +7389,9 @@ tasks:
           REQUIRED_CXX_STANDARD: 11
           USE_STATIC_LIBS: 1
           example_projects_cxx_standard: 11
-  - name: integration-rhel80-debug-static-cxx17-4.0-replica
+  - name: integration-rhel80-debug-static-cxx17-4.2-replica
     run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.0", replica]
+    tags: [integration, rhel80, linux, debug, static, cxx17, "4.2", replica]
     commands:
       - command: expansions.update
         params:
@@ -7647,7 +7401,7 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
       - func: install-uv
       - func: compile
@@ -7664,9 +7418,9 @@ tasks:
           REQUIRED_CXX_STANDARD: 17
           USE_STATIC_LIBS: 1
           example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-4.0-sharded
+  - name: integration-rhel80-debug-static-cxx17-4.2-sharded
     run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.0", sharded]
+    tags: [integration, rhel80, linux, debug, static, cxx17, "4.2", sharded]
     commands:
       - command: expansions.update
         params:
@@ -7676,7 +7430,7 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
       - func: install-uv
       - func: compile
@@ -7693,9 +7447,9 @@ tasks:
           REQUIRED_CXX_STANDARD: 17
           USE_STATIC_LIBS: 1
           example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-4.0-single
+  - name: integration-rhel80-debug-static-cxx17-4.2-single
     run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.0", single]
+    tags: [integration, rhel80, linux, debug, static, cxx17, "4.2", single]
     commands:
       - command: expansions.update
         params:
@@ -7704,7 +7458,7 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
       - func: install-uv
       - func: compile
@@ -7721,9 +7475,9 @@ tasks:
           REQUIRED_CXX_STANDARD: 17
           USE_STATIC_LIBS: 1
           example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-4.2-replica
+  - name: integration-rhel80-debug-static-cxx17-4.4-replica
     run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.2", replica]
+    tags: [integration, rhel80, linux, debug, static, cxx17, "4.4", replica]
     commands:
       - command: expansions.update
         params:
@@ -7733,7 +7487,7 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
-          mongodb_version: "4.2"
+          mongodb_version: "4.4"
       - func: install_c_driver
       - func: install-uv
       - func: compile
@@ -7750,9 +7504,9 @@ tasks:
           REQUIRED_CXX_STANDARD: 17
           USE_STATIC_LIBS: 1
           example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-4.2-sharded
+  - name: integration-rhel80-debug-static-cxx17-4.4-sharded
     run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.2", sharded]
+    tags: [integration, rhel80, linux, debug, static, cxx17, "4.4", sharded]
     commands:
       - command: expansions.update
         params:
@@ -7762,7 +7516,7 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
-          mongodb_version: "4.2"
+          mongodb_version: "4.4"
       - func: install_c_driver
       - func: install-uv
       - func: compile
@@ -7779,9 +7533,9 @@ tasks:
           REQUIRED_CXX_STANDARD: 17
           USE_STATIC_LIBS: 1
           example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-4.2-single
+  - name: integration-rhel80-debug-static-cxx17-4.4-single
     run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.2", single]
+    tags: [integration, rhel80, linux, debug, static, cxx17, "4.4", single]
     commands:
       - command: expansions.update
         params:
@@ -7790,7 +7544,7 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: "4.2"
+          mongodb_version: "4.4"
       - func: install_c_driver
       - func: install-uv
       - func: compile
@@ -7807,9 +7561,9 @@ tasks:
           REQUIRED_CXX_STANDARD: 17
           USE_STATIC_LIBS: 1
           example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-4.4-replica
+  - name: integration-rhel80-debug-static-cxx17-5.0-replica
     run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.4", replica]
+    tags: [integration, rhel80, linux, debug, static, cxx17, "5.0", replica]
     commands:
       - command: expansions.update
         params:
@@ -7819,7 +7573,7 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
-          mongodb_version: "4.4"
+          mongodb_version: "5.0"
       - func: install_c_driver
       - func: install-uv
       - func: compile
@@ -7836,95 +7590,9 @@ tasks:
           REQUIRED_CXX_STANDARD: 17
           USE_STATIC_LIBS: 1
           example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-4.4-sharded
+  - name: integration-rhel80-debug-static-cxx17-5.0-sharded
     run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.4", sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: "4.4"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 17
-          RUN_DISTCHECK: 1
-          USE_STATIC_LIBS: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          REQUIRED_CXX_STANDARD: 17
-          USE_STATIC_LIBS: 1
-          example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-4.4-single
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "4.4", single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: "4.4"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 17
-          RUN_DISTCHECK: 1
-          USE_STATIC_LIBS: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          REQUIRED_CXX_STANDARD: 17
-          USE_STATIC_LIBS: 1
-          example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-5.0-replica
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "5.0", replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: "5.0"
-      - func: install_c_driver
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          REQUIRED_CXX_STANDARD: 17
-          RUN_DISTCHECK: 1
-          USE_STATIC_LIBS: 1
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          REQUIRED_CXX_STANDARD: 17
-          USE_STATIC_LIBS: 1
-          example_projects_cxx_standard: 17
-  - name: integration-rhel80-debug-static-cxx17-5.0-sharded
-    run_on: rhel80-large
-    tags: [integration, rhel80, linux, debug, static, cxx17, "5.0", sharded]
+    tags: [integration, rhel80, linux, debug, static, cxx17, "5.0", sharded]
     commands:
       - command: expansions.update
         params:
@@ -14181,9 +13849,9 @@ tasks:
     commands:
       - func: setup
       - func: build-package-rpm
-  - name: sanitizers-asan-rhel80-clang-shared-4.0-replica
+  - name: sanitizers-asan-rhel80-clang-static-4.2-replica
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, "4.0", replica]
+    tags: [sanitizers, asan, rhel80, clang, static, "4.2", replica]
     commands:
       - command: expansions.update
         params:
@@ -14191,19 +13859,17 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14211,13 +13877,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: replica
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-shared-4.0-sharded
+  - name: sanitizers-asan-rhel80-clang-static-4.2-sharded
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, "4.0", sharded]
+    tags: [sanitizers, asan, rhel80, clang, static, "4.2", sharded]
     commands:
       - command: expansions.update
         params:
@@ -14225,19 +13892,17 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14245,13 +13910,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: sharded
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-shared-4.0-single
+  - name: sanitizers-asan-rhel80-clang-static-4.2-single
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, "4.0", single]
+    tags: [sanitizers, asan, rhel80, clang, static, "4.2", single]
     commands:
       - command: expansions.update
         params:
@@ -14259,18 +13925,16 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14278,13 +13942,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-shared-8.0-replica
+  - name: sanitizers-asan-rhel80-clang-static-8.0-replica
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, "8.0", replica]
+    tags: [sanitizers, asan, rhel80, clang, static, "8.0", replica]
     commands:
       - command: expansions.update
         params:
@@ -14292,19 +13957,17 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
           mongodb_version: "8.0"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14312,13 +13975,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: replica
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-shared-8.0-sharded
+  - name: sanitizers-asan-rhel80-clang-static-8.0-sharded
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, "8.0", sharded]
+    tags: [sanitizers, asan, rhel80, clang, static, "8.0", sharded]
     commands:
       - command: expansions.update
         params:
@@ -14326,19 +13990,17 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
           mongodb_version: "8.0"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14346,13 +14008,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: sharded
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-shared-8.0-single
+  - name: sanitizers-asan-rhel80-clang-static-8.0-single
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, "8.0", single]
+    tags: [sanitizers, asan, rhel80, clang, static, "8.0", single]
     commands:
       - command: expansions.update
         params:
@@ -14360,18 +14023,16 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
           mongodb_version: "8.0"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14379,13 +14040,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-shared-latest-replica
+  - name: sanitizers-asan-rhel80-clang-static-latest-replica
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, latest, replica]
+    tags: [sanitizers, asan, rhel80, clang, static, latest, replica]
     commands:
       - command: expansions.update
         params:
@@ -14393,19 +14055,17 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
           mongodb_version: latest
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14413,13 +14073,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: replica
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-shared-latest-sharded
+  - name: sanitizers-asan-rhel80-clang-static-latest-sharded
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, latest, sharded]
+    tags: [sanitizers, asan, rhel80, clang, static, latest, sharded]
     commands:
       - command: expansions.update
         params:
@@ -14427,19 +14088,17 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
           mongodb_version: latest
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14447,13 +14106,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: sharded
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-shared-latest-single
+  - name: sanitizers-asan-rhel80-clang-static-latest-single
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, shared, latest, single]
+    tags: [sanitizers, asan, rhel80, clang, static, latest, single]
     commands:
       - command: expansions.update
         params:
@@ -14461,18 +14121,16 @@ tasks:
             - { key: build_type, value: Debug }
             - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
             - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
+            - { key: USE_STATIC_LIBS, value: "1" }
       - func: setup
       - func: start_mongod
         vars:
           mongodb_version: latest
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_ASAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
@@ -14480,13 +14138,14 @@ tasks:
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
           TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
           example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
           example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-4.0-replica
+  - name: sanitizers-ubsan-rhel80-clang-static-4.2-replica
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, "4.0", replica]
+    tags: [sanitizers, ubsan, rhel80, clang, static, "4.2", replica]
     commands:
       - command: expansions.update
         params:
@@ -14499,29 +14158,27 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
+          USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
+          TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-4.0-sharded
+          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
+          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
+  - name: sanitizers-ubsan-rhel80-clang-static-4.2-sharded
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, "4.0", sharded]
+    tags: [sanitizers, ubsan, rhel80, clang, static, "4.2", sharded]
     commands:
       - command: expansions.update
         params:
@@ -14534,29 +14191,27 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
+          USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: sharded
-          TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
+          TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-4.0-single
+          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
+          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
+  - name: sanitizers-ubsan-rhel80-clang-static-4.2-single
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, "4.0", single]
+    tags: [sanitizers, ubsan, rhel80, clang, static, "4.2", single]
     commands:
       - command: expansions.update
         params:
@@ -14568,29 +14223,27 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
+          USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
-          TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
+          TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-8.0-replica
+          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
+          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
+  - name: sanitizers-ubsan-rhel80-clang-static-8.0-replica
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, "8.0", replica]
+    tags: [sanitizers, ubsan, rhel80, clang, static, "8.0", replica]
     commands:
       - command: expansions.update
         params:
@@ -14605,27 +14258,25 @@ tasks:
           TOPOLOGY: replica_set
           mongodb_version: "8.0"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
+          USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
+          TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-8.0-sharded
+          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
+          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
+  - name: sanitizers-ubsan-rhel80-clang-static-8.0-sharded
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, "8.0", sharded]
+    tags: [sanitizers, ubsan, rhel80, clang, static, "8.0", sharded]
     commands:
       - command: expansions.update
         params:
@@ -14640,27 +14291,25 @@ tasks:
           TOPOLOGY: sharded_cluster
           mongodb_version: "8.0"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
+          USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: sharded
-          TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
+          TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-8.0-single
+          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
+          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
+  - name: sanitizers-ubsan-rhel80-clang-static-8.0-single
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, "8.0", single]
+    tags: [sanitizers, ubsan, rhel80, clang, static, "8.0", single]
     commands:
       - command: expansions.update
         params:
@@ -14674,27 +14323,25 @@ tasks:
         vars:
           mongodb_version: "8.0"
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
+          USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
-          TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
+          TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-latest-replica
+          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
+          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
+  - name: sanitizers-ubsan-rhel80-clang-static-latest-replica
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, latest, replica]
+    tags: [sanitizers, ubsan, rhel80, clang, static, latest, replica]
     commands:
       - command: expansions.update
         params:
@@ -14709,27 +14356,25 @@ tasks:
           TOPOLOGY: replica_set
           mongodb_version: latest
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
+          USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_ASAN: "ON"
+          TEST_WITH_CSFLE: "ON"
+          TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-latest-sharded
+          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
+          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
+  - name: sanitizers-ubsan-rhel80-clang-static-latest-sharded
     run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, latest, sharded]
+    tags: [sanitizers, ubsan, rhel80, clang, static, latest, sharded]
     commands:
       - command: expansions.update
         params:
@@ -14744,634 +14389,17 @@ tasks:
           TOPOLOGY: sharded_cluster
           mongodb_version: latest
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          TEST_WITH_ASAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-asan-rhel80-clang-static-latest-single
-    run_on: rhel80-large
-    tags: [sanitizers, asan, rhel80, clang, static, latest, single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: latest
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_ASAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          TEST_WITH_ASAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=address -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=address
-  - name: sanitizers-ubsan-rhel80-clang-shared-4.0-replica
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, "4.0", replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: "4.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-shared-4.0-sharded
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, "4.0", sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-shared-4.0-single
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, "4.0", single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: "4.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-shared-8.0-replica
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, "8.0", replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: "8.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-shared-8.0-sharded
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, "8.0", sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: "8.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-shared-8.0-single
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, "8.0", single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: "8.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-shared-latest-replica
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, latest, replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: latest
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-shared-latest-sharded
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, latest, sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: latest
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-shared-latest-single
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, shared, latest, single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: latest
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined
-  - name: sanitizers-ubsan-rhel80-clang-static-4.0-replica
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, static, "4.0", replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: "4.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
-  - name: sanitizers-ubsan-rhel80-clang-static-4.0-sharded
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, static, "4.0", sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
-  - name: sanitizers-ubsan-rhel80-clang-static-4.0-single
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, static, "4.0", single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: "4.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
-  - name: sanitizers-ubsan-rhel80-clang-static-8.0-replica
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, static, "8.0", replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: "8.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
-  - name: sanitizers-ubsan-rhel80-clang-static-8.0-sharded
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, static, "8.0", sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: "8.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: sharded
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
-  - name: sanitizers-ubsan-rhel80-clang-static-8.0-single
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, static, "8.0", single]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          mongodb_version: "8.0"
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: single
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
-  - name: sanitizers-ubsan-rhel80-clang-static-latest-replica
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, static, latest, replica]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: replica_set
-          mongodb_version: latest
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
-          USE_SANITIZER_UBSAN: "ON"
-      - func: fetch-det
-      - func: run_kms_servers
-      - func: test
-        vars:
-          MONGOCXX_TEST_TOPOLOGY: replica
-          TEST_WITH_UBSAN: "ON"
-          example_projects_cc: clang
-          example_projects_cxx: clang++
-          example_projects_cxxflags: -fsanitize=undefined -fno-sanitize-recover=undefined -fno-omit-frame-pointer
-          example_projects_ldflags: -fsanitize=undefined -fno-sanitize-recover=undefined -static-libsan
-  - name: sanitizers-ubsan-rhel80-clang-static-latest-sharded
-    run_on: rhel80-large
-    tags: [sanitizers, ubsan, rhel80, clang, static, latest, sharded]
-    commands:
-      - command: expansions.update
-        params:
-          updates:
-            - { key: build_type, value: Debug }
-            - { key: cc_compiler, value: /opt/mongodbtoolchain/v4/bin/clang }
-            - { key: cxx_compiler, value: /opt/mongodbtoolchain/v4/bin/clang++ }
-            - { key: USE_STATIC_LIBS, value: "1" }
-      - func: setup
-      - func: start_mongod
-        vars:
-          TOPOLOGY: sharded_cluster
-          mongodb_version: latest
-      - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
-      - func: install-uv
-      - func: compile
-        vars:
-          ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: sharded
+          TEST_WITH_CSFLE: "ON"
           TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
@@ -15393,19 +14421,17 @@ tasks:
         vars:
           mongodb_version: latest
       - func: install_c_driver
-        vars:
-          SKIP_INSTALL_LIBMONGOCRYPT: 1
       - func: install-uv
       - func: compile
         vars:
           ENABLE_TESTS: "ON"
-          RUN_DISTCHECK: 1
           USE_SANITIZER_UBSAN: "ON"
       - func: fetch-det
       - func: run_kms_servers
       - func: test
         vars:
           MONGOCXX_TEST_TOPOLOGY: single
+          TEST_WITH_CSFLE: "ON"
           TEST_WITH_UBSAN: "ON"
           example_projects_cc: clang
           example_projects_cxx: clang++
@@ -15651,9 +14677,9 @@ tasks:
           generator: Visual Studio 15 2017
           platform: x64
       - func: uninstall-check
-  - name: valgrind-rhel80-shared-4.0-replica
+  - name: valgrind-rhel80-shared-4.2-replica
     run_on: rhel80-large
-    tags: [valgrind, rhel80, shared, "4.0", replica]
+    tags: [valgrind, rhel80, shared, "4.2", replica]
     commands:
       - command: expansions.update
         params:
@@ -15663,7 +14689,7 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: replica_set
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
         vars:
           SKIP_INSTALL_LIBMONGOCRYPT: 1
@@ -15680,9 +14706,9 @@ tasks:
           TEST_WITH_VALGRIND: "ON"
           disable_slow_tests: 1
           use_mongocryptd: true
-  - name: valgrind-rhel80-shared-4.0-sharded
+  - name: valgrind-rhel80-shared-4.2-sharded
     run_on: rhel80-large
-    tags: [valgrind, rhel80, shared, "4.0", sharded]
+    tags: [valgrind, rhel80, shared, "4.2", sharded]
     commands:
       - command: expansions.update
         params:
@@ -15692,7 +14718,7 @@ tasks:
       - func: start_mongod
         vars:
           TOPOLOGY: sharded_cluster
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
         vars:
           SKIP_INSTALL_LIBMONGOCRYPT: 1
@@ -15709,9 +14735,9 @@ tasks:
           TEST_WITH_VALGRIND: "ON"
           disable_slow_tests: 1
           use_mongocryptd: true
-  - name: valgrind-rhel80-shared-4.0-single
+  - name: valgrind-rhel80-shared-4.2-single
     run_on: rhel80-large
-    tags: [valgrind, rhel80, shared, "4.0", single]
+    tags: [valgrind, rhel80, shared, "4.2", single]
     commands:
       - command: expansions.update
         params:
@@ -15720,7 +14746,7 @@ tasks:
       - func: setup
       - func: start_mongod
         vars:
-          mongodb_version: "4.0"
+          mongodb_version: "4.2"
       - func: install_c_driver
         vars:
           SKIP_INSTALL_LIBMONGOCRYPT: 1
diff --git a/.evergreen/scripts/test.sh b/.evergreen/scripts/test.sh
index bc67fd8b6c..9f6e57b818 100755
--- a/.evergreen/scripts/test.sh
+++ b/.evergreen/scripts/test.sh
@@ -276,7 +276,11 @@ else
     --allow-running-no-tests
   )
 
-  run_test() { "$@" "${test_args[@]:?}"; }
+  run_test() {
+    echo "Running $@..."
+    "$@" "${test_args[@]:?}" || return
+    echo "Running $@... done."
+  }
 
   if [[ "${TEST_WITH_ASAN:-}" == "ON" || "${TEST_WITH_UBSAN:-}" == "ON" ]]; then
     export ASAN_OPTIONS="detect_leaks=1"
@@ -286,7 +290,9 @@ else
     command -V valgrind
     valgrind --version
     run_test() {
-      valgrind --leak-check=full --track-origins=yes --num-callers=50 --error-exitcode=1 --error-limit=no --read-var-info=yes --suppressions=../etc/memcheck.suppressions "$@" "${test_args[@]:?}"
+      echo "Running $@..."
+      valgrind --leak-check=full --track-origins=yes --num-callers=50 --error-exitcode=1 --error-limit=no --read-var-info=yes --suppressions=../etc/memcheck.suppressions "$@" "${test_args[@]:?}" || return
+      echo "Running $@... done."
     }
   fi
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ff4f8a911..f12f5d3b2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,8 +16,8 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
 
 ### Changed
 
+- Bump the minimum required C Driver version to [2.1.0](https://github.com/mongodb/mongo-c-driver/releases/tag/2.1.0).
 - CMake 3.16.0 or newer is required when `ENABLE_TESTS=ON` for compatibility with the updated Catch2 library version (3.7.0 -> 3.8.1).
-- Bump the minimum required C Driver version to [2.0.2](https://github.com/mongodb/mongo-c-driver/releases/tag/2.0.2).
 - Minimum supported compiler versions to build from source are updated to the following:
   - GCC 8.1 (from GCC 4.8.2).
     - Users on RHEL 7 may consult Red Hat's ["Hello World - installing GCC on RHEL 7"](https://developers.redhat.com/HW/gcc-RHEL-7) or ["How to install GCC 8 and Clang/LLVM 6 on Red Hat Enterprise Linux 7"](https://developers.redhat.com/blog/2019/03/05/yum-install-gcc-8-clang-6) for instructions on how to obtain GCC 8 or newer.
@@ -25,6 +25,12 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
   - Apple Clang 13.1 with Xcode 13.4.1 (from Apple Clang 5.1 with Xcode 5.1).
   - MSVC 19.0.24210 with Visual Studio 2015 Update 3 (from MSVC 19.0.23506 with Visual Studio 2015 Update 1).
 
+### Removed
+
+- Support for MongoDB Server 4.2.
+  - See: [MongoDB Software Lifecycle Schedules](https://www.mongodb.com/legal/support-policy/lifecycles).
+  - See: [MongoDB C Driver 2.1.0 Release Notes](https://github.com/mongodb/mongo-c-driver/releases/tag/2.1.0).
+
 ## 4.1.1
 
 ### Fixed