Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

74 files changed, 172 insertions, 518 deletions

diff --git a/buildscripts/resmokeconfig/loggers/evg.yml b/buildscripts/resmokeconfig/loggers/evg.yml
deleted file mode 100644
index 5774de4b013..00000000000
--- a/buildscripts/resmokeconfig/loggers/evg.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-logging:
-  executor:
-    format: '[%(name)s] %(asctime)s %(message)s'
-    handlers:
-      - class: logging.StreamHandler
-  fixture:
-    format: '[%(name)s] %(message)s'
-    handlers:
-      - class: evergreen
-  tests:
-    format: '[%(name)s] %(message)s'
-    handlers:
-      - class: evergreen
-
-shorten_logger_name:
-  remove:
-    - MongoDFixture
-    - ReplicaSetFixture
-    - ShardedClusterFixture
-  replace:
-    primary: prim
-    secondary: sec
-    node: n
-    shard: s
-    configsvr: c
-    mongos: s
-    job: j
diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/multiversion.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/multiversion.yml
index 6265d19b9e9..e25ee213769 100644
--- a/buildscripts/resmokeconfig/matrix_suites/mappings/multiversion.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/mappings/multiversion.yml
@@ -272,43 +272,23 @@
     - "multiversion.replica_sets_multiversion_testdata_last_continuous"
 
 
-- suite_name: aggregation_multiversion_fuzzer_last_lts
+- suite_name: generational_fuzzer_last_lts
   base_suite: generational_fuzzer
   overrides:
     - "multiversion.replica_sets_multiversion_testdata_last_lts"
 
-- suite_name: aggregation_multiversion_fuzzer_last_continuous
-  base_suite: generational_fuzzer
-  overrides:
-    - "multiversion.replica_sets_multiversion_testdata_last_continuous"
-
-- suite_name: aggregation_expression_multiversion_fuzzer_last_lts
-  base_suite: generational_fuzzer
-  overrides:
-    - "multiversion.replica_sets_multiversion_testdata_last_lts"
-
-- suite_name: aggregation_expression_multiversion_fuzzer_last_continuous
-  base_suite: generational_fuzzer
-  overrides:
-    - "multiversion.replica_sets_multiversion_testdata_last_continuous"
-
-- suite_name: update_fuzzer_last_lts
-  base_suite: generational_fuzzer
-  overrides:
-    - "multiversion.replica_sets_multiversion_testdata_last_lts"
-
-- suite_name: update_fuzzer_last_continuous
+- suite_name: generational_fuzzer_last_continuous
   base_suite: generational_fuzzer
   overrides:
     - "multiversion.replica_sets_multiversion_testdata_last_continuous"
 
 
-- suite_name: update_fuzzer_replication_last_lts
+- suite_name: generational_fuzzer_replication_last_lts
   base_suite: generational_fuzzer_replication
   overrides:
     - "multiversion.replica_sets_multiversion_testdata_last_lts"
 
-- suite_name: update_fuzzer_replication_last_continuous
+- suite_name: generational_fuzzer_replication_last_continuous
   base_suite: generational_fuzzer_replication
   overrides:
     - "multiversion.replica_sets_multiversion_testdata_last_continuous"
diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml
index 6590d78359d..2ec2f4fe333 100644
--- a/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml
+++ b/buildscripts/resmokeconfig/matrix_suites/overrides/replica_sets_stepdown_selector.yml
@@ -21,7 +21,6 @@
         - jstests/core/find_and_modify.js
         - jstests/core/find_and_modify2.js
         - jstests/core/find_and_modify_server6865.js
-        - jstests/core/project_with_collation.js
 
         # Stepdown commands during fsync lock will fail.
         - jstests/core/currentop.js
@@ -54,8 +53,6 @@
 
         # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary.
         - jstests/core/geo_s2ordering.js
-        - jstests/fle2/**/*.js
-        - src/mongo/db/modules/*/jstests/fle2/**/*.js
 
 
 - name: reconfig_kill_primary_jscore_passthrough_exclude_files
@@ -84,7 +81,6 @@
         - jstests/core/find_and_modify2.js
         - jstests/core/find_and_modify_pipeline_update.js
         - jstests/core/find_and_modify_server6865.js
-        - jstests/core/project_with_collation.js
 
         # These test run commands using legacy queries, which are not supported on sessions.
         - jstests/core/comment_field.js
@@ -125,8 +121,6 @@
 
         # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary.
         - jstests/core/geo_s2ordering.js
-        - jstests/fle2/**/*.js
-        - src/mongo/db/modules/*/jstests/fle2/**/*.js
 
 
 - name: kill_primary_jscore_passthrough_exclude_with_any_tags
diff --git a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml
index f87c2c710cf..36aeaad2531 100644
--- a/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml
+++ b/buildscripts/resmokeconfig/setup_multiversion/setup_multiversion_config.yml
@@ -110,24 +110,24 @@ evergreen_buildvariants:
     platform: rhel70
     architecture: x86_64
 
-  - name: rhel8
+  - name: rhel80
     edition: targeted
-    platform: rhel8
+    platform: rhel80
     architecture: x86_64
 
-  - name: enterprise-rhel-8-64-bit
+  - name: enterprise-rhel-80-64-bit
     edition: enterprise
-    platform: rhel8
+    platform: rhel80
     architecture: x86_64
 
-  - name: rhel-8-arm64
+  - name: rhel-82-arm64
     edition: targeted
-    platform: rhel8
+    platform: rhel82
     architecture: arm64
 
-  - name: enterprise-rhel-8-arm64
+  - name: enterprise-rhel-82-arm64
     edition: enterprise
-    platform: rhel8
+    platform: rhel82
     architecture: arm64
 
   - name: enterprise-rhel-71-ppc64le
diff --git a/buildscripts/resmokeconfig/suites/benchmarks.yml b/buildscripts/resmokeconfig/suites/benchmarks.yml
index 011b16bd01a..5bbd6e460ef 100644
--- a/buildscripts/resmokeconfig/suites/benchmarks.yml
+++ b/buildscripts/resmokeconfig/suites/benchmarks.yml
@@ -18,10 +18,6 @@ selector:
   - build/install/bin/simple8b_bm*
   # Hash table benchmark is really slow, don't run on evergreen
   - build/install/bin/hash_table_bm*
-  - build/install/bin/rate_limiting_bm*
-  # These benchmarks are only run when modifying or upgrading the immutable library.
-  - build/install/bin/immutable_absl_comparison_bm*
-  - build/install/bin/immutable_std_comparison_bm*
 
 
 executor:
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
index 607a68dc431..51fc059280b 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml
@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Don't run these tests as transactions can only run on primaries.
   - jstests/core/txns/**/*.js
@@ -45,7 +47,6 @@ selector:
   - jstests/core/tailable_cursor_invalidation.js
   - jstests/core/tailable_getmore_batch_size.js
   - jstests/core/tailable_skip_limit.js
-  - jstests/core/timeseries/timeseries_lastpoint_top.js
   - jstests/core/constructors.js
   - jstests/core/views/views_all_commands.js
   - jstests/core/or4.js
diff --git a/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml b/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
index 5891ea9d392..cb9f747aebb 100644
--- a/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/clustered_collection_passthrough.yml
@@ -65,9 +65,6 @@ selector:
   # TODO (SERVER-61259): $text not supported: "No query solutions"
   - jstests/core/fts6.js
   - jstests/core/fts_projection.js
-  # Assumes there is one collection that is not clustered.
-  - jstests/core/find_with_resume_after_param.js
-  - jstests/core/group_lookup_with_canonical_query_prefix.js
 
   exclude_with_any_tags:
   - assumes_standalone_mongod
diff --git a/buildscripts/resmokeconfig/suites/concurrency_replication_for_export_import.yml b/buildscripts/resmokeconfig/suites/concurrency_replication_for_export_import.yml
index 8b84c71d5ec..4fedf2ca12b 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_replication_for_export_import.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_replication_for_export_import.yml
@@ -31,8 +31,6 @@ selector:
   - uses_write_concern
   # Sharding is not supported for live exports and imports.
   - requires_sharding
-  # Workloads that kill random sessions may interrupt the export/import commands.
-  - kills_random_sessions
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml
index 65cb93e7f5d..42bc4a7be4d 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml
@@ -54,7 +54,6 @@ selector:
   - catches_command_failures
   # time-series collections do not support write transactions
   - requires_timeseries
-  - does_not_support_transactions
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
index 7e4e48ed066..83467144c4c 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency.yml
@@ -9,6 +9,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
index 94b95f17b68..3bfbf5175bd 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_causal_consistency_and_balancer.yml
@@ -9,6 +9,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # SERVER-14669 Multi-removes that use $where miscount removed documents
   - jstests/concurrency/fsm_workloads/remove_where.js
 
@@ -133,7 +136,6 @@ executor:
         enableTestCommands: 1
         roleGraphInvalidationIsFatal: 1
         receiveChunkWaitForRangeDeleterTimeoutMS: 90000
-        skipDroppingHashedShardKeyIndex: true
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml
index 98ee4120781..18452678c0c 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_kill_primary_with_balancer.yml
@@ -9,6 +9,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # SERVER-14669 Multi-removes that use $where miscount removed documents
   - jstests/concurrency/fsm_workloads/remove_where.js
 
@@ -110,7 +113,6 @@ selector:
   - jstests/concurrency/fsm_workloads/indexed_insert_upsert.js
   - jstests/concurrency/fsm_workloads/indexed_insert_where.js
   - jstests/concurrency/fsm_workloads/list_indexes.js
-  - jstests/concurrency/fsm_workloads/query_stats_concurrent.js
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
   - jstests/concurrency/fsm_workloads/remove_multiple_documents.js
@@ -233,7 +235,6 @@ executor:
         enableElectionHandoff: 0
         roleGraphInvalidationIsFatal: 1
         receiveChunkWaitForRangeDeleterTimeoutMS: 90000
-        skipDroppingHashedShardKeyIndex: true
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml
index 7f0ce597620..a904a527bc6 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml
@@ -13,6 +13,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml
index 9c321f265bb..b629f4d1971 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml
@@ -13,6 +13,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
@@ -185,7 +188,6 @@ executor:
         enableTestCommands: 1
         roleGraphInvalidationIsFatal: 1
         receiveChunkWaitForRangeDeleterTimeoutMS: 90000
-        skipDroppingHashedShardKeyIndex: true
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml
index 66a8a47b4d6..0d711ca421c 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml
@@ -13,6 +13,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml
index dfcb47c9199..e3280f20994 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml
@@ -18,6 +18,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
@@ -178,7 +181,6 @@ selector:
   - jstests/concurrency/fsm_workloads/indexed_insert_ordered_bulk.js
   - jstests/concurrency/fsm_workloads/indexed_insert_unordered_bulk.js
   - jstests/concurrency/fsm_workloads/list_indexes.js
-  - jstests/concurrency/fsm_workloads/query_stats_concurrent.js
 
   # Uses non-retryable commands in the same state function as a command not supported in a
   # transaction.
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml
index ca02cc7d9e8..17bf8eb2ccf 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml
@@ -18,6 +18,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
@@ -178,7 +181,6 @@ selector:
   - jstests/concurrency/fsm_workloads/indexed_insert_ordered_bulk.js
   - jstests/concurrency/fsm_workloads/indexed_insert_unordered_bulk.js
   - jstests/concurrency/fsm_workloads/list_indexes.js
-  - jstests/concurrency/fsm_workloads/query_stats_concurrent.js
 
   # Uses non-retryable commands in the same state function as a command not supported in a
   # transaction.
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml
index ee68077a3e4..84d7c942484 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml
@@ -13,6 +13,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
@@ -189,7 +192,6 @@ executor:
         enableTestCommands: 1
         roleGraphInvalidationIsFatal: 1
         receiveChunkWaitForRangeDeleterTimeoutMS: 90000
-        skipDroppingHashedShardKeyIndex: true
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml
index 609de156c2e..88a29447a8e 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml
@@ -18,6 +18,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
index 02d2c081cfb..f2e8e9a06b1 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml
@@ -9,6 +9,10 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+  - jstests/concurrency/fsm_workloads/map_reduce_drop.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
index 60b70c75a31..0d104100f9d 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml
@@ -9,6 +9,10 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+  - jstests/concurrency/fsm_workloads/map_reduce_drop.js
+
   # SERVER-14669 Multi-removes that use $where miscount removed documents
   - jstests/concurrency/fsm_workloads/remove_where.js
 
@@ -130,7 +134,6 @@ executor:
         enableTestCommands: 1
         roleGraphInvalidationIsFatal: 1
         receiveChunkWaitForRangeDeleterTimeoutMS: 90000
-        skipDroppingHashedShardKeyIndex: true
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml
index caeb219f6f1..41e0539bbc3 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_terminate_primary_with_balancer.yml
@@ -9,6 +9,9 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+
   # SERVER-14669 Multi-removes that use $where miscount removed documents
   - jstests/concurrency/fsm_workloads/remove_where.js
 
@@ -110,7 +113,6 @@ selector:
   - jstests/concurrency/fsm_workloads/indexed_insert_upsert.js
   - jstests/concurrency/fsm_workloads/indexed_insert_where.js
   - jstests/concurrency/fsm_workloads/list_indexes.js
-  - jstests/concurrency/fsm_workloads/query_stats_concurrent.js
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
   - jstests/concurrency/fsm_workloads/remove_multiple_documents.js
@@ -228,7 +230,6 @@ executor:
         enableElectionHandoff: 0
         roleGraphInvalidationIsFatal: 1
         receiveChunkWaitForRangeDeleterTimeoutMS: 90000
-        skipDroppingHashedShardKeyIndex: true
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
index 420b427f42a..fe148c981c7 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns.yml
@@ -9,6 +9,10 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+  - jstests/concurrency/fsm_workloads/map_reduce_drop.js
+
   # Disabled due to SERVER-33753, '.count() without a predicate can be wrong on sharded
   # collections'. This bug is problematic for these workloads because they assert on count()
   # values:
@@ -96,7 +100,6 @@ selector:
   - jstests/concurrency/fsm_workloads/indexed_insert_upsert.js
   - jstests/concurrency/fsm_workloads/indexed_insert_where.js
   - jstests/concurrency/fsm_workloads/list_indexes.js
-  - jstests/concurrency/fsm_workloads/query_stats_concurrent.js
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
   - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
index 9c3635e7b78..f4e9fad96fc 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_with_stepdowns_and_balancer.yml
@@ -9,6 +9,10 @@ selector:
   - jstests/concurrency/fsm_workloads/distinct_noindex.js
   - jstests/concurrency/fsm_workloads/distinct_projection.js
 
+  # SERVER-17397 Drops of sharded namespaces may not fully succeed
+  - jstests/concurrency/fsm_workloads/create_database.js
+  - jstests/concurrency/fsm_workloads/map_reduce_drop.js
+
   # SERVER-14669 Multi-removes that use $where miscount removed documents
   - jstests/concurrency/fsm_workloads/remove_where.js
 
@@ -102,7 +106,6 @@ selector:
   - jstests/concurrency/fsm_workloads/indexed_insert_upsert.js
   - jstests/concurrency/fsm_workloads/indexed_insert_where.js
   - jstests/concurrency/fsm_workloads/list_indexes.js
-  - jstests/concurrency/fsm_workloads/query_stats_concurrent.js
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
   - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
@@ -225,7 +228,6 @@ executor:
         enableElectionHandoff: 0
         roleGraphInvalidationIsFatal: 1
         receiveChunkWaitForRangeDeleterTimeoutMS: 90000
-        skipDroppingHashedShardKeyIndex: true
     num_rs_nodes_per_shard: 3
     num_shards: 2
     num_mongos: 2
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml
index 3bb21c1440e..4e5f0e97357 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_simultaneous.yml
@@ -40,8 +40,6 @@ selector:
   - requires_replication
   - requires_sharding
   - disabled_due_to_server_61671
-  - incompatible_with_concurrency_simultaneous
-
   group_size: 10
   group_count_multiplier: 2.5
 
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml
index a12675ac315..e6125107252 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml
@@ -32,6 +32,13 @@ selector:
   # TODO: SERVER-39939.
   - jstests/concurrency/fsm_workloads/snapshot_read_kill_operations.js
 
+  # This workload kills random sessions and a different FSM workload wouldn't be able to handle
+  # the error response from the op being killed.
+  - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
+  - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
+
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.
   # TODO: SERVER-37876
@@ -49,14 +56,8 @@ selector:
   - jstests/concurrency/fsm_workloads/reindex_background.js
   - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
 
-  # This workload involves upgrading and downgrading the FCV, and can cause failure on other
-  # FSM workloads which depend on features which are only available in the latest FCV.
-  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
-
   exclude_with_any_tags:
   - requires_sharding
-  - kills_random_sessions
-  - incompatible_with_concurrency_simultaneous
 
   group_size: 10
   group_count_multiplier: 1.0
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml
index 3d677e5aa39..179d44f40ad 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml
@@ -32,6 +32,13 @@ selector:
   # TODO: SERVER-39939.
   - jstests/concurrency/fsm_workloads/snapshot_read_kill_operations.js
 
+  # This workload kills random sessions and a different FSM workload wouldn't be able to handle
+  # the error response from the op being killed.
+  - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
+  - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
+
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.
   # TODO: SERVER-37876
@@ -54,14 +61,8 @@ selector:
   - jstests/concurrency/fsm_workloads/reindex_background.js
   - jstests/concurrency/fsm_workloads/reindex_writeconflict.js
 
-  # This workload involves upgrading and downgrading the FCV, and can cause failure on other
-  # FSM workloads which depend on features which are only available in the latest FCV.
-  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
-
   exclude_with_any_tags:
   - requires_sharding
-  - kills_random_sessions
-  - incompatible_with_concurrency_simultaneous
 
   group_size: 10
   group_count_multiplier: 1.0
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml
index 27b9ded5ff5..3bb3060f1cd 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml
@@ -32,6 +32,13 @@ selector:
   # TODO: SERVER-39939.
   - jstests/concurrency/fsm_workloads/snapshot_read_kill_operations.js
 
+  # This workload kills random sessions and a different FSM workload wouldn't be able to handle
+  # the error response from the op being killed.
+  - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
+  - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
+  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
+
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.
   # TODO: SERVER-37876
@@ -55,14 +62,8 @@ selector:
   - jstests/concurrency/fsm_workloads/reindex.js
   - jstests/concurrency/fsm_workloads/reindex_background.js
 
-  # This workload involves upgrading and downgrading the FCV, and can cause failure on other
-  # FSM workloads which depend on features which are only available in the latest FCV.
-  - jstests/concurrency/fsm_workloads/internal_transactions_setFCV.js
-
   exclude_with_any_tags:
   - requires_sharding
-  - kills_random_sessions
-  - incompatible_with_concurrency_simultaneous
 
   group_size: 10
   group_count_multiplier: 1.0
diff --git a/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml
index fca4ed4e214..09b0a6f7ece 100755
--- a/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/cst_jscore_passthrough.yml
@@ -256,6 +256,9 @@ selector:
   - jstests/core/index_check6.js
   - jstests/core/index_check7.js
   - jstests/core/index_decimal.js
+  - jstests/core/index_elemmatch1.js
+  - jstests/core/index_elemmatch2.js
+  - jstests/core/index_elemmatch2.js
   - jstests/core/index_filter_commands.js
   - jstests/core/index_filter_on_hidden_index.js
   - jstests/core/index_multiple_compatibility.js
@@ -307,6 +310,7 @@ selector:
   - jstests/core/not1.js
   - jstests/core/not2.js
   - jstests/core/not3.js
+  - jstests/core/notablescan.js
   - jstests/core/null_query_semantics.js
   - jstests/core/null_query_semantics.js
   - jstests/core/objectfind.js
@@ -504,6 +508,8 @@ selector:
   - jstests/core/in7.js
   - jstests/core/index13.js
   - jstests/core/index_check2.js
+  - jstests/core/index_elemmatch1.js
+  - jstests/core/index_elemmatch2.js
   - jstests/core/indexl.js
   - jstests/core/json_schema/misc_validation.js
   - jstests/core/ne_array.js
@@ -752,6 +758,7 @@ selector:
   - jstests/core/geonear_key.js
   - jstests/core/getmore_invalidated_documents.js
   - jstests/core/hidden_index.js
+  - jstests/core/index_elemmatch2.js
   - jstests/core/index_partial_2dsphere.js
   - jstests/core/json_schema/misc_validation.js
   - jstests/core/list_collections_filter.js
diff --git a/buildscripts/resmokeconfig/suites/free_monitoring.yml b/buildscripts/resmokeconfig/suites/free_monitoring.yml
new file mode 100644
index 00000000000..98fb2867c51
--- /dev/null
+++ b/buildscripts/resmokeconfig/suites/free_monitoring.yml
@@ -0,0 +1,10 @@
+test_kind: js_test
+
+selector:
+  roots:
+  - jstests/free_mon/*.js
+
+executor:
+  config:
+    shell_options:
+      nodb: ''
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz.yml b/buildscripts/resmokeconfig/suites/jstestfuzz.yml
index 45789c08ab8..f70bfae03e6 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz.yml
@@ -13,8 +13,6 @@ executor:
       crashOnInvalidBSONError: ""
       objcheck: ""
   hooks:
-  - class: RunQueryStats
-    allow_feature_not_supported: true
   - class: FuzzerRestoreSettings
   - class: ValidateCollections
     shell_options:
@@ -28,6 +26,4 @@ executor:
       set_parameters:
         disableLogicalSessionCacheRefresh: false
         enableTestCommands: 1
-        internalQueryStatsRateLimit: -1
-        internalQueryStatsErrorsAreCommandFatal: true
       verbose: ''
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml
index 4a872221272..f1ffdb2f014 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_replication.yml
@@ -19,8 +19,6 @@ executor:
           # Other fuzzers test commands against replica sets with logical session ids.
           disableImplicitSessions: true
   hooks:
-  - class: RunQueryStats
-    allow_feature_not_supported: true
   - class: FuzzerRestoreSettings
   # The CheckReplDBHash hook waits until all operations have replicated to and have been applied
   # on the secondaries, so we run the ValidateCollections hook after it to ensure we're
@@ -44,7 +42,5 @@ executor:
         enableTestCommands: 1
         transactionLifetimeLimitSeconds: 1
         writePeriodicNoops: 1
-        internalQueryStatsRateLimit: -1
-        internalQueryStatsErrorsAreCommandFatal: true
       verbose: ''
     num_nodes: 2
diff --git a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml
index de2863d100a..7ddb9581092 100644
--- a/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml
+++ b/buildscripts/resmokeconfig/suites/jstestfuzz_sharded.yml
@@ -18,8 +18,6 @@ executor:
       crashOnInvalidBSONError: ""
       objcheck: ""
   hooks:
-  - class: RunQueryStats
-    allow_feature_not_supported: true
   - class: FuzzerRestoreSettings
   - class: CheckReplDBHash
     shell_options:
@@ -36,8 +34,6 @@ executor:
     mongos_options:
       set_parameters:
         enableTestCommands: 1
-        internalQueryStatsRateLimit: -1
-        internalQueryStatsErrorsAreCommandFatal: true
       verbose: ''
     mongod_options:
       set_parameters:
@@ -45,8 +41,6 @@ executor:
         enableTestCommands: 1
         transactionLifetimeLimitSeconds: 1
         writePeriodicNoops: 1
-        internalQueryStatsRateLimit: -1
-        internalQueryStatsErrorsAreCommandFatal: true
       verbose: ''
     num_rs_nodes_per_shard: 1
     num_shards: 2
diff --git a/buildscripts/resmokeconfig/suites/mqlrun.yml b/buildscripts/resmokeconfig/suites/mqlrun.yml
new file mode 100644
index 00000000000..d9f75ff7697
--- /dev/null
+++ b/buildscripts/resmokeconfig/suites/mqlrun.yml
@@ -0,0 +1,12 @@
+test_kind: js_test
+
+selector:
+  roots:
+  - src/mongo/db/modules/*/jstests/mqlrun/*.js
+
+# mqlrun tests don't have a test fixture. Instead, they use the shell to spawn an mqlrun subprocess.
+executor:
+  archive:
+  config:
+    shell_options:
+      nodb: ''
diff --git a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
index aacae2ac9d6..b30c65e8e4c 100644
--- a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
+++ b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
@@ -358,6 +358,5 @@ executor:
         numInitialSyncAttempts: 1
         writePeriodicNoops: true
         coordinateCommitReturnImmediatelyAfterPersistingDecision: true
-        skipDroppingHashedShardKeyIndex: true
     num_rs_nodes_per_shard: 2
     num_shards: 2
diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml
index e865729aac1..674aabc6a65 100644
--- a/buildscripts/resmokeconfig/suites/multiversion.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion.yml
@@ -31,7 +31,3 @@ executor:
   config:
     shell_options:
       nodb: ''
-      global_vars:
-        TestData:
-          setParameters:
-            bsonTestValidationVersion: 1
diff --git a/buildscripts/resmokeconfig/suites/multiversion_auth.yml b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
index aa77936c5a2..d76515abf50 100644
--- a/buildscripts/resmokeconfig/suites/multiversion_auth.yml
+++ b/buildscripts/resmokeconfig/suites/multiversion_auth.yml
@@ -37,8 +37,6 @@ executor:
     shell_options:
       global_vars:
         TestData:
-          setParameters:
-            bsonTestValidationVersion: 1
           auth: true
 #          authMechanism: SCRAM-SHA-256
           keyFile: *keyFile
diff --git a/buildscripts/resmokeconfig/suites/no_passthrough.yml b/buildscripts/resmokeconfig/suites/no_passthrough.yml
index 1fe41d46475..7ab97e1f2ff 100644
--- a/buildscripts/resmokeconfig/suites/no_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/no_passthrough.yml
@@ -1,14 +1,8 @@
 test_kind: js_test
-description: |
-  "Passthrough" means running a test against different runtime Cluster
-  configurations, including topology, runtime flags, fault injections, and other
-  parameters. Most tests by default are able to run in "passthrough" suites.
-  NoPassthrough is an exception, where tests here only run in the exact
-  configuration predefined in the tests themselves.
 
 selector:
   roots:
-  - jstests/noPassthrough/**/*.js
+  - jstests/noPassthrough/*.js
   - src/mongo/db/modules/*/jstests/hot_backups/*.js
   - src/mongo/db/modules/*/jstests/live_import/*.js
   - src/mongo/db/modules/*/jstests/no_passthrough/*.js
@@ -16,10 +10,8 @@ selector:
   # Self-tests for the Concurrency testing framework are run as part of this test suite.
   - jstests/concurrency/*.js
   exclude_files:
-  - jstests/noPassthrough/libs/*.js
   # Disable inmem_full as per SERVER-27014
   - jstests/noPassthrough/inmem_full.js
-  exclude_with_any_tags:
 
 # noPassthrough tests start their own mongod's.
 executor:
diff --git a/buildscripts/resmokeconfig/suites/parallel.yml b/buildscripts/resmokeconfig/suites/parallel.yml
index c4efc723d56..28d13aa2bbc 100644
--- a/buildscripts/resmokeconfig/suites/parallel.yml
+++ b/buildscripts/resmokeconfig/suites/parallel.yml
@@ -1,3 +1,10 @@
+# If the failure here is due to a test unexpected being run,
+# it may be due to the parallel suite not honoring feature flag tags.
+# If you want to skip such tests in parallel suite,
+# please add them to the exclusion list at
+# https://github.com/mongodb/mongo/blob/eb75b6ccc62f7c8ea26a57c1b5eb96a41809396a/jstests/libs/parallelTester.js#L149.
+
+
 test_kind: js_test
 
 selector:
diff --git a/buildscripts/resmokeconfig/suites/query_stats_aggregation_passthrough.yml b/buildscripts/resmokeconfig/suites/query_stats_aggregation_passthrough.yml
deleted file mode 100644
index 70faf6b60e3..00000000000
--- a/buildscripts/resmokeconfig/suites/query_stats_aggregation_passthrough.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-test_kind: js_test
-description: |
-  This suite enables the collection of query stats metrics on a mongod server, then runs the tests in
-  aggregation as normal. This should cause each aggregation to compute a query
-  shape and query stats key, and record in-memory some metrics like execution time and number of
-  scanned documents. Then it uses the 'RunQueryStats' hook to collect the query stats at the end of
-  each test, once with HMAC application enabled and once without. It doesn't assert anything about
-  the collected query stats, it is just meant to make sure nothing is going seriously awry (e.g.
-  crashing).
-
-selector:
-  roots:
-  - jstests/aggregation/**/*.js
-  exclude_with_any_tags:
-  # Running $queryStats will increment these counters which can screw up some test assertions.
-  - inspects_command_opcounters
-
-executor:
-  archive:
-    hooks:
-      - ValidateCollections
-  hooks:
-  # Be sure to run the hooks which depend on the fixture being alive before the CleanEveryN hook.
-  # That way the fixture restart can't cause any trouble for the other hooks.
-  - class: RunQueryStats
-  - class: ValidateCollections
-  - class: CleanEveryN
-    n: 20
-  fixture:
-    class: MongoDFixture
-    mongod_options:
-      set_parameters:
-        enableTestCommands: 1
-        internalQueryStatsRateLimit: -1
-        internalQueryStatsErrorsAreCommandFatal: true
diff --git a/buildscripts/resmokeconfig/suites/query_stats_mongos_aggregation_passthrough.yml b/buildscripts/resmokeconfig/suites/query_stats_mongos_aggregation_passthrough.yml
deleted file mode 100644
index 7f5ad0390c1..00000000000
--- a/buildscripts/resmokeconfig/suites/query_stats_mongos_aggregation_passthrough.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-test_kind: js_test
-description: |
-  This suite enables the collection of query stats metrics on a mongos server, then runs the tests in
-  core and aggregation as normal. This should cause each aggregation to compute a query
-  shape and query stats key, and record in-memory some metrics like execution time and number of
-  scanned documents. Then it uses the 'RunQueryStats' hook to collect the query stats at the end of
-  each test, once with HMAC application enabled and once without. It doesn't assert anything about
-  the collected query stats, it is just meant to make sure nothing is going seriously awry (e.g.
-  crashing).
-
-selector:
-  roots:
-  - jstests/aggregation/**/*.js
-  exclude_files:
-  - jstests/aggregation/extras/*.js
-  - jstests/aggregation/data/*.js
-  # TODO: Remove when SERVER-23229 is fixed.
-  - jstests/aggregation/bugs/groupMissing.js
-  # Mongos does not support runtimeConstants.
-  - jstests/aggregation/accumulators/internal_js_reduce_with_scope.js
-  - jstests/aggregation/expressions/internal_js_emit_with_scope.js
-  # $unionWith explain output does not check whether the collection is sharded in a sharded
-  # cluster.
-  - jstests/aggregation/sources/unionWith/unionWith_explain.js
-  exclude_with_any_tags:
-  # The following tests start their own ShardingTest or ReplSetTest, respectively.
-  - requires_sharding
-  - requires_replication
-  - assumes_standalone_mongod
-  - assumes_against_mongod_not_mongos
-  # system.profile collection doesn't exist on mongos.
-  - requires_profiling
-  # Running $queryStats will increment these counters which can screw up some test assertions.
-  - inspects_command_opcounters
-
-executor:
-  archive:
-    hooks:
-      - ValidateCollections
-  hooks:
-  # Be sure to run the hooks which depend on the fixture being alive before the CleanEveryN hook.
-  # That way the fixture restart can't cause any trouble for the other hooks.
-  - class: RunQueryStats
-  - class: ValidateCollections
-  - class: CleanEveryN
-    n: 20
-  fixture:
-    class: ShardedClusterFixture
-    mongos_options:
-      set_parameters:
-        enableTestCommands: 1
-        internalQueryStatsRateLimit: -1
-        internalQueryStatsErrorsAreCommandFatal: true
-    mongod_options:
-      set_parameters:
-        enableTestCommands: 1
-    num_rs_nodes_per_shard: 1
-    enable_sharding:
-    - test
diff --git a/buildscripts/resmokeconfig/suites/query_stats_mongos_passthrough.yml b/buildscripts/resmokeconfig/suites/query_stats_mongos_passthrough.yml
deleted file mode 100644
index 8721dd2a940..00000000000
--- a/buildscripts/resmokeconfig/suites/query_stats_mongos_passthrough.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-test_kind: js_test
-description: |
-  This suite enables the collection of query stats metrics on a mongos server, then runs the tests in
-  core and aggregation as normal. This should cause each query to compute a query
-  shape and query stats key, and record in-memory some metrics like execution time and number of
-  scanned documents. Then it uses the 'RunQueryStats' hook to collect the query stats at the end of
-  each test, once with HMAC application enabled and once without. It doesn't assert anything about
-  the collected query stats, it is just meant to make sure nothing is going seriously awry (e.g.
-  crashing).
-
-selector:
-  roots:
-  - jstests/core/**/*.js
-  exclude_files:
-  - jstests/core/txns/**/*.js
-  # The following tests fail because a certain command or functionality is not supported on
-  # mongos. This command or functionality is placed in a comment next to the failing test.
-  - jstests/core/**/apitest_db.js  # serverStatus output doesn't have storageEngine.
-  - jstests/core/**/check_shard_index.js  # checkShardingIndex.
-  - jstests/core/**/collection_truncate.js  # emptycapped.
-  - jstests/core/**/compact_keeps_indexes.js  # compact.
-  - jstests/core/**/currentop.js  # uses fsync.
-  - jstests/core/**/dbhash.js  # dbhash.
-  - jstests/core/**/dbhash2.js  # dbhash.
-  - jstests/core/**/fsync.js  # uses fsync.
-  - jstests/core/**/geo_s2cursorlimitskip.js  # profiling.
-  - jstests/core/**/geo_update_btree2.js  # notablescan.
-  - jstests/core/**/index9.js  # "local" database.
-  - jstests/core/**/queryoptimizera.js  # "local" database.
-  - jstests/core/**/stages*.js  # stageDebug.
-  - jstests/core/**/startup_log.js  # "local" database.
-  - jstests/core/**/top.js  # top.
-  # The following tests fail because mongos behaves differently from mongod when testing certain
-  # functionality. The differences are in a comment next to the failing test.
-  - jstests/core/**/explain_missing_database.js  # Behavior with no db different on mongos.
-  - jstests/core/**/geo_2d_explain.js  # executionSuccess in different spot in explain().
-  - jstests/core/**/geo_s2explain.js  # inputStage in different spot in explain().
-  - jstests/core/**/geo_s2sparse.js  # keysPerIndex in different spot in validate().
-  - jstests/core/**/operation_latency_histogram.js  # Stats are counted differently on mongos, SERVER-24880.
-  - jstests/core/**/killop_drop_collection.js # Uses fsyncLock.
-  - jstests/core/**/or_to_in.js # queryPlanner in different spot in explain()
-  # The following tests fail because of divergent dropCollection behavior between standalones and
-  # sharded clusters. These tests expect a second drop command to error, whereas in sharded clusters
-  # we expect a second drop to return status OK.
-  - jstests/core/**/explain_upsert.js
-  exclude_with_any_tags:
-  - assumes_standalone_mongod
-  - assumes_against_mongod_not_mongos
-  # system.profile collection doesn't exist on mongos.
-  - requires_profiling
-  # Running $queryStats will increment these counters which can screw up some test assertions.
-  - inspects_command_opcounters
-
-executor:
-  archive:
-    hooks:
-      - ValidateCollections
-  hooks:
-  # Be sure to run the hooks which depend on the fixture being alive before the CleanEveryN hook.
-  # That way the fixture restart can't cause any trouble for the other hooks.
-  - class: RunQueryStats
-  - class: ValidateCollections
-  - class: CleanEveryN
-    n: 20
-  fixture:
-    class: ShardedClusterFixture
-    mongos_options:
-      set_parameters:
-        enableTestCommands: 1
-        internalQueryStatsRateLimit: -1
-        internalQueryStatsErrorsAreCommandFatal: true
-    mongod_options:
-      set_parameters:
-        enableTestCommands: 1
-    num_rs_nodes_per_shard: 1
-    enable_sharding:
-    - test
diff --git a/buildscripts/resmokeconfig/suites/query_stats_passthrough.yml b/buildscripts/resmokeconfig/suites/query_stats_passthrough.yml
deleted file mode 100644
index c378ed81167..00000000000
--- a/buildscripts/resmokeconfig/suites/query_stats_passthrough.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-test_kind: js_test
-description: |
-  This suite enables the collection of query stats metrics on a mongod server, then runs the tests in
-  core and aggregation as normal. This should cause each query to compute a query
-  shape and query stats key, and record in-memory some metrics like execution time and number of
-  scanned documents. Then it uses the 'RunQueryStats' hook to collect the query stats at the end of
-  each test, once with HMAC application enabled and once without. It doesn't assert anything about
-  the collected query stats, it is just meant to make sure nothing is going seriously awry (e.g.
-  crashing).
-
-selector:
-  roots:
-  - jstests/core/**/*.js
-  exclude_files:
-  # Transactions are not supported on MongoDB standalone nodes, so we do not run these tests.
-  - jstests/core/txns/**/*.js
-  - jstests/core/timeseries/timeseries_union_with.js
-  exclude_with_any_tags:
-  # Running $queryStats will increment these counters which can screw up some test assertions.
-  - inspects_command_opcounters
-
-executor:
-  archive:
-    hooks:
-      - ValidateCollections
-  hooks:
-  # Be sure to run the hooks which depend on the fixture being alive before the CleanEveryN hook.
-  # That way the fixture restart can't cause any trouble for the other hooks.
-  - class: RunQueryStats
-  - class: ValidateCollections
-  - class: CleanEveryN
-    n: 20
-  fixture:
-    class: MongoDFixture
-    mongod_options:
-      set_parameters:
-        enableTestCommands: 1
-        internalQueryStatsRateLimit: -1
-        internalQueryStatsErrorsAreCommandFatal: true
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
index 8408255eea1..b6316ac186a 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
@@ -41,6 +41,7 @@ selector:
   - jstests/core/json_schema/json_schema.js
   - jstests/core/mr_bigobject.js
   - jstests/core/not2.js
+  - jstests/core/notablescan.js
   - jstests/core/null_query_semantics.js
   - jstests/core/or1.js
   - jstests/core/or2.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index d885199b493..bc58d35542c 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -223,7 +223,6 @@ selector:
   - jstests/core/find_and_modify.js
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
 
   # Does not support tojson of command objects.
   - jstests/core/SERVER-23626.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
index 1b27ca1e5c3..daff4e411c8 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
@@ -221,7 +221,6 @@ selector:
   - jstests/core/find_and_modify.js
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
 
   # Does not support tojson of command objects.
   - jstests/core/SERVER-23626.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
index 769a7daf339..d292c3ae69d 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
@@ -7,6 +7,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).
@@ -31,7 +33,6 @@ selector:
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_pipeline_update.js
   - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
 
   # These test run commands using legacy queries, which are not supported on sessions.
   - jstests/core/comment_field.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
index 7f91860f3b8..1288ffb0a86 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).
@@ -22,7 +24,6 @@ selector:
   - jstests/core/find_and_modify.js
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
   - jstests/core/currentop.js
diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml b/buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml
index 0ef725251e6..b3d3d510dae 100644
--- a/buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml
+++ b/buildscripts/resmokeconfig/suites/retryable_writes_downgrade.yml
@@ -24,7 +24,6 @@ selector:
   - jstests/core/find_and_modify.js
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
   - jstests/core/currentop.js
diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml
index dd0743c6a23..3f8a241c4bc 100644
--- a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_passthrough.yml
@@ -30,7 +30,6 @@ selector:
   - jstests/core/find_and_modify_pipeline_update.js
   - jstests/core/find_and_modify_server6865.js
   - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
 
   # These tests rely on the assumption that an update command is run only once.
   - jstests/core/find_and_modify_metrics.js
diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
index b382dde715a..985f095650d 100644
--- a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
@@ -3,6 +3,8 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/**/*.js
+  - jstests/fle2/**/*.js
+  - src/mongo/db/modules/*/jstests/fle2/*.js
   exclude_files:
   # Transactions do not support retryability of individual operations.
   # TODO: Remove this once it is supported (SERVER-33952).
@@ -23,7 +25,6 @@ selector:
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
   - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
   - jstests/core/currentop.js
diff --git a/buildscripts/resmokeconfig/suites/sasl.yml b/buildscripts/resmokeconfig/suites/sasl.yml
index d7888475e08..4d1a49cc95d 100644
--- a/buildscripts/resmokeconfig/suites/sasl.yml
+++ b/buildscripts/resmokeconfig/suites/sasl.yml
@@ -3,8 +3,6 @@ test_kind: js_test
 selector:
   roots:
   - src/mongo/db/modules/*/jstests/sasl/*.js
-  exclude_files:
-  - src/mongo/db/modules/enterprise/jstests/sasl/sasl_plugins.js
 
 # sasl tests start their own mongod's.
 executor:
diff --git a/buildscripts/resmokeconfig/suites/sasl_windows_cyrussasl.yml b/buildscripts/resmokeconfig/suites/sasl_windows_cyrussasl.yml
deleted file mode 100644
index 0c1cf6fc6ce..00000000000
--- a/buildscripts/resmokeconfig/suites/sasl_windows_cyrussasl.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-test_kind: js_test
-
-selector:
-  roots:
-    - src/mongo/db/modules/*/jstests/sasl/sasl_plugins.js
-
-# sasl tests start their own mongod's.
-executor:
-  config:
-    shell_options:
-      nodb: ""
diff --git a/buildscripts/resmokeconfig/suites/search.yml b/buildscripts/resmokeconfig/suites/search.yml
index 4c003db89d1..61ba50f7715 100644
--- a/buildscripts/resmokeconfig/suites/search.yml
+++ b/buildscripts/resmokeconfig/suites/search.yml
@@ -3,9 +3,6 @@ test_kind: js_test
 selector:
   roots:
   - src/mongo/db/modules/*/jstests/search/*.js
-  - src/mongo/db/modules/*/jstests/mongot/*.js
-  exclude_with_any_tags:
-  - requires_auth
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/search_auth.yml b/buildscripts/resmokeconfig/suites/search_auth.yml
index e73b0474840..edf79042a40 100644
--- a/buildscripts/resmokeconfig/suites/search_auth.yml
+++ b/buildscripts/resmokeconfig/suites/search_auth.yml
@@ -7,10 +7,6 @@ test_kind: js_test
 selector:
   roots:
   - src/mongo/db/modules/*/jstests/search/*.js
-  - src/mongo/db/modules/*/jstests/mongot/*.js
-  exclude_files:
-  # Skip any tests that run with auth explicitly.
-  - src/mongo/db/modules/*/jstests/search/auth_list_search_indexes_agg.js
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/search_pinned_connections_auth.yml b/buildscripts/resmokeconfig/suites/search_pinned_connections_auth.yml
deleted file mode 100644
index 6b6b0e07bdc..00000000000
--- a/buildscripts/resmokeconfig/suites/search_pinned_connections_auth.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  roots:
-  - src/mongo/db/modules/*/jstests/search/*.js
-  - src/mongo/db/modules/*/jstests/mongot/*.js
-  exclude_files:
-  # Skip any tests that run with auth explicitly.
-  - src/mongo/db/modules/*/jstests/search/auth_list_search_indexes_agg.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-256
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-          roleGraphInvalidationIsFatal: true
-          setParameters:
-            pinTaskExecCursorConns: true
-      nodb: ''
diff --git a/buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml b/buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml
index 3fab3de86db..6419782211b 100644
--- a/buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_retryable_writes_downgrade.yml
@@ -24,7 +24,6 @@ selector:
   - jstests/core/find_and_modify.js
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
   - jstests/core/currentop.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth.yml b/buildscripts/resmokeconfig/suites/sharding_auth.yml
index 02e731e6352..964d03ce993 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth.yml
@@ -32,7 +32,6 @@ selector:
   - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
   # Runs with auth enabled.
   - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
-  - jstests/sharding/cluster_time_across_add_shard.js
   # Skip because this suite implicitly authenticates as __system, which allows bypassing user write
   # blocking.
   - jstests/sharding/set_user_write_block_mode.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
index a6c193f0e91..630863957be 100644
--- a/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_auth_audit.yml
@@ -32,7 +32,6 @@ selector:
   - jstests/sharding/migration_critical_section_concurrency.js        # SERVER-21713
   # Runs with auth enabled.
   - jstests/sharding/mongod_returns_no_cluster_time_without_keys.js
-  - jstests/sharding/cluster_time_across_add_shard.js
   # Skip because this suite implicitly authenticates as __system, which allows bypassing user write
   # blocking.
   - jstests/sharding/set_user_write_block_mode.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_batched_deletes_passthrough.yml b/buildscripts/resmokeconfig/suites/sharding_batched_deletes_passthrough.yml
new file mode 100644
index 00000000000..0d7391ad637
--- /dev/null
+++ b/buildscripts/resmokeconfig/suites/sharding_batched_deletes_passthrough.yml
@@ -0,0 +1,37 @@
+# This passthrough runs all sharding JS tests and automatically batches multi-deletes.
+test_kind: js_test
+
+selector:
+  roots:
+  - jstests/sharding/**/*.js
+  exclude_files:
+  - jstests/sharding/libs/*.js
+  # TODO (SERVER-64506): these tests use transactions under the hood to modify user roles.
+  - jstests/sharding/api_params_nontransaction_sharded.js
+  - jstests/sharding/api_params_nontransaction_unsharded.js
+  # Expects DELETE stage
+  - jstests/sharding/query/explain_cmd.js
+  # TODO: (SERVER-64972): add change stream support for batched deletes.
+  - jstests/sharding/change_stream_no_orphans.js
+
+  exclude_with_any_tags:
+  - assumes_standalone_mongod
+  # TODO (SERVER-64506): make groupOplogEntries WUOW's nestable (e.g. inside multi-doc txns).
+  - uses_multi_shard_transaction
+  - uses_prepare_transaction
+  - uses_transactions
+
+executor:
+  archive:
+    hooks:
+      - CheckReplDBHashInBackground
+      - CheckReplDBHash
+      - ValidateCollections
+  config:
+    shell_options:
+      nodb: ''
+      global_vars:
+        TestData:
+          setParameters:
+            enableTestCommands: 1
+            failpoint.batchDeletesByDefault: "{mode: 'alwaysOn'}"
diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
index 095ca918119..20749832032 100644
--- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml
@@ -10,8 +10,6 @@ selector:
   - jstests/sharding/*[aA]uth*.js
   - jstests/sharding/query/*[aA]uth*.js
   - jstests/sharding/change_streams/*[aA]uth*.js
-  - jstests/sharding/cluster_time_across_add_shard.js
-
   - jstests/sharding/internal_txns/internal_client_restrictions.js
   - jstests/sharding/internal_txns/non_retryable_writes_during_migration.js
   - jstests/sharding/internal_txns/retry_on_transient_error_validation.js
@@ -31,6 +29,7 @@ selector:
   - jstests/sharding/addshard1.js
   - jstests/sharding/addshard2.js
   - jstests/sharding/autosplit.js
+  - jstests/sharding/auto_rebalance_parallel.js
   - jstests/sharding/basic_merge.js
   - jstests/sharding/count1.js
   - jstests/sharding/count2.js
@@ -52,10 +51,12 @@ selector:
   - jstests/sharding/limit_push.js
   - jstests/sharding/merge_with_drop_shard.js
   - jstests/sharding/merge_with_move_primary.js
+  - jstests/sharding/migrateBig_balancer.js
   - jstests/sharding/move_chunk_basic.js
   - jstests/sharding/movePrimary1.js
   - jstests/sharding/names.js
   - jstests/sharding/prefix_shard_key.js
+  - jstests/sharding/presplit.js
   - jstests/sharding/query_config.js
   - jstests/sharding/range_deleter_interacts_correctly_with_refine_shard_key.js
   - jstests/sharding/remove1.js
@@ -63,8 +64,11 @@ selector:
   - jstests/sharding/shard2.js
   - jstests/sharding/shard3.js
   - jstests/sharding/shard_collection_basic.js
+  - jstests/sharding/shard_existing_coll_chunk_count.js
+  - jstests/sharding/sharding_balance1.js
   - jstests/sharding/sharding_balance2.js
   - jstests/sharding/sharding_balance3.js
+  - jstests/sharding/sharding_balance4.js
   - jstests/sharding/sharding_migrate_cursor1.js
   - jstests/sharding/tag_range.js
   - jstests/sharding/top_chunk_autosplit.js
@@ -230,16 +234,11 @@ selector:
 
   # TODO SERVER-51495: Re-enable these tests after reshardCollection is resilient to config server
   # primary failovers.
-  - jstests/sharding/**/*reshard*.js
+  - jstests/sharding/*reshard*.js
 
   # SERVER-51805 splitChunk op is not idempotent
   - jstests/sharding/mongos_get_shard_version.js
 
-  # Test will fail if it is unable to lock the config server primary successfully.
-  - jstests/sharding/fsync_lock_unlock.js
-  - jstests/sharding/fsync_deadlock.js
-  - jstests/sharding/fsync_lock_fails_with_in_progress_ddl_op.js
-
   exclude_with_any_tags:
   - does_not_support_stepdowns
 
diff --git a/buildscripts/resmokeconfig/suites/simulate_crash_concurrency_replication.yml b/buildscripts/resmokeconfig/suites/simulate_crash_concurrency_replication.yml
index 790d06a5f0c..312f8249245 100644
--- a/buildscripts/resmokeconfig/suites/simulate_crash_concurrency_replication.yml
+++ b/buildscripts/resmokeconfig/suites/simulate_crash_concurrency_replication.yml
@@ -30,7 +30,6 @@ executor:
   config: {}
   hooks:
   - class: SimulateCrash
-  - class: CleanupConcurrencyWorkloads
   fixture:
     class: ReplicaSetFixture
     mongod_options:
diff --git a/buildscripts/resmokeconfig/suites/ssl_linear.yml b/buildscripts/resmokeconfig/suites/ssl_linear.yml
deleted file mode 100644
index 3c3eacb1f78..00000000000
--- a/buildscripts/resmokeconfig/suites/ssl_linear.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-test_kind: js_test
-
-# Similar to the `ssl` suite, but configured by evergreen to run sequentially, so that the
-# contents of the Windows system certificate store are only affected by one test at a time.
-selector:
-  roots:
-  - jstests/ssl_linear/*.js
-
-# ssl tests start their own mongod's.
-executor:
-  config:
-    shell_options:
-      nodb: ''
-      ssl: ''
-      sslAllowInvalidCertificates: ''
-      sslCAFile: jstests/libs/ca.pem
-      sslPEMKeyFile: jstests/libs/client.pem
-      global_vars:
-        TestData:
-          setParameters:
-            logComponentVerbosity: "{network:2}"
-          setParametersMongos:
-            logComponentVerbosity: "{network:2}"
diff --git a/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_kill_primary_jscore_passthrough.yml
index 3bc42f1f487..7a1f8d9f47a 100644
--- a/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/talk_directly_to_shardsvrs_kill_primary_jscore_passthrough.yml
@@ -34,7 +34,6 @@ selector:
   - jstests/core/find_and_modify.js
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
-  - jstests/core/project_with_collation.js
 
   - jstests/core/bench_test*.js # benchRun() used for writes
   - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
index c6a2225f44f..36433f7ceca 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml
@@ -43,7 +43,6 @@ selector:
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
   - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
   - jstests/core/currentop.js
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml
index 6fd164a5025..fc02fb23677 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml
@@ -43,7 +43,6 @@ selector:
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
   - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
   - jstests/core/currentop.js
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml
index 6e139307b27..94d46e70994 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml
@@ -43,7 +43,6 @@ selector:
   - jstests/core/find_and_modify2.js
   - jstests/core/find_and_modify_server6865.js
   - jstests/core/fts_find_and_modify.js
-  - jstests/core/project_with_collation.js
 
   # Stepdown commands during fsync lock will fail.
   - jstests/core/currentop.js
diff --git a/buildscripts/resmokeconfig/suites/unittests_first_quarter.yml b/buildscripts/resmokeconfig/suites/unittests_first_quarter.yml
deleted file mode 100644
index ca8f5af0de0..00000000000
--- a/buildscripts/resmokeconfig/suites/unittests_first_quarter.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test_kind: cpp_unit_test
-
-selector:
-  root: build/first_quarter_unittests.txt
-
-executor:
-  config: {}
diff --git a/buildscripts/resmokeconfig/suites/unittests_fourth_quarter.yml b/buildscripts/resmokeconfig/suites/unittests_fourth_quarter.yml
deleted file mode 100644
index 177672b8726..00000000000
--- a/buildscripts/resmokeconfig/suites/unittests_fourth_quarter.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test_kind: cpp_unit_test
-
-selector:
-  root: build/fourth_quarter_unittests.txt
-
-executor:
-  config: {}
diff --git a/buildscripts/resmokeconfig/suites/unittests_second_quarter.yml b/buildscripts/resmokeconfig/suites/unittests_second_quarter.yml
deleted file mode 100644
index 52a96c1384c..00000000000
--- a/buildscripts/resmokeconfig/suites/unittests_second_quarter.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test_kind: cpp_unit_test
-
-selector:
-  root: build/second_quarter_unittests.txt
-
-executor:
-  config: {}
diff --git a/buildscripts/resmokeconfig/suites/unittests_third_quarter.yml b/buildscripts/resmokeconfig/suites/unittests_third_quarter.yml
deleted file mode 100644
index 60b997bb403..00000000000
--- a/buildscripts/resmokeconfig/suites/unittests_third_quarter.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-test_kind: cpp_unit_test
-
-selector:
-  root: build/third_quarter_unittests.txt
-
-executor:
-  config: {}
diff --git a/buildscripts/resmokeconfig/suites/vector_search.yml b/buildscripts/resmokeconfig/suites/vector_search.yml
deleted file mode 100644
index effd621be8f..00000000000
--- a/buildscripts/resmokeconfig/suites/vector_search.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-test_kind: js_test
-
-selector:
-  roots:
-  - src/mongo/db/modules/*/jstests/vector_search/*.js
-  exclude_with_any_tags:
-  - requires_auth
-
-executor:
-  config:
-    shell_options:
-      nodb: ''
diff --git a/buildscripts/resmokeconfig/suites/vector_search_auth.yml b/buildscripts/resmokeconfig/suites/vector_search_auth.yml
deleted file mode 100644
index c025afe3619..00000000000
--- a/buildscripts/resmokeconfig/suites/vector_search_auth.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-config_variables:
-- &keyFile jstests/libs/authTestsKey
-- &keyFileData Thiskeyisonlyforrunningthesuitewithauthenticationdontuseitinanytestsdirectly
-
-test_kind: js_test
-
-selector:
-  roots:
-  - src/mongo/db/modules/*/jstests/vector_search/*.js
-
-executor:
-  config:
-    shell_options:
-      global_vars:
-        TestData:
-          auth: true
-          authMechanism: SCRAM-SHA-256
-          keyFile: *keyFile
-          keyFileData: *keyFileData
-          roleGraphInvalidationIsFatal: true
-      nodb: ''
diff --git a/buildscripts/resmokeconfig/suites/vector_search_ssl.yml b/buildscripts/resmokeconfig/suites/vector_search_ssl.yml
deleted file mode 100644
index e234ea490fd..00000000000
--- a/buildscripts/resmokeconfig/suites/vector_search_ssl.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-test_kind: js_test
-
-selector:
-  roots:
-  - src/mongo/db/modules/*/jstests/vector_search/ssl/*.js
-
-executor:
-  config:
-    shell_options:
-      nodb: ''
-      ssl: ''
-      tlsAllowInvalidHostnames: ''
-      tlsAllowInvalidCertificates: ''
-      tlsCAFile: jstests/libs/ca.pem
-      tlsCertificateKeyFile: jstests/libs/client.pem