diff --git a/.backportrc.json b/.backportrc.json
index 77b06cd41927..d2e92817c026 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -1,9 +1,10 @@
 {
   "upstream" : "elastic/elasticsearch",
-  "targetBranchChoices" : [ "main", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
+  "targetBranchChoices" : [ "main", "8.x", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
   "targetPRLabels" : [ "backport" ],
   "branchLabelMapping" : {
-    "^v8.16.0$" : "main",
+    "^v9.0.0$" : "main",
+    "^v8.16.0$" : "8.x",
     "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
   }
-}
\ No newline at end of file
+}
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
index beb45107bc31..e7ba4ba7610c 100644
--- a/.buildkite/pipelines/intake.yml
+++ b/.buildkite/pipelines/intake.yml
@@ -62,7 +62,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.24", "8.15.2", "8.16.0"]
+            BWC_VERSION: ["8.15.2", "8.16.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
index cd0bc8449f89..8ef8f5954887 100644
--- a/.buildkite/pipelines/periodic-packaging.yml
+++ b/.buildkite/pipelines/periodic-packaging.yml
@@ -33,312 +33,6 @@ steps:
         env: {}
   - group: packaging-tests-upgrade
     steps:
-      - label: "{{matrix.image}} / 7.0.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.0.1
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.0.1
-
-      - label: "{{matrix.image}} / 7.1.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.1.1
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.1.1
-
-      - label: "{{matrix.image}} / 7.2.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.2.1
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.2.1
-
-      - label: "{{matrix.image}} / 7.3.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.3.2
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.3.2
-
-      - label: "{{matrix.image}} / 7.4.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.4.2
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.4.2
-
-      - label: "{{matrix.image}} / 7.5.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.5.2
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.5.2
-
-      - label: "{{matrix.image}} / 7.6.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.6.2
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.6.2
-
-      - label: "{{matrix.image}} / 7.7.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.7.1
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.7.1
-
-      - label: "{{matrix.image}} / 7.8.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.8.1
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.8.1
-
-      - label: "{{matrix.image}} / 7.9.3 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.9.3
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.9.3
-
-      - label: "{{matrix.image}} / 7.10.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.10.2
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.10.2
-
-      - label: "{{matrix.image}} / 7.11.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.11.2
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.11.2
-
-      - label: "{{matrix.image}} / 7.12.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.12.1
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.12.1
-
-      - label: "{{matrix.image}} / 7.13.4 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.13.4
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.13.4
-
-      - label: "{{matrix.image}} / 7.14.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.14.2
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.14.2
-
-      - label: "{{matrix.image}} / 7.15.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.15.2
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.15.2
-
-      - label: "{{matrix.image}} / 7.16.3 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.16.3
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.16.3
-
-      - label: "{{matrix.image}} / 7.17.24 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.24
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.17.24
-
       - label: "{{matrix.image}} / 8.0.1 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.1
         timeout_in_minutes: 300
@@ -628,6 +322,23 @@ steps:
         env:
           BWC_VERSION: 8.16.0
 
+      - label: "{{matrix.image}} / 9.0.0 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.0
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - rocky-8
+              - ubuntu-2004
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: custom-16-32768
+          buildDirectory: /dev/shm/bk
+          diskSizeGb: 250
+        env:
+          BWC_VERSION: 9.0.0
+
   - group: packaging-tests-windows
     steps:
       - label: "{{matrix.image}} / packaging-tests-windows"
diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
index 8f25a0fb1106..5f75b7f1a2ef 100644
--- a/.buildkite/pipelines/periodic.yml
+++ b/.buildkite/pipelines/periodic.yml
@@ -2,366 +2,6 @@
 steps:
   - group: bwc
     steps:
-      - label: 7.0.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.0.1#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.0.1
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.1.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.1.1#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.1.1
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.2.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.2.1#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.2.1
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.3.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.3.2#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.3.2
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.4.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.4.2#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.4.2
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.5.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.5.2#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.5.2
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.6.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.6.2#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.6.2
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.7.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.7.1#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.7.1
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.8.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.8.1#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.8.1
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.9.3 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.9.3#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.9.3
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.10.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.10.2#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.10.2
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.11.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.11.2#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.11.2
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.12.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.12.1#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.12.1
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.13.4 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.13.4#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.13.4
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.14.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.14.2#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.14.2
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.15.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.15.2#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.15.2
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.16.3 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.16.3#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.16.3
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
-      - label: 7.17.24 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.24#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-          preemptible: true
-          diskSizeGb: 250
-        env:
-          BWC_VERSION: 7.17.24
-        retry:
-          automatic:
-            - exit_status: "-1"
-              limit: 3
-              signal_reason: none
-            - signal_reason: agent_stop
-              limit: 3
-
       - label: 8.0.1 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.0.1#bwcTest
         timeout_in_minutes: 300
@@ -702,6 +342,26 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
+      - label: 9.0.0 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.0#bwcTest
+        timeout_in_minutes: 300
+        agents:
+          provider: gcp
+          image: family/elasticsearch-ubuntu-2004
+          machineType: n1-standard-32
+          buildDirectory: /dev/shm/bk
+          preemptible: true
+          diskSizeGb: 250
+        env:
+          BWC_VERSION: 9.0.0
+        retry:
+          automatic:
+            - exit_status: "-1"
+              limit: 3
+              signal_reason: none
+            - signal_reason: agent_stop
+              limit: 3
+
   - label: concurrent-search-tests
     command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
     timeout_in_minutes: 420
@@ -771,7 +431,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk17
-            BWC_VERSION: ["7.17.24", "8.15.2", "8.16.0"]
+            BWC_VERSION: ["8.15.2", "8.16.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -821,7 +481,7 @@ steps:
               - openjdk21
               - openjdk22
               - openjdk23
-            BWC_VERSION: ["7.17.24", "8.15.2", "8.16.0"]
+            BWC_VERSION: ["8.15.2", "8.16.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
index b80309cdb3f8..498727b3ecd3 100644
--- a/.ci/bwcVersions
+++ b/.ci/bwcVersions
@@ -1,22 +1,4 @@
 BWC_VERSION:
-  - "7.0.1"
-  - "7.1.1"
-  - "7.2.1"
-  - "7.3.2"
-  - "7.4.2"
-  - "7.5.2"
-  - "7.6.2"
-  - "7.7.1"
-  - "7.8.1"
-  - "7.9.3"
-  - "7.10.2"
-  - "7.11.2"
-  - "7.12.1"
-  - "7.13.4"
-  - "7.14.2"
-  - "7.15.2"
-  - "7.16.3"
-  - "7.17.24"
   - "8.0.1"
   - "8.1.3"
   - "8.2.3"
@@ -34,3 +16,4 @@ BWC_VERSION:
   - "8.14.3"
   - "8.15.2"
   - "8.16.0"
+  - "9.0.0"
diff --git a/.ci/java-versions-aarch64.properties b/.ci/java-versions-aarch64.properties
index b1e0f4cfe8af..8815d5011a8e 100644
--- a/.ci/java-versions-aarch64.properties
+++ b/.ci/java-versions-aarch64.properties
@@ -4,4 +4,4 @@
 # build and test Elasticsearch for this branch. Valid Java versions
 # are 'java' or 'openjdk' followed by the major release number.
 
-ES_BUILD_JAVA=jdk17
+ES_BUILD_JAVA=jdk21
diff --git a/.ci/java-versions-fips.properties b/.ci/java-versions-fips.properties
index fa6873935576..87490374bb99 100644
--- a/.ci/java-versions-fips.properties
+++ b/.ci/java-versions-fips.properties
@@ -4,4 +4,4 @@
 # build and test Elasticsearch for this branch. Valid Java versions
 # are 'java' or 'openjdk' followed by the major release number.
 
-ES_BUILD_JAVA=openjdk17
+ES_BUILD_JAVA=openjdk21
diff --git a/.ci/java-versions.properties b/.ci/java-versions.properties
index 21884973742b..5ed97ab248c2 100644
--- a/.ci/java-versions.properties
+++ b/.ci/java-versions.properties
@@ -4,4 +4,4 @@
 # build and test Elasticsearch for this branch. Valid Java versions
 # are 'java' or 'openjdk' followed by the major release number.
 
-ES_BUILD_JAVA=openjdk17
+ES_BUILD_JAVA=openjdk21
diff --git a/.ci/scripts/resolve-dra-manifest.sh b/.ci/scripts/resolve-dra-manifest.sh
index bd7a9bbbdafe..e42a22834ccc 100755
--- a/.ci/scripts/resolve-dra-manifest.sh
+++ b/.ci/scripts/resolve-dra-manifest.sh
@@ -23,6 +23,12 @@ LATEST_VERSION=$(strip_version $LATEST_BUILD)
 if [ "$LATEST_VERSION" != "$ES_VERSION" ]; then
   echo "Latest build for '$ARTIFACT' is version $LATEST_VERSION but expected version $ES_VERSION." 1>&2
   NEW_BRANCH=$(echo $ES_VERSION | sed -E "s/([0-9]+\.[0-9]+)\.[0-9]/\1/g")
+
+  # Temporary
+  if [[ "$ES_VERSION" == "8.16.0" ]]; then
+    NEW_BRANCH="8.x"
+  fi
+
   echo "Using branch $NEW_BRANCH instead of $BRANCH." 1>&2
   LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $NEW_BRANCH)
 fi
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
index e41bbac68f1e..a2f1e0c675ea 100644
--- a/.ci/snapshotBwcVersions
+++ b/.ci/snapshotBwcVersions
@@ -1,4 +1,4 @@
 BWC_VERSION:
-  - "7.17.24"
   - "8.15.2"
   - "8.16.0"
+  - "9.0.0"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5b98444c044d..f0d906882002 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -70,3 +70,7 @@ server/src/main/java/org/elasticsearch/threadpool @elastic/es-core-infra
 # Security
 x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege @elastic/es-security
 x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStore.java @elastic/es-security
+
+# Analytical engine
+x-pack/plugin/esql @elastic/es-analytical-engine
+x-pack/plugin/esql-core @elastic/es-analytical-engine
diff --git a/.github/updatecli/values.d/ironbank.yml b/.github/updatecli/values.d/ironbank.yml
new file mode 100644
index 000000000000..10b2c948a583
--- /dev/null
+++ b/.github/updatecli/values.d/ironbank.yml
@@ -0,0 +1,3 @@
+config:
+  - path: distribution/docker/src/docker/iron_bank
+    dockerfile: ../Dockerfile
diff --git a/.github/updatecli/values.d/scm.yml b/.github/updatecli/values.d/scm.yml
new file mode 100644
index 000000000000..ec4bd2d61209
--- /dev/null
+++ b/.github/updatecli/values.d/scm.yml
@@ -0,0 +1,10 @@
+scm:
+  enabled: true
+  owner: elastic
+  repository: elasticsearch
+  branch: main
+  commitusingapi: true
+  # begin updatecli-compose policy values
+  user: elasticmachine
+  email: 42973632+elasticmachine@users.noreply.github.com
+  # end updatecli-compose policy values
diff --git a/.github/updatecli/values.d/updatecli-compose.yml b/.github/updatecli/values.d/updatecli-compose.yml
new file mode 100644
index 000000000000..02df609f2a30
--- /dev/null
+++ b/.github/updatecli/values.d/updatecli-compose.yml
@@ -0,0 +1,3 @@
+spec:
+  files:
+    - "updatecli-compose.yaml"
\ No newline at end of file
diff --git a/.github/workflows/updatecli-compose.yml b/.github/workflows/updatecli-compose.yml
new file mode 100644
index 000000000000..cbab42d3a63b
--- /dev/null
+++ b/.github/workflows/updatecli-compose.yml
@@ -0,0 +1,38 @@
+---
+name: updatecli-compose
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 6 * * *'
+
+permissions:
+  contents: read
+
+jobs:
+  compose:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: read
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: elastic/oblt-actions/updatecli/run@v1
+        with:
+          command: --experimental compose diff
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: elastic/oblt-actions/updatecli/run@v1
+        with:
+          command: --experimental compose apply
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/REST_API_COMPATIBILITY.md b/REST_API_COMPATIBILITY.md
index c36b4ea9dbfb..4a6ad4e7e17f 100644
--- a/REST_API_COMPATIBILITY.md
+++ b/REST_API_COMPATIBILITY.md
@@ -158,12 +158,12 @@ The above code checks the request's compatible version and if the request has th
 
 The primary means of testing compatibility is via the prior major version's YAML REST tests. The build system will download the latest prior version of the YAML rest tests and execute them against the current cluster version. Prior to execution the tests will be transformed by injecting the correct headers to enable compatibility as well as other custom changes to the tests to allow the tests to pass. These customizations are configured via the build.gradle and happen just prior to test execution. Since the compatibility tests are manipulated version of the tests stored in Github (via the past major version), it is important to find the local (on disk) version for troubleshooting compatibility tests.
 
-The tests are wired into the `check` task, so that is the easiest way to test locally prior to committing.  More specifically the task is called `yamlRestTestV7CompatTest`, where 7 is the version of tests that are executing. For example, version 8 of the server will have a task named `yamlRestTestV7CompatTest` and version 9 of the server will have a task named `yamlRestTestV8CompatTest`. These behaves nearly identical to it's non-compat `yamlRestTest` task. The only variance is that the tests are sourced from the prior version branch and the tests go through a transformation phase before execution. The transformation task is `yamlRestTestV7CompatTransform` where the Vnumber follows the same convention as the test.
+The tests are wired into the `check` task, so that is the easiest way to test locally prior to committing.  More specifically the task is called `yamlRestCompatTest`. These behave nearly identical to it's non-compat `yamlRestTest` task. The only variance is that the tests are sourced from the prior version branch and the tests go through a transformation phase before execution. The transformation task is `yamlRestCompatTestTransform`.
 
 For example:
 
 ```bash
-./gradlew :rest-api-spec:yamlRestTestV7CompatTest
+./gradlew :rest-api-spec:yamlRestCompatTest
 ```
 
 Since these are a variation of backward compatibility testing, the entire suite of compatibility tests will be skipped anytime the backward compatibility testing is disabled. Since the source code for these tests live in a branch of code, disabling a specific test should be done via the transformation task configuration in build.gradle (i.e. `yamlRestTestV7CompatTransform`).
@@ -188,7 +188,7 @@ Muting compatibility tests should be done via a test transform. A per test skip
 
 ```groovy
 
-tasks.named("yamlRestTestV7CompatTransform").configure({ task ->
+tasks.named("yamlRestCompatTestTransform").configure({ task ->
   task.skipTestsByFilePattern("**/cat*/*.yml", "Cat API are not supported")
   task.skipTest("bulk/10_basic/Array of objects", "Muted due failures. See #12345")
 })
diff --git a/branches.json b/branches.json
index 1d860501cbc8..e464d6179f2b 100644
--- a/branches.json
+++ b/branches.json
@@ -4,6 +4,9 @@
     {
       "branch": "main"
     },
+    {
+      "branch": "8.x"
+    },
     {
       "branch": "8.15"
     },
diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy
index fc7ccd651d73..8c5c84a27671 100644
--- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy
+++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy
@@ -27,7 +27,7 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
         buildFile << """
             apply plugin: 'elasticsearch.internal-distribution-bwc-setup'
         """
-        execute("git branch origin/8.0", file("cloned"))
+        execute("git branch origin/8.x", file("cloned"))
         execute("git branch origin/7.16", file("cloned"))
         execute("git branch origin/7.15", file("cloned"))
     }
@@ -113,9 +113,9 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
         result.task(":distribution:bwc:minor:buildBwcDarwinTar").outcome == TaskOutcome.SUCCESS
         and: "assemble task triggered"
         result.output.contains("[8.0.0] > Task :distribution:archives:darwin-tar:extractedAssemble")
-        result.output.contains("expandedRootPath /distribution/bwc/minor/build/bwc/checkout-8.0/" +
+        result.output.contains("expandedRootPath /distribution/bwc/minor/build/bwc/checkout-8.x/" +
                         "distribution/archives/darwin-tar/build/install")
-        result.output.contains("nested folder /distribution/bwc/minor/build/bwc/checkout-8.0/" +
+        result.output.contains("nested folder /distribution/bwc/minor/build/bwc/checkout-8.x/" +
                         "distribution/archives/darwin-tar/build/install/elasticsearch-8.0.0-SNAPSHOT")
     }
 
diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy
index 737c448f23be..3ffbd926ec84 100644
--- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy
+++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy
@@ -19,10 +19,9 @@ import org.gradle.testkit.runner.TaskOutcome
 
 class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
 
-    def compatibleVersion = Version.fromString(VersionProperties.getVersions().get("elasticsearch")).getMajor() - 1
-    def specIntermediateDir = "restResources/v${compatibleVersion}/yamlSpecs"
-    def testIntermediateDir = "restResources/v${compatibleVersion}/yamlTests"
-    def transformTask  = ":yamlRestTestV${compatibleVersion}CompatTransform"
+    def specIntermediateDir = "restResources/compat/yamlSpecs"
+    def testIntermediateDir = "restResources/compat/yamlTests"
+    def transformTask  = ":yamlRestCompatTestTransform"
     def YAML_FACTORY = new YAMLFactory()
     def MAPPER = new ObjectMapper(YAML_FACTORY)
     def READER = MAPPER.readerFor(ObjectNode.class)
@@ -36,9 +35,11 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         buildApiRestrictionsDisabled = true
     }
 
-    def "yamlRestTestVxCompatTest does nothing when there are no tests"() {
+    def "yamlRestCompatTest does nothing when there are no tests"() {
         given:
-        subProject(":distribution:bwc:maintenance") << """
+        internalBuild()
+
+        subProject(":distribution:bwc:staged") << """
         configurations { checkout }
         artifacts {
             checkout(new File(projectDir, "checkoutDir"))
@@ -46,26 +47,24 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         """
 
         buildFile << """
-        plugins {
-          id 'elasticsearch.legacy-yaml-rest-compat-test'
-        }
+            apply plugin: 'elasticsearch.legacy-yaml-rest-compat-test'
         """
 
         when:
-        def result = gradleRunner("yamlRestTestV${compatibleVersion}CompatTest", '--stacktrace').build()
+        def result = gradleRunner("yamlRestCompatTest", '--stacktrace').build()
 
         then:
-        result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.NO_SOURCE
+        result.task(":yamlRestCompatTest").outcome == TaskOutcome.NO_SOURCE
         result.task(':copyRestCompatApiTask').outcome == TaskOutcome.NO_SOURCE
         result.task(':copyRestCompatTestTask').outcome == TaskOutcome.NO_SOURCE
         result.task(transformTask).outcome == TaskOutcome.NO_SOURCE
     }
 
-    def "yamlRestTestVxCompatTest executes and copies api and transforms tests from :bwc:maintenance"() {
+    def "yamlRestCompatTest executes and copies api and transforms tests from :bwc:staged"() {
         given:
         internalBuild()
 
-        subProject(":distribution:bwc:maintenance") << """
+        subProject(":distribution:bwc:staged") << """
         configurations { checkout }
         artifacts {
             checkout(new File(projectDir, "checkoutDir"))
@@ -90,7 +89,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         String wrongTest = "wrong_version.yml"
         String additionalTest = "additional_test.yml"
         setupRestResources([wrongApi], [wrongTest]) //setups up resources for current version, which should not be used for this test
-        String sourceSetName = "yamlRestTestV" + compatibleVersion + "Compat"
+        String sourceSetName = "yamlRestCompatTest"
         addRestTestsToProject([additionalTest], sourceSetName)
         //intentionally adding to yamlRestTest source set since the .classes are copied from there
         file("src/yamlRestTest/java/MockIT.java") << "import org.junit.Test;class MockIT { @Test public void doNothing() { }}"
@@ -98,14 +97,14 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         String api = "foo.json"
         String test = "10_basic.yml"
         //add the compatible test and api files, these are the prior version's normal yaml rest tests
-        file("distribution/bwc/maintenance/checkoutDir/rest-api-spec/src/main/resources/rest-api-spec/api/" + api) << ""
-        file("distribution/bwc/maintenance/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/" + test) << ""
+        file("distribution/bwc/staged/checkoutDir/rest-api-spec/src/main/resources/rest-api-spec/api/" + api) << ""
+        file("distribution/bwc/staged/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/" + test) << ""
 
         when:
-        def result = gradleRunner("yamlRestTestV${compatibleVersion}CompatTest").build()
+        def result = gradleRunner("yamlRestCompatTest").build()
 
         then:
-        result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.SKIPPED
+        result.task(":yamlRestCompatTest").outcome == TaskOutcome.SKIPPED
         result.task(':copyRestCompatApiTask').outcome == TaskOutcome.SUCCESS
         result.task(':copyRestCompatTestTask').outcome == TaskOutcome.SUCCESS
         result.task(transformTask).outcome == TaskOutcome.SUCCESS
@@ -132,19 +131,20 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         result.task(':copyYamlTestsTask').outcome == TaskOutcome.NO_SOURCE
 
         when:
-        result = gradleRunner("yamlRestTestV${compatibleVersion}CompatTest").build()
+        result = gradleRunner("yamlRestCompatTest").build()
 
         then:
-        result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.SKIPPED
+        result.task(":yamlRestCompatTest").outcome == TaskOutcome.SKIPPED
         result.task(':copyRestCompatApiTask').outcome == TaskOutcome.UP_TO_DATE
         result.task(':copyRestCompatTestTask').outcome == TaskOutcome.UP_TO_DATE
         result.task(transformTask).outcome == TaskOutcome.UP_TO_DATE
     }
 
-    def "yamlRestTestVxCompatTest is wired into check and checkRestCompat"() {
+    def "yamlRestCompatTest is wired into check and checkRestCompat"() {
         given:
+        internalBuild()
         withVersionCatalogue()
-        subProject(":distribution:bwc:maintenance") << """
+        subProject(":distribution:bwc:staged") << """
         configurations { checkout }
         artifacts {
             checkout(new File(projectDir, "checkoutDir"))
@@ -152,10 +152,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         """
 
         buildFile << """
-        plugins {
-          id 'elasticsearch.legacy-yaml-rest-compat-test'
-        }
-
+        apply plugin: 'elasticsearch.legacy-yaml-rest-compat-test'
         """
 
         when:
@@ -164,7 +161,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         then:
         result.task(':check').outcome == TaskOutcome.UP_TO_DATE
         result.task(':checkRestCompat').outcome == TaskOutcome.UP_TO_DATE
-        result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.NO_SOURCE
+        result.task(":yamlRestCompatTest").outcome == TaskOutcome.NO_SOURCE
         result.task(':copyRestCompatApiTask').outcome == TaskOutcome.NO_SOURCE
         result.task(':copyRestCompatTestTask').outcome == TaskOutcome.NO_SOURCE
         result.task(transformTask).outcome == TaskOutcome.NO_SOURCE
@@ -178,7 +175,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         then:
         result.task(':check').outcome == TaskOutcome.UP_TO_DATE
         result.task(':checkRestCompat').outcome == TaskOutcome.UP_TO_DATE
-        result.task(":yamlRestTestV${compatibleVersion}CompatTest").outcome == TaskOutcome.SKIPPED
+        result.task(":yamlRestCompatTest").outcome == TaskOutcome.SKIPPED
         result.task(':copyRestCompatApiTask').outcome == TaskOutcome.SKIPPED
         result.task(':copyRestCompatTestTask').outcome == TaskOutcome.SKIPPED
         result.task(transformTask).outcome == TaskOutcome.SKIPPED
@@ -188,7 +185,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         given:
         internalBuild()
 
-        subProject(":distribution:bwc:maintenance") << """
+        subProject(":distribution:bwc:staged") << """
         configurations { checkout }
         artifacts {
             checkout(new File(projectDir, "checkoutDir"))
@@ -204,7 +201,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
             dependencies {
                yamlRestTestImplementation "junit:junit:4.12"
             }
-            tasks.named("yamlRestTestV${compatibleVersion}CompatTransform").configure({ task ->
+            tasks.named("yamlRestCompatTestTransform").configure({ task ->
               task.skipTest("test/test/two", "This is a test to skip test two")
               task.replaceValueInMatch("_type", "_doc")
               task.replaceValueInMatch("_source.values", ["z", "x", "y"], "one")
@@ -232,7 +229,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
 
         setupRestResources([], [])
 
-        file("distribution/bwc/maintenance/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/test.yml" ) << """
+        file("distribution/bwc/staged/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/test.yml" ) << """
         "one":
           - do:
               do_.some.key_to_replace:
@@ -279,7 +276,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
           - match: {}
         """.stripIndent()
         when:
-        def result = gradleRunner("yamlRestTestV${compatibleVersion}CompatTest").build()
+        def result = gradleRunner("yamlRestCompatTest").build()
 
         then:
 
@@ -302,22 +299,22 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         ---
         one:
         - do:
-            do_.some.key_that_was_replaced:
-              index: "test"
-              id: 1
-              keyvalue : replacedkeyvalue
             do_.some.key_to_replace_in_two:
               no_change_here: "because it's not in test 'two'"
             warnings:
             - "warning1"
             - "warning2"
             headers:
-              Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-              Accept: "application/vnd.elasticsearch+json;compatible-with=7"
+              Content-Type: "application/vnd.elasticsearch+json;compatible-with=8"
+              Accept: "application/vnd.elasticsearch+json;compatible-with=8"
             allowed_warnings:
             - "added allowed warning"
             allowed_warnings_regex:
             - "added allowed warning regex .* [0-9]"
+            do_.some.key_that_was_replaced:
+              index: "test"
+              id: 1
+              keyvalue : "replacedkeyvalue"
         - match:
             _source.values:
             - "z"
@@ -334,13 +331,14 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         - is_false: "replaced_value"
         - is_true: "value_not_to_replace"
         - is_false: "value_not_to_replace"
-        - length: { key.in_length_that_was_replaced: 1 }
-        - length: { value_to_replace: 99 }
+        - length:
+            key.in_length_that_was_replaced: 1
+        - length:
+            value_to_replace: 99
         - match:
             _source.added:
               name: "jake"
               likes: "cheese"
-
         ---
         two:
         - skip:
@@ -349,17 +347,17 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
             get:
               index: "test2"
               id: 1
-            do_.some.key_that_was_replaced_in_two:
-                changed_here: "because it is in test 'two'"
             headers:
-              Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-              Accept: "application/vnd.elasticsearch+json;compatible-with=7"
+              Content-Type: "application/vnd.elasticsearch+json;compatible-with=8"
+              Accept: "application/vnd.elasticsearch+json;compatible-with=8"
             warnings_regex:
             - "regex warning here .* [a-z]"
             allowed_warnings:
             - "added allowed warning"
             allowed_warnings_regex:
             - "added allowed warning regex .* [0-9]"
+            do_.some.key_that_was_replaced_in_two:
+              changed_here: "because it is in test 'two'"
         - match:
             _source.values:
             - "foo"
@@ -371,12 +369,12 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         - is_false: "replaced_value"
         - is_true: "value_not_to_replace"
         - is_false: "value_not_to_replace"
-        - length: { value_not_to_replace: 1 }
+        - length:
+            value_not_to_replace: 1
         ---
         "use cat with no header":
           - do:
-              cat.indices:
-                {}
+              cat.indices: {}
               allowed_warnings:
                 - "added allowed warning"
               allowed_warnings_regex:
@@ -384,7 +382,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
           - match: {}
         """.stripIndent()).readAll()
 
-        expectedAll.eachWithIndex{ ObjectNode expected, int i ->
+        expectedAll.eachWithIndex { ObjectNode expected, int i ->
             if(expected != actual.get(i)) {
                 println("\nTransformed Test:")
                 SequenceWriter sequenceWriter = WRITER.writeValues(System.out)
diff --git a/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion b/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion
index 98d9bcb75a68..aabe6ec3909c 100644
--- a/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion
+++ b/build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/build-tools-internal/src/main/resources/minimumCompilerVersion
@@ -1 +1 @@
-17
+21
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java
index 41bfddb01e66..7b1bc14fda8a 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java
@@ -7,8 +7,6 @@
  */
 package org.elasticsearch.gradle.internal;
 
-import org.elasticsearch.gradle.Architecture;
-import org.elasticsearch.gradle.ElasticsearchDistribution;
 import org.elasticsearch.gradle.Version;
 import org.elasticsearch.gradle.VersionProperties;
 
@@ -27,7 +25,6 @@
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static java.util.Collections.unmodifiableList;
 
@@ -67,7 +64,6 @@ public class BwcVersions {
     private static final Pattern LINE_PATTERN = Pattern.compile(
         "\\W+public static final Version V_(\\d+)_(\\d+)_(\\d+)(_alpha\\d+|_beta\\d+|_rc\\d+)?.*\\);"
     );
-    private static final Version MINIMUM_WIRE_COMPATIBLE_VERSION = Version.fromString("7.17.0");
     private static final String GLIBC_VERSION_ENV_VAR = "GLIBC_VERSION";
 
     private final Version currentVersion;
@@ -124,9 +120,7 @@ public UnreleasedVersionInfo unreleasedInfo(Version version) {
     }
 
     public void forPreviousUnreleased(Consumer<UnreleasedVersionInfo> consumer) {
-        filterSupportedVersions(
-            getUnreleased().stream().filter(version -> version.equals(currentVersion) == false).collect(Collectors.toList())
-        ).stream().map(unreleased::get).forEach(consumer);
+        getUnreleased().stream().filter(version -> version.equals(currentVersion) == false).map(unreleased::get).forEach(consumer);
     }
 
     private String getBranchFor(Version version) {
@@ -155,6 +149,7 @@ private Map<Version, UnreleasedVersionInfo> computeUnreleased() {
 
         List<Version> unreleasedList = unreleased.stream().sorted(Comparator.reverseOrder()).toList();
         Map<Version, UnreleasedVersionInfo> result = new TreeMap<>();
+        boolean newMinor = false;
         for (int i = 0; i < unreleasedList.size(); i++) {
             Version esVersion = unreleasedList.get(i);
             // This is either a new minor or staged release
@@ -162,11 +157,17 @@ private Map<Version, UnreleasedVersionInfo> computeUnreleased() {
                 result.put(esVersion, new UnreleasedVersionInfo(esVersion, getBranchFor(esVersion), ":distribution"));
             } else if (esVersion.getRevision() == 0) {
                 // If there are two upcoming unreleased minors then this one is the new minor
-                if (unreleasedList.get(i + 1).getRevision() == 0) {
-                    result.put(esVersion, new UnreleasedVersionInfo(esVersion, getBranchFor(esVersion), ":distribution:bwc:minor"));
-                } else {
-                    result.put(esVersion, new UnreleasedVersionInfo(esVersion, getBranchFor(esVersion), ":distribution:bwc:staged"));
-                }
+                if (newMinor == false && unreleasedList.get(i + 1).getRevision() == 0) {
+                    result.put(esVersion, new UnreleasedVersionInfo(esVersion, esVersion.getMajor() + ".x", ":distribution:bwc:minor"));
+                    newMinor = true;
+                } else if (newMinor == false
+                    && unreleasedList.stream().filter(v -> v.getMajor() == esVersion.getMajor() && v.getRevision() == 0).count() == 1) {
+                        // This is the only unreleased new minor which means we've not yet staged it for release
+                        result.put(esVersion, new UnreleasedVersionInfo(esVersion, esVersion.getMajor() + ".x", ":distribution:bwc:minor"));
+                        newMinor = true;
+                    } else {
+                        result.put(esVersion, new UnreleasedVersionInfo(esVersion, getBranchFor(esVersion), ":distribution:bwc:staged"));
+                    }
             } else {
                 // If this is the oldest unreleased version and we have a maintenance release
                 if (i == unreleasedList.size() - 1 && hasMaintenanceRelease) {
@@ -222,20 +223,16 @@ public void compareToAuthoritative(List<Version> authoritativeReleasedVersions)
     }
 
     private List<Version> getReleased() {
-        return versions.stream().filter(v -> unreleased.containsKey(v) == false).toList();
+        return versions.stream()
+            .filter(v -> v.getMajor() >= currentVersion.getMajor() - 1)
+            .filter(v -> unreleased.containsKey(v) == false)
+            .toList();
     }
 
     /**
-     * Return versions of Elasticsearch which are index compatible with the current version, and also work on the local machine.
+     * Return versions of Elasticsearch which are index compatible with the current version.
      */
     public List<Version> getIndexCompatible() {
-        return filterSupportedVersions(getAllIndexCompatible());
-    }
-
-    /**
-     * Return all versions of Elasticsearch which are index compatible with the current version.
-     */
-    public List<Version> getAllIndexCompatible() {
         return versions.stream().filter(v -> v.getMajor() >= (currentVersion.getMajor() - 1)).toList();
     }
 
@@ -248,7 +245,7 @@ public void withIndexCompatible(Predicate<Version> filter, BiConsumer<Version, S
     }
 
     public List<Version> getWireCompatible() {
-        return filterSupportedVersions(versions.stream().filter(v -> v.compareTo(MINIMUM_WIRE_COMPATIBLE_VERSION) >= 0).toList());
+        return versions.stream().filter(v -> v.compareTo(getMinimumWireCompatibleVersion()) >= 0).toList();
     }
 
     public void withWireCompatible(BiConsumer<Version, String> versionAction) {
@@ -259,20 +256,6 @@ public void withWireCompatible(Predicate<Version> filter, BiConsumer<Version, St
         getWireCompatible().stream().filter(filter).forEach(v -> versionAction.accept(v, "v" + v.toString()));
     }
 
-    private List<Version> filterSupportedVersions(List<Version> wireCompat) {
-        Predicate<Version> supported = v -> true;
-        if (Architecture.current() == Architecture.AARCH64) {
-            final String version;
-            if (ElasticsearchDistribution.CURRENT_PLATFORM.equals(ElasticsearchDistribution.Platform.DARWIN)) {
-                version = "7.16.0";
-            } else {
-                version = "7.12.0"; // linux shipped earlier for aarch64
-            }
-            supported = v -> v.onOrAfter(version);
-        }
-        return wireCompat.stream().filter(supported).collect(Collectors.toList());
-    }
-
     public List<Version> getUnreleasedIndexCompatible() {
         List<Version> unreleasedIndexCompatible = new ArrayList<>(getIndexCompatible());
         unreleasedIndexCompatible.retainAll(getUnreleased());
@@ -286,7 +269,17 @@ public List<Version> getUnreleasedWireCompatible() {
     }
 
     public Version getMinimumWireCompatibleVersion() {
-        return MINIMUM_WIRE_COMPATIBLE_VERSION;
+        // Determine minimum wire compatible version from list of known versions.
+        // Current BWC policy states the minimum wire compatible version is the last minor release or the previous major version.
+        return versions.stream()
+            .filter(v -> v.getRevision() == 0)
+            .filter(v -> v.getMajor() == currentVersion.getMajor() - 1)
+            .max(Comparator.naturalOrder())
+            .orElseThrow(() -> new IllegalStateException("Unable to determine minimum wire compatible version."));
+    }
+
+    public Version getCurrentVersion() {
+        return currentVersion;
     }
 
     public record UnreleasedVersionInfo(Version version, String branch, String gradleProjectPath) {}
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
index 97172ec51e5b..3af59f00299b 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
@@ -12,27 +12,40 @@
  * This class models the different Docker base images that are used to build Docker distributions of Elasticsearch.
  */
 public enum DockerBase {
-    DEFAULT("ubuntu:20.04", ""),
+    DEFAULT("ubuntu:20.04", "", "apt-get"),
 
     // "latest" here is intentional, since the image name specifies "8"
-    UBI("docker.elastic.co/ubi8/ubi-minimal:latest", "-ubi8"),
+    UBI("docker.elastic.co/ubi8/ubi-minimal:latest", "-ubi8", "microdnf"),
 
     // The Iron Bank base image is UBI (albeit hardened), but we are required to parameterize the Docker build
-    IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank"),
+    IRON_BANK("${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}", "-ironbank", "yum"),
 
     // Base image with extras for Cloud
-    CLOUD("ubuntu:20.04", "-cloud"),
+    CLOUD("ubuntu:20.04", "-cloud", "apt-get"),
 
     // Based on CLOUD above, with more extras. We don't set a base image because
     // we programmatically extend from the Cloud image.
-    CLOUD_ESS(null, "-cloud-ess");
+    CLOUD_ESS(null, "-cloud-ess", "apt-get"),
+
+    // Chainguard based wolfi image with latest jdk
+    WOLFI(
+        "docker.elastic.co/wolfi/chainguard-base:latest@sha256:c16d3ad6cebf387e8dd2ad769f54320c4819fbbaa21e729fad087c7ae223b4d0",
+        "-wolfi",
+        "apk"
+    );
 
     private final String image;
     private final String suffix;
+    private final String packageManager;
 
     DockerBase(String image, String suffix) {
+        this(image, suffix, "apt-get");
+    }
+
+    DockerBase(String image, String suffix, String packageManager) {
         this.image = image;
         this.suffix = suffix;
+        this.packageManager = packageManager;
     }
 
     public String getImage() {
@@ -42,4 +55,8 @@ public String getImage() {
     public String getSuffix() {
         return suffix;
     }
+
+    public String getPackageManager() {
+        return packageManager;
+    }
 }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java
index f92789f70104..eeb4306ce6fb 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java
@@ -177,6 +177,9 @@ private static String distributionProjectName(ElasticsearchDistribution distribu
         if (distribution.getType() == InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS) {
             return projectName + "cloud-ess-docker" + archString + "-export";
         }
+        if (distribution.getType() == InternalElasticsearchDistributionTypes.DOCKER_WOLFI) {
+            return projectName + "wolfi-docker" + archString + "-export";
+        }
         return projectName + distribution.getType().getName();
     }
 
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/DockerWolfiElasticsearchDistributionType.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/DockerWolfiElasticsearchDistributionType.java
new file mode 100644
index 000000000000..d055337436a8
--- /dev/null
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/DockerWolfiElasticsearchDistributionType.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.gradle.internal.distribution;
+
+import org.elasticsearch.gradle.ElasticsearchDistributionType;
+
+public class DockerWolfiElasticsearchDistributionType implements ElasticsearchDistributionType {
+
+    DockerWolfiElasticsearchDistributionType() {}
+
+    @Override
+    public String getName() {
+        return "dockerWolfi";
+    }
+
+    @Override
+    public boolean isDocker() {
+        return true;
+    }
+}
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java
index 0b6ef212a63d..5f8ef58e44a6 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java
@@ -20,6 +20,7 @@ public class InternalElasticsearchDistributionTypes {
     public static ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
     public static ElasticsearchDistributionType DOCKER_CLOUD = new DockerCloudElasticsearchDistributionType();
     public static ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
+    public static ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
 
     public static List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
         DEB,
@@ -28,6 +29,7 @@ public class InternalElasticsearchDistributionTypes {
         DOCKER_UBI,
         DOCKER_IRONBANK,
         DOCKER_CLOUD,
-        DOCKER_CLOUD_ESS
+        DOCKER_CLOUD_ESS,
+        DOCKER_WOLFI
     );
 }
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java
index 42d3a770dbbc..5b1044bbb29a 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java
@@ -52,6 +52,7 @@
 import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS;
 import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_IRONBANK;
 import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_UBI;
+import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_WOLFI;
 import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.RPM;
 
 /**
@@ -93,6 +94,7 @@ public void apply(Project project) {
 
         for (ElasticsearchDistribution distribution : testDistributions) {
             String taskname = destructiveDistroTestTaskName(distribution);
+            ElasticsearchDistributionType type = distribution.getType();
             TaskProvider<Test> destructiveTask = configureTestTask(project, taskname, distribution, t -> {
                 t.onlyIf(
                     "Docker is not available",
@@ -106,12 +108,13 @@ public void apply(Project project) {
             if (distribution.getPlatform() == Platform.WINDOWS) {
                 windowsTestTasks.add(destructiveTask);
             } else {
-                linuxTestTasks.computeIfAbsent(distribution.getType(), k -> new ArrayList<>()).add(destructiveTask);
+                linuxTestTasks.computeIfAbsent(type, k -> new ArrayList<>()).add(destructiveTask);
             }
             destructiveDistroTest.configure(t -> t.dependsOn(destructiveTask));
-            lifecycleTasks.get(distribution.getType()).configure(t -> t.dependsOn(destructiveTask));
+            TaskProvider<?> lifecycleTask = lifecycleTasks.get(type);
+            lifecycleTask.configure(t -> t.dependsOn(destructiveTask));
 
-            if ((distribution.getType() == DEB || distribution.getType() == RPM) && distribution.getBundledJdk()) {
+            if ((type == DEB || type == RPM) && distribution.getBundledJdk()) {
                 for (Version version : BuildParams.getBwcVersions().getIndexCompatible()) {
                     final ElasticsearchDistribution bwcDistro;
                     if (version.equals(Version.fromString(distribution.getVersion()))) {
@@ -121,7 +124,7 @@ public void apply(Project project) {
                         bwcDistro = createDistro(
                             allDistributions,
                             distribution.getArchitecture(),
-                            distribution.getType(),
+                            type,
                             distribution.getPlatform(),
                             distribution.getBundledJdk(),
                             version.toString()
@@ -147,6 +150,7 @@ private static Map<ElasticsearchDistributionType, TaskProvider<?>> lifecycleTask
         lifecyleTasks.put(DOCKER_IRONBANK, project.getTasks().register(taskPrefix + ".docker-ironbank"));
         lifecyleTasks.put(DOCKER_CLOUD, project.getTasks().register(taskPrefix + ".docker-cloud"));
         lifecyleTasks.put(DOCKER_CLOUD_ESS, project.getTasks().register(taskPrefix + ".docker-cloud-ess"));
+        lifecyleTasks.put(DOCKER_WOLFI, project.getTasks().register(taskPrefix + ".docker-wolfi"));
         lifecyleTasks.put(ARCHIVE, project.getTasks().register(taskPrefix + ".archives"));
         lifecyleTasks.put(DEB, project.getTasks().register(taskPrefix + ".packages"));
         lifecyleTasks.put(RPM, lifecyleTasks.get(DEB));
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java
index 77af3445f530..a170606800f3 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java
@@ -78,6 +78,7 @@ public class RestTestBasePlugin implements Plugin<Project> {
     private static final String FEATURES_METADATA_CONFIGURATION = "featuresMetadataDeps";
     private static final String DEFAULT_DISTRO_FEATURES_METADATA_CONFIGURATION = "defaultDistrofeaturesMetadataDeps";
     private static final String TESTS_FEATURES_METADATA_PATH = "tests.features.metadata.path";
+    private static final String MINIMUM_WIRE_COMPATIBLE_VERSION_SYSPROP = "tests.minimum.wire.compatible";
 
     private final ProviderFactory providerFactory;
 
@@ -173,6 +174,9 @@ public void apply(Project project) {
             task.systemProperty("tests.security.manager", "false");
             task.systemProperty("tests.system_call_filter", "false");
 
+            // Pass minimum wire compatible version which is used by upgrade tests
+            task.systemProperty(MINIMUM_WIRE_COMPATIBLE_VERSION_SYSPROP, BuildParams.getBwcVersions().getMinimumWireCompatibleVersion());
+
             // Register plugins and modules as task inputs and pass paths as system properties to tests
             var modulePath = project.getObjects().fileCollection().from(modulesConfiguration);
             nonInputSystemProperties.systemProperty(TESTS_CLUSTER_MODULES_PATH_SYSPROP, modulePath::getAsPath);
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java
index e0581ebf6708..fd1446b5ff21 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java
@@ -9,8 +9,8 @@
 package org.elasticsearch.gradle.internal.test.rest.compat.compat;
 
 import org.elasticsearch.gradle.Version;
-import org.elasticsearch.gradle.VersionProperties;
 import org.elasticsearch.gradle.internal.ElasticsearchJavaBasePlugin;
+import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.elasticsearch.gradle.internal.test.rest.CopyRestApiTask;
 import org.elasticsearch.gradle.internal.test.rest.CopyRestTestsTask;
 import org.elasticsearch.gradle.internal.test.rest.LegacyYamlRestTestPlugin;
@@ -40,6 +40,7 @@
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -60,8 +61,7 @@ public abstract class AbstractYamlRestCompatTestPlugin implements Plugin<Project
     private static final Path RELATIVE_REST_CORE = Path.of("rest-api-spec");
     private static final Path RELATIVE_REST_XPACK = Path.of("x-pack/plugin");
     private static final Path RELATIVE_REST_PROJECT_RESOURCES = Path.of("src/yamlRestTest/resources");
-    private static final int COMPATIBLE_VERSION = Version.fromString(VersionProperties.getVersions().get("elasticsearch")).getMajor() - 1;
-    private static final String SOURCE_SET_NAME = "yamlRestTestV" + COMPATIBLE_VERSION + "Compat";
+    private static final String SOURCE_SET_NAME = "yamlRestCompatTest";
     private ProjectLayout projectLayout;
     private FileOperations fileOperations;
 
@@ -74,7 +74,7 @@ public AbstractYamlRestCompatTestPlugin(ProjectLayout projectLayout, FileOperati
     @Override
     public void apply(Project project) {
 
-        final Path compatRestResourcesDir = Path.of("restResources").resolve("v" + COMPATIBLE_VERSION);
+        final Path compatRestResourcesDir = Path.of("restResources").resolve("compat");
         final Path compatSpecsDir = compatRestResourcesDir.resolve("yamlSpecs");
         final Path compatTestsDir = compatRestResourcesDir.resolve("yamlTests");
         project.getPluginManager().apply(getBasePlugin());
@@ -89,10 +89,19 @@ public void apply(Project project) {
         SourceSet yamlTestSourceSet = sourceSets.getByName(YamlRestTestPlugin.YAML_REST_TEST);
         GradleUtils.extendSourceSet(project, YamlRestTestPlugin.YAML_REST_TEST, SOURCE_SET_NAME);
 
+        // determine the previous rest compatibility version and BWC project path
+        int currentMajor = BuildParams.getBwcVersions().getCurrentVersion().getMajor();
+        Version lastMinor = BuildParams.getBwcVersions()
+            .getUnreleased()
+            .stream()
+            .filter(v -> v.getMajor() == currentMajor - 1)
+            .min(Comparator.reverseOrder())
+            .get();
+        String lastMinorProjectPath = BuildParams.getBwcVersions().unreleasedInfo(lastMinor).gradleProjectPath();
+
         // copy compatible rest specs
         Configuration bwcMinorConfig = project.getConfigurations().create(BWC_MINOR_CONFIG_NAME);
-        Dependency bwcMinor = project.getDependencies()
-            .project(Map.of("path", ":distribution:bwc:maintenance", "configuration", "checkout"));
+        Dependency bwcMinor = project.getDependencies().project(Map.of("path", lastMinorProjectPath, "configuration", "checkout"));
         project.getDependencies().add(bwcMinorConfig.getName(), bwcMinor);
 
         String projectPath = project.getPath();
@@ -183,7 +192,7 @@ public void apply(Project project) {
 
         // transform the copied tests task
         TaskProvider<RestCompatTestTransformTask> transformCompatTestTask = project.getTasks()
-            .register("yamlRestTestV" + COMPATIBLE_VERSION + "CompatTransform", RestCompatTestTransformTask.class, task -> {
+            .register("yamlRestCompatTestTransform", RestCompatTestTransformTask.class, task -> {
                 task.getSourceDirectory().set(copyCompatYamlTestTask.flatMap(CopyRestTestsTask::getOutputResourceDir));
                 task.getOutputDirectory()
                     .set(project.getLayout().getBuildDirectory().dir(compatTestsDir.resolve("transformed").toString()));
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/LegacyYamlRestCompatTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/LegacyYamlRestCompatTestPlugin.java
index e84c84cc426a..0bff8d65586d 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/LegacyYamlRestCompatTestPlugin.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/LegacyYamlRestCompatTestPlugin.java
@@ -34,7 +34,7 @@ public LegacyYamlRestCompatTestPlugin(ProjectLayout projectLayout, FileOperation
 
     @Override
     public TaskProvider<? extends Test> registerTestTask(Project project, SourceSet sourceSet) {
-        return RestTestUtil.registerTestTask(project, sourceSet, sourceSet.getTaskName(null, "test"));
+        return RestTestUtil.registerTestTask(project, sourceSet, sourceSet.getName());
     }
 
     @Override
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/YamlRestCompatTestPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/YamlRestCompatTestPlugin.java
index 79588ca722ff..b376284761ff 100644
--- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/YamlRestCompatTestPlugin.java
+++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/YamlRestCompatTestPlugin.java
@@ -32,7 +32,7 @@ public YamlRestCompatTestPlugin(ProjectLayout projectLayout, FileOperations file
 
     @Override
     public TaskProvider<? extends Test> registerTestTask(Project project, SourceSet sourceSet) {
-        return RestTestUtil.registerTestTask(project, sourceSet, sourceSet.getTaskName(null, "test"), StandaloneRestIntegTestTask.class);
+        return RestTestUtil.registerTestTask(project, sourceSet, sourceSet.getName(), StandaloneRestIntegTestTask.class);
     }
 
     @Override
diff --git a/build-tools-internal/src/main/resources/minimumCompilerVersion b/build-tools-internal/src/main/resources/minimumCompilerVersion
index 98d9bcb75a68..aabe6ec3909c 100644
--- a/build-tools-internal/src/main/resources/minimumCompilerVersion
+++ b/build-tools-internal/src/main/resources/minimumCompilerVersion
@@ -1 +1 @@
-17
+21
diff --git a/build-tools-internal/src/main/resources/minimumRuntimeVersion b/build-tools-internal/src/main/resources/minimumRuntimeVersion
index 98d9bcb75a68..aabe6ec3909c 100644
--- a/build-tools-internal/src/main/resources/minimumRuntimeVersion
+++ b/build-tools-internal/src/main/resources/minimumRuntimeVersion
@@ -1 +1 @@
-17
+21
diff --git a/build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/BwcVersionsSpec.groovy b/build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/BwcVersionsSpec.groovy
index 39a9af38e6a9..8fa1ac9ea209 100644
--- a/build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/BwcVersionsSpec.groovy
+++ b/build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/BwcVersionsSpec.groovy
@@ -10,12 +10,9 @@ package org.elasticsearch.gradle.internal
 
 import spock.lang.Specification
 
-import org.elasticsearch.gradle.Architecture
-import org.elasticsearch.gradle.ElasticsearchDistribution
 import org.elasticsearch.gradle.Version
 import org.elasticsearch.gradle.internal.BwcVersions.UnreleasedVersionInfo
 
-
 class BwcVersionsSpec extends Specification {
     List<String> versionLines = []
 
@@ -42,11 +39,12 @@ class BwcVersionsSpec extends Specification {
         unreleased == [
             (v('7.16.2')): new UnreleasedVersionInfo(v('7.16.2'), '7.16', ':distribution:bwc:bugfix'),
             (v('7.17.0')): new UnreleasedVersionInfo(v('7.17.0'), '7.17', ':distribution:bwc:staged'),
-            (v('8.0.0')): new UnreleasedVersionInfo(v('8.0.0'), '8.0', ':distribution:bwc:minor'),
+            (v('8.0.0')): new UnreleasedVersionInfo(v('8.0.0'), '8.x', ':distribution:bwc:minor'),
             (v('8.1.0')): new UnreleasedVersionInfo(v('8.1.0'), 'main', ':distribution')
         ]
         bwc.wireCompatible == [v('7.17.0'), v('8.0.0'), v('8.1.0')]
-        bwc.indexCompatible == osFiltered([v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.16.2'), v('7.17.0'), v('8.0.0'), v('8.1.0')])
+        bwc.indexCompatible == [v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.16.2'), v('7.17.0'), v('8.0.0'), v('8.1.0')]
+        bwc.minimumWireCompatibleVersion == v('7.17.0')
     }
 
     def "current version is next minor with next major and last minor both staged"() {
@@ -71,11 +69,11 @@ class BwcVersionsSpec extends Specification {
         unreleased == [
             (v('7.16.1')): new UnreleasedVersionInfo(v('7.16.1'), '7.16', ':distribution:bwc:bugfix'),
             (v('7.17.0')): new UnreleasedVersionInfo(v('7.17.0'), '7.17', ':distribution:bwc:staged'),
-            (v('8.0.0')): new UnreleasedVersionInfo(v('8.0.0'), '8.0', ':distribution:bwc:minor'),
+            (v('8.0.0')): new UnreleasedVersionInfo(v('8.0.0'), '8.x', ':distribution:bwc:minor'),
             (v('8.1.0')): new UnreleasedVersionInfo(v('8.1.0'), 'main', ':distribution')
         ]
         bwc.wireCompatible == [v('7.17.0'), v('8.0.0'), v('8.1.0')]
-        bwc.indexCompatible == osFiltered([v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('8.0.0'), v('8.1.0')])
+        bwc.indexCompatible == [v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('8.0.0'), v('8.1.0')]
     }
 
     def "current is next minor with upcoming minor staged"() {
@@ -104,7 +102,7 @@ class BwcVersionsSpec extends Specification {
             (v('8.1.0')): new UnreleasedVersionInfo(v('8.1.0'), 'main', ':distribution')
         ]
         bwc.wireCompatible == [v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.1.0')]
-        bwc.indexCompatible == osFiltered([v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.1.0')])
+        bwc.indexCompatible == [v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.1.0')]
     }
 
     def "current version is staged major"() {
@@ -131,7 +129,61 @@ class BwcVersionsSpec extends Specification {
             (v('8.0.0')): new UnreleasedVersionInfo(v('8.0.0'), 'main', ':distribution'),
         ]
         bwc.wireCompatible == [v('7.17.0'), v('7.17.1'), v('8.0.0')]
-        bwc.indexCompatible == osFiltered([v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('7.17.1'), v('8.0.0')])
+        bwc.indexCompatible == [v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('7.17.1'), v('8.0.0')]
+    }
+
+    def "current version is major with unreleased next minor"() {
+        given:
+        addVersion('7.14.0', '8.9.0')
+        addVersion('7.14.1', '8.9.0')
+        addVersion('7.14.2', '8.9.0')
+        addVersion('7.15.0', '8.9.0')
+        addVersion('7.15.1', '8.9.0')
+        addVersion('7.15.2', '8.9.0')
+        addVersion('7.16.0', '8.10.0')
+        addVersion('7.16.1', '8.10.0')
+        addVersion('7.17.0', '8.10.0')
+        addVersion('8.0.0', '9.0.0')
+
+        when:
+        def bwc = new BwcVersions(versionLines, v('8.0.0'))
+        def unreleased = bwc.unreleased.collectEntries { [it, bwc.unreleasedInfo(it)] }
+
+        then:
+        unreleased == [
+            (v('7.16.1')): new UnreleasedVersionInfo(v('7.16.1'), '7.16', ':distribution:bwc:bugfix'),
+            (v('7.17.0')): new UnreleasedVersionInfo(v('7.17.0'), '7.x', ':distribution:bwc:minor'),
+            (v('8.0.0')): new UnreleasedVersionInfo(v('8.0.0'), 'main', ':distribution'),
+        ]
+        bwc.wireCompatible == [v('7.17.0'), v('8.0.0')]
+        bwc.indexCompatible == [v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('8.0.0')]
+    }
+
+    def "current version is major with staged next minor"() {
+        given:
+        addVersion('7.14.0', '8.9.0')
+        addVersion('7.14.1', '8.9.0')
+        addVersion('7.14.2', '8.9.0')
+        addVersion('7.15.0', '8.9.0')
+        addVersion('7.15.1', '8.9.0')
+        addVersion('7.15.2', '8.9.0')
+        addVersion('7.16.0', '8.10.0')
+        addVersion('7.17.0', '8.10.0')
+        addVersion('8.0.0', '9.0.0')
+
+        when:
+        def bwc = new BwcVersions(versionLines, v('8.0.0'))
+        def unreleased = bwc.unreleased.collectEntries { [it, bwc.unreleasedInfo(it)] }
+
+        then:
+        unreleased == [
+            (v('7.15.2')): new UnreleasedVersionInfo(v('7.15.2'), '7.15', ':distribution:bwc:bugfix'),
+            (v('7.16.0')): new UnreleasedVersionInfo(v('7.16.0'), '7.16', ':distribution:bwc:staged'),
+            (v('7.17.0')): new UnreleasedVersionInfo(v('7.17.0'), '7.x', ':distribution:bwc:minor'),
+            (v('8.0.0')): new UnreleasedVersionInfo(v('8.0.0'), 'main', ':distribution'),
+        ]
+        bwc.wireCompatible == [v('7.17.0'), v('8.0.0')]
+        bwc.indexCompatible == [v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.17.0'), v('8.0.0')]
     }
 
     def "current version is next bugfix"() {
@@ -159,7 +211,7 @@ class BwcVersionsSpec extends Specification {
             (v('8.0.1')): new UnreleasedVersionInfo(v('8.0.1'), 'main', ':distribution'),
         ]
         bwc.wireCompatible == [v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.0.1')]
-        bwc.indexCompatible == osFiltered([v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.0.1')])
+        bwc.indexCompatible == [v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.0.1')]
     }
 
     def "current version is next minor with no staged releases"() {
@@ -189,7 +241,7 @@ class BwcVersionsSpec extends Specification {
             (v('8.1.0')): new UnreleasedVersionInfo(v('8.1.0'), 'main', ':distribution')
         ]
         bwc.wireCompatible == [v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.0.1'), v('8.1.0')]
-        bwc.indexCompatible == osFiltered([v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.0.1'), v('8.1.0')])
+        bwc.indexCompatible == [v('7.14.0'), v('7.14.1'), v('7.14.2'), v('7.15.0'), v('7.15.1'), v('7.15.2'), v('7.16.0'), v('7.16.1'), v('7.17.0'), v('7.17.1'), v('8.0.0'), v('8.0.1'), v('8.1.0')]
     }
 
     private void addVersion(String elasticsearch, String lucene) {
@@ -202,12 +254,4 @@ class BwcVersionsSpec extends Specification {
         return Version.fromString(version)
     }
 
-    private boolean osxAarch64() {
-        Architecture.current() == Architecture.AARCH64 &&
-            ElasticsearchDistribution.CURRENT_PLATFORM.equals(ElasticsearchDistribution.Platform.DARWIN)
-    }
-
-    private List<Version> osFiltered(ArrayList<Version> versions) {
-        return osxAarch64() ? versions.findAll {it.onOrAfter("7.16.0")} : versions
-    }
 }
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
index 1dd9fb95bd17..edb97a2968bc 100644
--- a/build-tools-internal/version.properties
+++ b/build-tools-internal/version.properties
@@ -1,4 +1,4 @@
-elasticsearch     = 8.16.0
+elasticsearch     = 9.0.0
 lucene            = 9.11.1
 
 bundled_jdk_vendor = openjdk
diff --git a/build.gradle b/build.gradle
index 01fdace570ce..8430ac335d44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,7 +135,7 @@ tasks.register("updateCIBwcVersions") {
   }
 
   doLast {
-    writeVersions(file(".ci/bwcVersions"), filterIntermediatePatches(BuildParams.bwcVersions.allIndexCompatible))
+    writeVersions(file(".ci/bwcVersions"), filterIntermediatePatches(BuildParams.bwcVersions.indexCompatible))
     writeVersions(file(".ci/snapshotBwcVersions"), filterIntermediatePatches(BuildParams.bwcVersions.unreleasedIndexCompatible))
     expandBwcList(
       ".buildkite/pipelines/intake.yml",
@@ -149,7 +149,7 @@ tasks.register("updateCIBwcVersions") {
         new ListExpansion(versions: filterIntermediatePatches(BuildParams.bwcVersions.unreleasedIndexCompatible), variable: "BWC_LIST"),
       ],
       [
-        new StepExpansion(templatePath: ".buildkite/pipelines/periodic.bwc.template.yml", versions: filterIntermediatePatches(BuildParams.bwcVersions.allIndexCompatible), variable: "BWC_STEPS"),
+        new StepExpansion(templatePath: ".buildkite/pipelines/periodic.bwc.template.yml", versions: filterIntermediatePatches(BuildParams.bwcVersions.indexCompatible), variable: "BWC_STEPS"),
       ]
     )
 
@@ -157,7 +157,7 @@ tasks.register("updateCIBwcVersions") {
       ".buildkite/pipelines/periodic-packaging.yml",
       ".buildkite/pipelines/periodic-packaging.template.yml",
       ".buildkite/pipelines/periodic-packaging.bwc.template.yml",
-      filterIntermediatePatches(BuildParams.bwcVersions.allIndexCompatible)
+      filterIntermediatePatches(BuildParams.bwcVersions.indexCompatible)
     )
   }
 }
@@ -186,7 +186,7 @@ tasks.register("verifyVersions") {
           .collect { Version.fromString(it) }
       )
     }
-    verifyCiYaml(file(".ci/bwcVersions"), filterIntermediatePatches(BuildParams.bwcVersions.allIndexCompatible))
+    verifyCiYaml(file(".ci/bwcVersions"), filterIntermediatePatches(BuildParams.bwcVersions.indexCompatible))
     verifyCiYaml(file(".ci/snapshotBwcVersions"), BuildParams.bwcVersions.unreleasedIndexCompatible)
 
     // Make sure backport bot config file is up to date
diff --git a/distribution/docker/README.md b/distribution/docker/README.md
index 4c8052cfc26b..eb0e7b296097 100644
--- a/distribution/docker/README.md
+++ b/distribution/docker/README.md
@@ -6,11 +6,13 @@ the [DockerBase] enum.
    * Default - this is what most people use, and is based on Ubuntu
    * UBI - the same as the default image, but based upon [RedHat's UBI
      images][ubi], specifically their minimal flavour.
+   * Wolfi - the same as the default image, but based upon [Wolfi](https://github.com/wolfi-dev)
    * Iron Bank - this is the US Department of Defence's repository of digitally
      signed, binary container images including both Free and Open-Source
      software (FOSS) and Commercial off-the-shelf (COTS). In practice, this is
      another UBI build, this time on the regular UBI image, with extra
      hardening. See below for more details.
+
    * Cloud - this is mostly the same as the default image, with some notable differences:
       * `filebeat` and `metricbeat` are included
       * `wget` is included
diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle
index 85e66ccba34b..30974ed2396a 100644
--- a/distribution/docker/build.gradle
+++ b/distribution/docker/build.gradle
@@ -21,8 +21,6 @@ apply plugin: 'elasticsearch.dra-artifacts'
 String buildId = providers.systemProperty('build.id').getOrNull()
 boolean useLocalArtifacts = buildId != null && buildId.isBlank() == false && useDra == false
 
-
-
 repositories {
   // Define a repository that allows Gradle to fetch a resource from GitHub. This
   // is only used to fetch the `tini` binary, when building the Iron Bank docker image
@@ -131,7 +129,7 @@ ext.expansions = { Architecture architecture, DockerBase base ->
     'config_dir'         : base == DockerBase.IRON_BANK ? 'scripts' : 'config',
     'git_revision'       : BuildParams.gitRevision,
     'license'            : base == DockerBase.IRON_BANK ? 'Elastic License 2.0' : 'Elastic-License-2.0',
-    'package_manager'    : base == DockerBase.IRON_BANK ? 'yum' : (base == DockerBase.UBI ? 'microdnf' : 'apt-get'),
+    'package_manager'    : base.packageManager,
     'docker_base'        : base.name().toLowerCase(),
     'version'            : VersionProperties.elasticsearch,
     'major_minor_version': "${major}.${minor}",
@@ -182,21 +180,12 @@ ext.dockerBuildContext = { Architecture architecture, DockerBase base ->
         from projectDir.resolve("src/docker/config")
       }
     }
-
     from(projectDir.resolve("src/docker/Dockerfile")) {
       expand(varExpansions)
       filter SquashNewlinesFilter
     }
   }
 }
-//
-//def createAndSetWritable(Object... locations) {
-//  locations.each { location ->
-//    File file = file(location)
-//    file.mkdirs()
-//    file.setWritable(true, false)
-//  }
-//}
 
 tasks.register("copyNodeKeyMaterial", Sync) {
   def certsDir = file("build/certs")
@@ -526,6 +515,8 @@ subprojects { Project subProject ->
       base = DockerBase.CLOUD_ESS
     } else if (subProject.name.contains('cloud-')) {
       base = DockerBase.CLOUD
+    } else if (subProject.name.contains('wolfi-')) {
+      base = DockerBase.WOLFI
     }
 
     final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
@@ -533,7 +524,8 @@ subprojects { Project subProject ->
       (base == DockerBase.IRON_BANK ? 'ironbank.tar' :
         (base == DockerBase.CLOUD ? 'cloud.tar' :
           (base == DockerBase.CLOUD_ESS ? 'cloud-ess.tar' :
-            'docker.tar')))
+            (base == DockerBase.WOLFI ? 'wolfi.tar' :
+              'docker.tar'))))
     final String artifactName = "elasticsearch${arch}${base.suffix}_test"
 
     final String exportTaskName = taskName("export", architecture, base, 'DockerImage')
diff --git a/distribution/docker/src/docker/Dockerfile b/distribution/docker/src/docker/Dockerfile
index 2a2a77a6df82..47f79749cbef 100644
--- a/distribution/docker/src/docker/Dockerfile
+++ b/distribution/docker/src/docker/Dockerfile
@@ -43,29 +43,34 @@ RUN chmod 0555 /bin/tini
 # Install required packages to extract the Elasticsearch distribution
 <% if (docker_base == 'default' || docker_base == 'cloud') { %>
 RUN <%= retry.loop(package_manager, "${package_manager} update && DEBIAN_FRONTEND=noninteractive ${package_manager} install -y curl ") %>
+<% } else if (docker_base == "wolfi") { %>
+RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
 <% } else { %>
 RUN <%= retry.loop(package_manager, "${package_manager} install -y findutils tar gzip") %>
 <% } %>
 
-# `tini` is a tiny but valid init for containers. This is used to cleanly
-# control how ES and any child processes are shut down.
-#
-# The tini GitHub page gives instructions for verifying the binary using
-# gpg, but the keyservers are slow to return the key and this can fail the
-# build. Instead, we check the binary against the published checksum.
-RUN set -eux ; \\
-    tini_bin="" ; \\
-    case "\$(arch)" in \\
-        aarch64) tini_bin='tini-arm64' ;; \\
-        x86_64)  tini_bin='tini-amd64' ;; \\
-        *) echo >&2 ; echo >&2 "Unsupported architecture \$(arch)" ; echo >&2 ; exit 1 ;; \\
-    esac ; \\
-    curl --retry 10 -S -L -O https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin} ; \\
-    curl --retry 10 -S -L -O https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin}.sha256sum ; \\
-    sha256sum -c \${tini_bin}.sha256sum ; \\
-    rm \${tini_bin}.sha256sum ; \\
-    mv \${tini_bin} /bin/tini ; \\
-    chmod 0555 /bin/tini
+<% if (docker_base != 'wolfi') { %>
+    # `tini` is a tiny but valid init for containers. This is used to cleanly
+    # control how ES and any child processes are shut down.
+    # For wolfi we pick it from the blessed wolfi package registry.
+    #
+    # The tini GitHub page gives instructions for verifying the binary using
+    # gpg, but the keyservers are slow to return the key and this can fail the
+    # build. Instead, we check the binary against the published checksum.
+    RUN set -eux ; \\
+        tini_bin="" ; \\
+        case "\$(arch)" in \\
+            aarch64) tini_bin='tini-arm64' ;; \\
+            x86_64)  tini_bin='tini-amd64' ;; \\
+            *) echo >&2 ; echo >&2 "Unsupported architecture \$(arch)" ; echo >&2 ; exit 1 ;; \\
+        esac ; \\
+        curl --retry 10 -S -L -O https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin} ; \\
+        curl --retry 10 -S -L -O https://github.com/krallin/tini/releases/download/v0.19.0/\${tini_bin}.sha256sum ; \\
+        sha256sum -c \${tini_bin}.sha256sum ; \\
+        rm \${tini_bin}.sha256sum ; \\
+        mv \${tini_bin} /bin/tini ; \\
+        chmod 0555 /bin/tini
+<% } %>
 
 <% } %>
 
@@ -152,6 +157,15 @@ RUN ${package_manager} update --setopt=tsflags=nodocs -y && \\
       nc shadow-utils zip findutils unzip procps-ng && \\
     ${package_manager} clean all
 
+<% } else if (docker_base == "wolfi") { %>
+RUN <%= retry.loop(package_manager,
+          "export DEBIAN_FRONTEND=noninteractive && \n" +
+          "      ${package_manager} update && \n" +
+          "      ${package_manager} upgrade && \n" +
+          "      ${package_manager} add --no-cache \n" +
+          "        bash ca-certificates curl libsystemd netcat-openbsd p11-kit p11-kit-trust shadow tini unzip zip zstd && \n" +
+          "      rm -rf /var/cache/apk/* "
+     ) %>
 <% } else if (docker_base == "default" || docker_base == "cloud") { %>
 
 # Change default shell to bash, then install required packages with retries.
@@ -185,6 +199,11 @@ RUN groupadd -g 1000 elasticsearch && \\
     adduser --uid 1000 --gid 1000 --home /usr/share/elasticsearch elasticsearch && \\
     adduser elasticsearch root && \\
     chown -R 0:0 /usr/share/elasticsearch
+<% } else if (docker_base == "wolfi") { %>
+RUN groupadd -g 1000 elasticsearch && \
+    adduser -G elasticsearch -u 1000 elasticsearch -D --home /usr/share/elasticsearch elasticsearch && \
+    adduser elasticsearch root && \
+    chown -R 0:0 /usr/share/elasticsearch
 <% } else { %>
 RUN groupadd -g 1000 elasticsearch && \\
     adduser -u 1000 -g 1000 -G 0 -d /usr/share/elasticsearch elasticsearch && \\
@@ -196,7 +215,9 @@ ENV ELASTIC_CONTAINER true
 WORKDIR /usr/share/elasticsearch
 
 COPY --from=builder --chown=0:0 /usr/share/elasticsearch /usr/share/elasticsearch
+<% if (docker_base != "wolfi") { %>
 COPY --from=builder --chown=0:0 /bin/tini /bin/tini
+<% } %>
 
 <% if (docker_base == 'cloud') { %>
 COPY --from=builder --chown=0:0 /opt /opt
@@ -280,7 +301,12 @@ CMD ["/app/elasticsearch.sh"]
 RUN mkdir /app && \\
     echo -e '#!/bin/bash\\nexec /usr/local/bin/docker-entrypoint.sh eswrapper' > /app/elasticsearch.sh && \\
     chmod 0555 /app/elasticsearch.sh
-
+<% } else if (docker_base == "wolfi") { %>
+# Our actual entrypoint is `tini`, a minimal but functional init program. It
+# calls the entrypoint we provide, while correctly forwarding signals.
+ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/docker-entrypoint.sh"]
+# Dummy overridable parameter parsed by entrypoint
+CMD ["eswrapper"]
 <% } else { %>
 # Our actual entrypoint is `tini`, a minimal but functional init program. It
 # calls the entrypoint we provide, while correctly forwarding signals.
diff --git a/distribution/docker/wolfi-docker-aarch64-export/build.gradle b/distribution/docker/wolfi-docker-aarch64-export/build.gradle
new file mode 100644
index 000000000000..537b5a093683
--- /dev/null
+++ b/distribution/docker/wolfi-docker-aarch64-export/build.gradle
@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// export is done in the parent project.
diff --git a/distribution/docker/wolfi-docker-export/build.gradle b/distribution/docker/wolfi-docker-export/build.gradle
new file mode 100644
index 000000000000..537b5a093683
--- /dev/null
+++ b/distribution/docker/wolfi-docker-export/build.gradle
@@ -0,0 +1,2 @@
+// This file is intentionally blank. All configuration of the
+// export is done in the parent project.
diff --git a/docs/changelog/107936.yaml b/docs/changelog/107936.yaml
new file mode 100644
index 000000000000..89dd57f7a81a
--- /dev/null
+++ b/docs/changelog/107936.yaml
@@ -0,0 +1,6 @@
+pr: 107936
+summary: Two empty mappings now are created equally
+area: Mapping
+type: bug
+issues:
+ - 107031
diff --git a/docs/changelog/109193.yaml b/docs/changelog/109193.yaml
new file mode 100644
index 000000000000..5cc664eaee2c
--- /dev/null
+++ b/docs/changelog/109193.yaml
@@ -0,0 +1,6 @@
+pr: 109193
+summary: "[ES|QL] explicit cast a string literal to `date_period` and `time_duration`\
+  \ in arithmetic operations"
+area: ES|QL
+type: enhancement
+issues: []
diff --git a/docs/changelog/111972.yaml b/docs/changelog/111972.yaml
index 58477c68f0e7..a5bfcd5b0882 100644
--- a/docs/changelog/111972.yaml
+++ b/docs/changelog/111972.yaml
@@ -5,11 +5,13 @@ type: feature
 issues: []
 highlight:
   title: Add global retention in data stream lifecycle
-  body: "Data stream lifecycle now supports configuring retention on a cluster level,\
-    \ namely global retention. Global retention \nallows us to configure two different\
-    \ retentions:\n\n- `data_streams.lifecycle.retention.default` is applied to all\
-    \ data streams managed by the data stream lifecycle that do not have retention\n\
-    defined on the data stream level.\n- `data_streams.lifecycle.retention.max` is\
-    \ applied to all data streams managed by the data stream lifecycle and it allows\
-    \ any data stream \ndata to be deleted after the `max_retention` has passed."
+  body: |-
+    Data stream lifecycle now supports configuring retention on a cluster level,
+    namely global retention. Global retention \nallows us to configure two different
+    retentions:
+
+    - `data_streams.lifecycle.retention.default` is applied to all data streams managed
+    by the data stream lifecycle that do not have retention defined on the data stream level.
+    - `data_streams.lifecycle.retention.max` is applied to all data streams managed by the
+    data stream lifecycle and it allows any data stream \ndata to be deleted after the `max_retention` has passed.
   notable: true
diff --git a/docs/changelog/111981.yaml b/docs/changelog/111981.yaml
new file mode 100644
index 000000000000..13b8fe4b7e38
--- /dev/null
+++ b/docs/changelog/111981.yaml
@@ -0,0 +1,6 @@
+pr: 111981
+summary: Allow fields with dots in sparse vector field mapper
+area: Mapping
+type: enhancement
+issues:
+ - 109118
diff --git a/docs/changelog/112055.yaml b/docs/changelog/112055.yaml
new file mode 100644
index 000000000000..cdf15b3b3746
--- /dev/null
+++ b/docs/changelog/112055.yaml
@@ -0,0 +1,6 @@
+pr: 112055
+summary: "ESQL: `mv_median_absolute_deviation` function"
+area: ES|QL
+type: feature
+issues:
+ - 111590
diff --git a/docs/changelog/112282.yaml b/docs/changelog/112282.yaml
new file mode 100644
index 000000000000..beea119b06ae
--- /dev/null
+++ b/docs/changelog/112282.yaml
@@ -0,0 +1,6 @@
+pr: 112282
+summary: Adds example plugin for custom ingest processor
+area: Ingest Node
+type: enhancement
+issues:
+ - 111539
diff --git a/docs/changelog/112294.yaml b/docs/changelog/112294.yaml
new file mode 100644
index 000000000000..71ce9eeef584
--- /dev/null
+++ b/docs/changelog/112294.yaml
@@ -0,0 +1,8 @@
+pr: 112294
+summary: "Use fallback synthetic source for `copy_to` and doc_values: false cases"
+area: Mapping
+type: enhancement
+issues:
+ - 110753
+ - 110038
+ - 109546
diff --git a/docs/changelog/112330.yaml b/docs/changelog/112330.yaml
new file mode 100644
index 000000000000..498698f5175b
--- /dev/null
+++ b/docs/changelog/112330.yaml
@@ -0,0 +1,5 @@
+pr: 112330
+summary: Add links to network disconnect troubleshooting
+area: Network
+type: enhancement
+issues: []
diff --git a/docs/changelog/112337.yaml b/docs/changelog/112337.yaml
new file mode 100644
index 000000000000..f7d667e23cfe
--- /dev/null
+++ b/docs/changelog/112337.yaml
@@ -0,0 +1,5 @@
+pr: 112337
+summary: Add workaround for missing shard gen blob
+area: Snapshot/Restore
+type: enhancement
+issues: []
diff --git a/docs/changelog/112348.yaml b/docs/changelog/112348.yaml
new file mode 100644
index 000000000000..84110a7cd4f1
--- /dev/null
+++ b/docs/changelog/112348.yaml
@@ -0,0 +1,6 @@
+pr: 112348
+summary: Introduce repository integrity verification API
+area: Snapshot/Restore
+type: enhancement
+issues:
+ - 52622
diff --git a/docs/changelog/112350.yaml b/docs/changelog/112350.yaml
new file mode 100644
index 000000000000..994cd3a65c63
--- /dev/null
+++ b/docs/changelog/112350.yaml
@@ -0,0 +1,5 @@
+pr: 112350
+summary: "[ESQL] Add `SPACE` function"
+area: ES|QL
+type: enhancement
+issues: []
diff --git a/docs/changelog/112401.yaml b/docs/changelog/112401.yaml
new file mode 100644
index 000000000000..65e9e76ac25f
--- /dev/null
+++ b/docs/changelog/112401.yaml
@@ -0,0 +1,6 @@
+pr: 112401
+summary: "ESQL: Fix CASE when conditions are multivalued"
+area: ES|QL
+type: bug
+issues:
+ - 112359
diff --git a/docs/changelog/112409.yaml b/docs/changelog/112409.yaml
new file mode 100644
index 000000000000..bad94b9f5f2b
--- /dev/null
+++ b/docs/changelog/112409.yaml
@@ -0,0 +1,6 @@
+pr: 112409
+summary: Include reason when no nodes are found
+area: "Transform"
+type: bug
+issues:
+ - 112404
diff --git a/docs/changelog/112444.yaml b/docs/changelog/112444.yaml
new file mode 100644
index 000000000000..bfa4fd693f0e
--- /dev/null
+++ b/docs/changelog/112444.yaml
@@ -0,0 +1,6 @@
+pr: 112444
+summary: Full coverage of ECS by ecs@mappings when `date_detection` is disabled
+area: Mapping
+type: bug
+issues:
+ - 112398
diff --git a/docs/changelog/112451.yaml b/docs/changelog/112451.yaml
new file mode 100644
index 000000000000..aa852cf5e2a1
--- /dev/null
+++ b/docs/changelog/112451.yaml
@@ -0,0 +1,29 @@
+pr: 112451
+summary: Update data stream lifecycle telemetry to track global retention
+area: Data streams
+type: breaking
+issues: []
+breaking:
+  title: Update data stream lifecycle telemetry to track global retention
+  area: REST API
+  details: |-
+    In this release we introduced global retention settings that fulfil the following criteria:
+
+    - a data stream managed by the data stream lifecycle,
+    - a data stream that is not an internal data stream.
+
+    As a result, we defined different types of retention:
+
+    - **data retention**: the retention configured on data stream level by the data stream user or owner
+    - **default global retention:** the retention configured by an admin on a cluster level and applied to any
+    data stream that doesn't have data retention and fulfils the criteria.
+    - **max global retention:** the retention configured by an admin to guard against having long retention periods.
+    Any data stream that fulfills the criteria will adhere to the data retention unless it exceeds the max retention,
+    in which case the max global retention applies.
+    - **effective retention:** the retention that applies on the data stream that fulfill the criteria at a given moment
+    in time. It takes into consideration all the retention above and resolves it to the retention that will take effect.
+
+    Considering the above changes, having a field named `retention` in the usage API was confusing. For this reason, we
+    renamed it to `data_retention` and added telemetry about the other configurations too.
+  impact: Users that use the field `data_lifecycle.retention` should use the `data_lifecycle.data_retention`
+  notable: false
diff --git a/docs/changelog/112547.yaml b/docs/changelog/112547.yaml
new file mode 100644
index 000000000000..7f42f2a82976
--- /dev/null
+++ b/docs/changelog/112547.yaml
@@ -0,0 +1,5 @@
+pr: 112547
+summary: Remove reduce and `reduceContext` from `DelayedBucket`
+area: Aggregations
+type: enhancement
+issues: []
diff --git a/docs/changelog/112574.yaml b/docs/changelog/112574.yaml
new file mode 100644
index 000000000000..3111697a8b97
--- /dev/null
+++ b/docs/changelog/112574.yaml
@@ -0,0 +1,5 @@
+pr: 112574
+summary: Add privileges required for CDR misconfiguration features to work on AWS SecurityHub integration
+area: Authorization
+type: enhancement
+issues: []
diff --git a/docs/changelog/112581.yaml b/docs/changelog/112581.yaml
new file mode 100644
index 000000000000..489b4780c06f
--- /dev/null
+++ b/docs/changelog/112581.yaml
@@ -0,0 +1,5 @@
+pr: 112581
+summary: Fix missing header in `put_geoip_database` JSON spec
+area: Ingest Node
+type: bug
+issues: []
diff --git a/docs/changelog/112610.yaml b/docs/changelog/112610.yaml
new file mode 100644
index 000000000000..3d67a80a8f0b
--- /dev/null
+++ b/docs/changelog/112610.yaml
@@ -0,0 +1,6 @@
+pr: 112610
+summary: Support widening of numeric types in union-types
+area: ES|QL
+type: bug
+issues:
+ - 111277
diff --git a/docs/changelog/112612.yaml b/docs/changelog/112612.yaml
new file mode 100644
index 000000000000..d6037e34ff17
--- /dev/null
+++ b/docs/changelog/112612.yaml
@@ -0,0 +1,5 @@
+pr: 112612
+summary: Set `replica_unassigned_buffer_time` in constructor
+area: Health
+type: bug
+issues: []
diff --git a/docs/changelog/112649.yaml b/docs/changelog/112649.yaml
new file mode 100644
index 000000000000..e3cf1e8e3488
--- /dev/null
+++ b/docs/changelog/112649.yaml
@@ -0,0 +1,5 @@
+pr: 112649
+summary: Allowlist `tracestate` header on remote server port
+area: Security
+type: bug
+issues: []
diff --git a/docs/changelog/112687.yaml b/docs/changelog/112687.yaml
new file mode 100644
index 000000000000..dd079e1b700c
--- /dev/null
+++ b/docs/changelog/112687.yaml
@@ -0,0 +1,5 @@
+pr: 112687
+summary: Add `TaskManager` to `pluginServices`
+area: Infra/Metrics
+type: enhancement
+issues: []
diff --git a/docs/changelog/112703.yaml b/docs/changelog/112703.yaml
new file mode 100644
index 000000000000..a428e8c4e233
--- /dev/null
+++ b/docs/changelog/112703.yaml
@@ -0,0 +1,5 @@
+pr: 112703
+summary: JSON parse failures should be 4xx codes
+area: Infra/Core
+type: bug
+issues: []
diff --git a/docs/changelog/112707.yaml b/docs/changelog/112707.yaml
new file mode 100644
index 000000000000..9f16cfcd2b6f
--- /dev/null
+++ b/docs/changelog/112707.yaml
@@ -0,0 +1,5 @@
+pr: 112707
+summary: Deduplicate `BucketOrder` when deserializing
+area: Aggregations
+type: enhancement
+issues: []
diff --git a/docs/changelog/112713.yaml b/docs/changelog/112713.yaml
new file mode 100644
index 000000000000..1ccf451b13f8
--- /dev/null
+++ b/docs/changelog/112713.yaml
@@ -0,0 +1,5 @@
+pr: 112713
+summary: Fix encoding of dynamic arrays in ignored source
+area: Logs
+type: bug
+issues: []
diff --git a/docs/changelog/112720.yaml b/docs/changelog/112720.yaml
new file mode 100644
index 000000000000..a44ea5a69952
--- /dev/null
+++ b/docs/changelog/112720.yaml
@@ -0,0 +1,5 @@
+pr: 112720
+summary: Fix NPE in `dense_vector` stats
+area: Vector Search
+type: bug
+issues: []
diff --git a/docs/plugins/development/creating-classic-plugins.asciidoc b/docs/plugins/development/creating-classic-plugins.asciidoc
index f3f62a11f299..cc03ad51275f 100644
--- a/docs/plugins/development/creating-classic-plugins.asciidoc
+++ b/docs/plugins/development/creating-classic-plugins.asciidoc
@@ -32,12 +32,13 @@ for the plugin. If you need other resources, package them into a resources JAR.
 The {es} repository contains {es-repo}tree/main/plugins/examples[examples of plugins]. Some of these include:
 
 * a plugin with {es-repo}tree/main/plugins/examples/custom-settings[custom settings]
+* a plugin with a {es-repo}tree/main/plugins/examples/custom-processor[custom ingest processor]
 * adding {es-repo}tree/main/plugins/examples/rest-handler[custom rest endpoints]
 * adding a {es-repo}tree/main/plugins/examples/rescore[custom rescorer]
 * a script {es-repo}tree/main/plugins/examples/script-expert-scoring[implemented in Java]
 
 These examples provide the bare bones needed to get started. For more
-information about how to write a plugin, we recommend looking at the 
+information about how to write a plugin, we recommend looking at the
 {es-repo}tree/main/plugins/[source code of existing plugins] for inspiration.
 
 [discrete]
@@ -88,4 +89,4 @@ for more information.
 [[plugin-descriptor-file-classic]]
 ==== The plugin descriptor file for classic plugins
 
-include::plugin-descriptor-file.asciidoc[]
\ No newline at end of file
+include::plugin-descriptor-file.asciidoc[]
diff --git a/docs/plugins/install_remove.asciidoc b/docs/plugins/install_remove.asciidoc
index c9d163fb30ef..893af4dac42f 100644
--- a/docs/plugins/install_remove.asciidoc
+++ b/docs/plugins/install_remove.asciidoc
@@ -4,7 +4,7 @@
 
 ifeval::["{release-state}"=="unreleased"]
 
-WARNING: Version {version} of the Elastic Stack has not yet been released.
+WARNING: Version {version} of the Elastic Stack has not yet been released. The plugin might not be available.
 
 endif::[]
 
diff --git a/docs/reference/cat/nodes.asciidoc b/docs/reference/cat/nodes.asciidoc
index fc5b01f9234e..5f329c00efd7 100644
--- a/docs/reference/cat/nodes.asciidoc
+++ b/docs/reference/cat/nodes.asciidoc
@@ -50,16 +50,16 @@ Valid columns are:
 (Default) IP address, such as `127.0.1.1`.
 
 `heap.percent`, `hp`, `heapPercent`::
-(Default) Maximum configured heap, such as `7`.
+(Default) Used percentage of total allocated Elasticsearch JVM heap, such as `7`. This reflects only the {es} process running within the operating system and is the most direct indicator of its JVM/heap/memory resource performance.
 
 `heap.max`, `hm`, `heapMax`::
-(Default) Total heap, such as `4gb`.
+Total heap, such as `4gb`.
 
 `ram.percent`, `rp`, `ramPercent`::
-(Default) Used total memory percentage, such as `47`.
+(Default) Used percentage of total operating system's memory, such as `47`. This reflects all processes running on operating system instead of only {es} and is not guaranteed to correlate to its performance. 
 
 `file_desc.percent`, `fdp`, `fileDescriptorPercent`::
-(Default) Used file descriptors percentage, such as `1`.
+Used file descriptors percentage, such as `1`.
 
 `node.role`, `r`, `role`, `nodeRole`::
 (Default) Roles of the node.
@@ -138,16 +138,16 @@ Used file descriptors, such as `123`.
 Maximum number of file descriptors, such as `1024`.
 
 `cpu`::
-Recent system CPU usage as percent, such as `12`.
+(Default) Recent system CPU usage as percent, such as `12`.
 
 `load_1m`, `l`::
-Most recent load average, such as `0.22`.
+(Default) Most recent load average, such as `0.22`.
 
 `load_5m`, `l`::
-Load average for the last five minutes, such as `0.78`.
+(Default) Load average for the last five minutes, such as `0.78`.
 
 `load_15m`, `l`::
-Load average for the last fifteen minutes, such as `1.24`.
+(Default) Load average for the last fifteen minutes, such as `1.24`.
 
 `uptime`, `u`::
 Node uptime, such as `17.3m`.
diff --git a/docs/reference/cluster/stats.asciidoc b/docs/reference/cluster/stats.asciidoc
index c39bc0dcd287..575a6457804a 100644
--- a/docs/reference/cluster/stats.asciidoc
+++ b/docs/reference/cluster/stats.asciidoc
@@ -1307,6 +1307,142 @@ Each repository type may also include other statistics about the repositories of
 
 ====
 
+`ccs`::
+(object) Contains information relating to <<modules-cross-cluster-search, {ccs}>> settings and activity in the cluster.
++
+.Properties of `ccs`
+[%collapsible%open]
+=====
+
+
+`_search`:::
+(object) Contains the telemetry information about the <<modules-cross-cluster-search, {ccs}>> usage in the cluster.
++
+.Properties of `_search`
+[%collapsible%open]
+======
+`total`:::
+(integer) The total number of {ccs} requests that have been executed by the cluster.
+
+`success`:::
+(integer) The total number of {ccs} requests that have been successfully executed by the cluster.
+
+`skipped`:::
+(integer) The total number of {ccs} requests (successful or failed) that had at least one remote cluster skipped.
+
+`took`:::
+(object) Contains statistics about the time taken to execute {ccs} requests.
++
+.Properties of `took`
+[%collapsible%open]
+=======
+`max`:::
+(integer) The maximum time taken to execute a {ccs} request, in milliseconds.
+
+`avg`:::
+(integer) The median time taken to execute a {ccs} request, in milliseconds.
+
+`p90`:::
+(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
+=======
+
+`took_mrt_true`::
+(object) Contains statistics about the time taken to execute {ccs} requests for which the
+<<ccs-minimize-roundtrips,`ccs_minimize_roundtrips`>> setting was set to `true`.
++
+.Properties of `took_mrt_true`
+[%collapsible%open]
+=======
+`max`:::
+(integer) The maximum time taken to execute a {ccs} request, in milliseconds.
+
+`avg`:::
+(integer) The median time taken to execute a {ccs} request, in milliseconds.
+
+`p90`:::
+(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
+=======
+
+`took_mrt_false`::
+(object) Contains statistics about the time taken to execute {ccs} requests for which the
+<<ccs-minimize-roundtrips,`ccs_minimize_roundtrips`>> setting was set to `false`.
++
+.Properties of `took_mrt_false`
+[%collapsible%open]
+=======
+`max`:::
+(integer) The maximum time taken to execute a {ccs} request, in milliseconds.
+
+`avg`:::
+(integer) The median time taken to execute a {ccs} request, in milliseconds.
+
+`p90`:::
+(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
+=======
+
+`remotes_per_search_max`::
+(integer) The maximum number of remote clusters that were queried in a single {ccs} request.
+
+`remotes_per_search_avg`::
+(float) The average number of remote clusters that were queried in a single {ccs} request.
+
+`failure_reasons`::
+(object) Contains statistics about the reasons for {ccs} request failures.
+The keys are the failure reason names and the values are the number of requests that failed for that reason.
+
+`features`::
+(object) Contains statistics about the features used in {ccs} requests. The keys are the names of the search feature,
+and the values are the number of requests that used that feature. Single request can use more than one feature
+(e.g. both `async` and `wildcard`). Known features are:
+
+* `async` - <<async-search, Async search>>
+
+* `mrt` - <<ccs-minimize-roundtrips,`ccs_minimize_roundtrips`>> setting was set to `true`.
+
+* `wildcard` - <<api-multi-index,Multi-target syntax>> for indices with wildcards was used in the search request.
+
+`clients`::
+(object) Contains statistics about the clients that executed {ccs} requests.
+The keys are the names of the clients, and the values are the number of requests that were executed by that client.
+Only known clients (such as `kibana` or `elasticsearch`) are counted.
+
+`clusters`::
+(object) Contains statistics about the clusters that were queried in {ccs} requests.
+The keys are cluster names, and the values are per-cluster telemetry data.
+This also includes the local cluster itself, which uses the name `(local)`.
++
+.Properties of per-cluster data:
+[%collapsible%open]
+=======
+`total`:::
+(integer) The total number of successful (not skipped) {ccs} requests that were executed against this cluster.
+This may include requests where partial results were returned, but not requests in which the cluster has been skipped entirely.
+
+`skipped`:::
+(integer) The total number of {ccs} requests for which this cluster was skipped.
+
+`took`:::
+(object) Contains statistics about the time taken to execute requests against this cluster.
++
+.Properties of `took`
+[%collapsible%open]
+========
+`max`:::
+(integer) The maximum time taken to execute a {ccs} request, in milliseconds.
+
+`avg`:::
+(integer) The median time taken to execute a {ccs} request, in milliseconds.
+
+`p90`:::
+(integer) The 90th percentile of the time taken to execute {ccs} requests, in milliseconds.
+========
+
+=======
+
+======
+
+=====
+
 [[cluster-stats-api-example]]
 ==== {api-examples-title}
 
@@ -1607,7 +1743,35 @@ The API returns the following response:
    },
    "repositories": {
      ...
-   }
+   },
+   "ccs": {
+     "_search": {
+        "total": 7,
+        "success": 7,
+        "skipped": 0,
+        "took": {
+            "max": 36,
+            "avg": 20,
+            "p90": 33
+        },
+        "took_mrt_true": {
+            "max": 33,
+            "avg": 15,
+            "p90": 33
+        },
+        "took_mrt_false": {
+            "max": 36,
+            "avg": 26,
+            "p90": 36
+        },
+        "remotes_per_search_max": 3,
+        "remotes_per_search_avg": 2.0,
+        "failure_reasons": { ... },
+        "features": { ... },
+        "clients": { ... },
+        "clusters": { ... }
+     }
+  }
 }
 --------------------------------------------------
 // TESTRESPONSE[s/"plugins": \[[^\]]*\]/"plugins": $body.$_path/]
@@ -1618,10 +1782,15 @@ The API returns the following response:
 // TESTRESPONSE[s/"packaging_types": \[[^\]]*\]/"packaging_types": $body.$_path/]
 // TESTRESPONSE[s/"snapshots": \{[^\}]*\}/"snapshots": $body.$_path/]
 // TESTRESPONSE[s/"repositories": \{[^\}]*\}/"repositories": $body.$_path/]
+// TESTRESPONSE[s/"clusters": \{[^\}]*\}/"clusters": $body.$_path/]
+// TESTRESPONSE[s/"features": \{[^\}]*\}/"features": $body.$_path/]
+// TESTRESPONSE[s/"clients": \{[^\}]*\}/"clients": $body.$_path/]
+// TESTRESPONSE[s/"failure_reasons": \{[^\}]*\}/"failure_reasons": $body.$_path/]
 // TESTRESPONSE[s/"field_types": \[[^\]]*\]/"field_types": $body.$_path/]
 // TESTRESPONSE[s/"runtime_field_types": \[[^\]]*\]/"runtime_field_types": $body.$_path/]
 // TESTRESPONSE[s/"search": \{[^\}]*\}/"search": $body.$_path/]
-// TESTRESPONSE[s/: true|false/: $body.$_path/]
+// TESTRESPONSE[s/"remotes_per_search_avg": [.0-9]+/"remotes_per_search_avg": $body.$_path/]
+// TESTRESPONSE[s/: (true|false)/: $body.$_path/]
 // TESTRESPONSE[s/: (\-)?[0-9]+/: $body.$_path/]
 // TESTRESPONSE[s/: "[^"]*"/: $body.$_path/]
 // These replacements do a few things:
diff --git a/docs/reference/esql/functions/description/cosh.asciidoc b/docs/reference/esql/functions/description/cosh.asciidoc
index bfe51f915287..ddace7da5434 100644
--- a/docs/reference/esql/functions/description/cosh.asciidoc
+++ b/docs/reference/esql/functions/description/cosh.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the {wikipedia}/Hyperbolic_functions[hyperbolic cosine] of an angle.
+Returns the {wikipedia}/Hyperbolic_functions[hyperbolic cosine] of a number.
diff --git a/docs/reference/esql/functions/description/mv_median_absolute_deviation.asciidoc b/docs/reference/esql/functions/description/mv_median_absolute_deviation.asciidoc
new file mode 100644
index 000000000000..765c4d322c3d
--- /dev/null
+++ b/docs/reference/esql/functions/description/mv_median_absolute_deviation.asciidoc
@@ -0,0 +1,7 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Description*
+
+Converts a multivalued field into a single valued field containing the median absolute deviation.  It is calculated as the median of each data point's deviation from the median of the entire sample. That is, for a random variable `X`, the median absolute deviation is `median(|median(X) - X|)`.
+
+NOTE: If the field has an even number of values, the medians will be calculated as the average of the middle two values. If the value is not a floating point number, the averages are rounded towards 0.
diff --git a/docs/reference/esql/functions/description/sin.asciidoc b/docs/reference/esql/functions/description/sin.asciidoc
index ba12ba88ca37..40f5a46d1863 100644
--- a/docs/reference/esql/functions/description/sin.asciidoc
+++ b/docs/reference/esql/functions/description/sin.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns ths {wikipedia}/Sine_and_cosine[Sine] trigonometric function of an angle.
+Returns the {wikipedia}/Sine_and_cosine[sine] of an angle.
diff --git a/docs/reference/esql/functions/description/sinh.asciidoc b/docs/reference/esql/functions/description/sinh.asciidoc
index bb7761e2a025..be7aee68f593 100644
--- a/docs/reference/esql/functions/description/sinh.asciidoc
+++ b/docs/reference/esql/functions/description/sinh.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of an angle.
+Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of a number.
diff --git a/docs/reference/esql/functions/description/space.asciidoc b/docs/reference/esql/functions/description/space.asciidoc
new file mode 100644
index 000000000000..ee01da64f590
--- /dev/null
+++ b/docs/reference/esql/functions/description/space.asciidoc
@@ -0,0 +1,5 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Description*
+
+Returns a string made of `number` spaces.
diff --git a/docs/reference/esql/functions/description/tan.asciidoc b/docs/reference/esql/functions/description/tan.asciidoc
index 925bebf044a7..dae37126f0ad 100644
--- a/docs/reference/esql/functions/description/tan.asciidoc
+++ b/docs/reference/esql/functions/description/tan.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the {wikipedia}/Sine_and_cosine[Tangent] trigonometric function of an angle.
+Returns the {wikipedia}/Sine_and_cosine[tangent] of an angle.
diff --git a/docs/reference/esql/functions/description/tanh.asciidoc b/docs/reference/esql/functions/description/tanh.asciidoc
index 7ee5e457dfe4..42c73a7536dc 100644
--- a/docs/reference/esql/functions/description/tanh.asciidoc
+++ b/docs/reference/esql/functions/description/tanh.asciidoc
@@ -2,4 +2,4 @@
 
 *Description*
 
-Returns the {wikipedia}/Hyperbolic_functions[Tangent] hyperbolic function of an angle.
+Returns the {wikipedia}/Hyperbolic_functions[hyperbolic tangent] of a number.
diff --git a/docs/reference/esql/functions/description/to_dateperiod.asciidoc b/docs/reference/esql/functions/description/to_dateperiod.asciidoc
new file mode 100644
index 000000000000..443e377bf51c
--- /dev/null
+++ b/docs/reference/esql/functions/description/to_dateperiod.asciidoc
@@ -0,0 +1,5 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Description*
+
+Converts an input value into a `date_period` value.
diff --git a/docs/reference/esql/functions/description/to_timeduration.asciidoc b/docs/reference/esql/functions/description/to_timeduration.asciidoc
new file mode 100644
index 000000000000..87c405a98ff6
--- /dev/null
+++ b/docs/reference/esql/functions/description/to_timeduration.asciidoc
@@ -0,0 +1,5 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Description*
+
+Converts an input value into a `time_duration` value.
diff --git a/docs/reference/esql/functions/examples/median_absolute_deviation.asciidoc b/docs/reference/esql/functions/examples/median_absolute_deviation.asciidoc
index 20891126c20f..9084c008e890 100644
--- a/docs/reference/esql/functions/examples/median_absolute_deviation.asciidoc
+++ b/docs/reference/esql/functions/examples/median_absolute_deviation.asciidoc
@@ -4,19 +4,19 @@
 
 [source.merge.styled,esql]
 ----
-include::{esql-specs}/stats_percentile.csv-spec[tag=median-absolute-deviation]
+include::{esql-specs}/median_absolute_deviation.csv-spec[tag=median-absolute-deviation]
 ----
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-include::{esql-specs}/stats_percentile.csv-spec[tag=median-absolute-deviation-result]
+include::{esql-specs}/median_absolute_deviation.csv-spec[tag=median-absolute-deviation-result]
 |===
 The expression can use inline functions. For example, to calculate the the median absolute deviation of the maximum values of a multivalued column, first use `MV_MAX` to get the maximum value per row, and use the result with the `MEDIAN_ABSOLUTE_DEVIATION` function
 [source.merge.styled,esql]
 ----
-include::{esql-specs}/stats_percentile.csv-spec[tag=docsStatsMADNestedExpression]
+include::{esql-specs}/median_absolute_deviation.csv-spec[tag=docsStatsMADNestedExpression]
 ----
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-include::{esql-specs}/stats_percentile.csv-spec[tag=docsStatsMADNestedExpression-result]
+include::{esql-specs}/median_absolute_deviation.csv-spec[tag=docsStatsMADNestedExpression-result]
 |===
 
diff --git a/docs/reference/esql/functions/examples/mv_median_absolute_deviation.asciidoc b/docs/reference/esql/functions/examples/mv_median_absolute_deviation.asciidoc
new file mode 100644
index 000000000000..b36bc18a8017
--- /dev/null
+++ b/docs/reference/esql/functions/examples/mv_median_absolute_deviation.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/mv_median_absolute_deviation.csv-spec[tag=example]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/mv_median_absolute_deviation.csv-spec[tag=example-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/space.asciidoc b/docs/reference/esql/functions/examples/space.asciidoc
new file mode 100644
index 000000000000..cef3cd613902
--- /dev/null
+++ b/docs/reference/esql/functions/examples/space.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/string.csv-spec[tag=space]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/string.csv-spec[tag=space-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/to_dateperiod.asciidoc b/docs/reference/esql/functions/examples/to_dateperiod.asciidoc
new file mode 100644
index 000000000000..91272b33b45e
--- /dev/null
+++ b/docs/reference/esql/functions/examples/to_dateperiod.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/convert.csv-spec[tag=castToDatePeriod]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/convert.csv-spec[tag=castToDatePeriod-result]
+|===
+
diff --git a/docs/reference/esql/functions/examples/to_timeduration.asciidoc b/docs/reference/esql/functions/examples/to_timeduration.asciidoc
new file mode 100644
index 000000000000..7e62a39bbe3e
--- /dev/null
+++ b/docs/reference/esql/functions/examples/to_timeduration.asciidoc
@@ -0,0 +1,13 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Example*
+
+[source.merge.styled,esql]
+----
+include::{esql-specs}/convert.csv-spec[tag=castToTimeDuration]
+----
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+include::{esql-specs}/convert.csv-spec[tag=castToTimeDuration-result]
+|===
+
diff --git a/docs/reference/esql/functions/kibana/definition/case.json b/docs/reference/esql/functions/kibana/definition/case.json
index 27705cd3897f..ab10460f48b2 100644
--- a/docs/reference/esql/functions/kibana/definition/case.json
+++ b/docs/reference/esql/functions/kibana/definition/case.json
@@ -22,6 +22,30 @@
       "variadic" : true,
       "returnType" : "boolean"
     },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "boolean",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "boolean"
+    },
     {
       "params" : [
         {
@@ -40,6 +64,90 @@
       "variadic" : true,
       "returnType" : "cartesian_point"
     },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "cartesian_point",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "cartesian_point",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "cartesian_point"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "cartesian_shape",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "cartesian_shape"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "cartesian_shape",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "cartesian_shape",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "cartesian_shape"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "date",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "date"
+    },
     {
       "params" : [
         {
@@ -53,6 +161,12 @@
           "type" : "date",
           "optional" : false,
           "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "date",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
         }
       ],
       "variadic" : true,
@@ -76,6 +190,30 @@
       "variadic" : true,
       "returnType" : "double"
     },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "double",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "double",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "double"
+    },
     {
       "params" : [
         {
@@ -94,6 +232,90 @@
       "variadic" : true,
       "returnType" : "geo_point"
     },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "geo_point",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "geo_point",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "geo_point"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "geo_shape",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "geo_shape"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "geo_shape",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "geo_shape",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "geo_shape"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "integer",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "integer"
+    },
     {
       "params" : [
         {
@@ -107,6 +329,12 @@
           "type" : "integer",
           "optional" : false,
           "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "integer",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
         }
       ],
       "variadic" : true,
@@ -130,6 +358,30 @@
       "variadic" : true,
       "returnType" : "ip"
     },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "ip",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "ip",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "ip"
+    },
     {
       "params" : [
         {
@@ -143,12 +395,30 @@
           "type" : "keyword",
           "optional" : false,
           "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "keyword"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
         },
         {
-          "name" : "falseValue",
+          "name" : "trueValue",
           "type" : "keyword",
-          "optional" : true,
+          "optional" : false,
           "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "keyword",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
         }
       ],
       "variadic" : true,
@@ -172,6 +442,30 @@
       "variadic" : true,
       "returnType" : "long"
     },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "long",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "long",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "long"
+    },
     {
       "params" : [
         {
@@ -190,6 +484,48 @@
       "variadic" : true,
       "returnType" : "text"
     },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "text",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "text",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "text"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "unsigned_long",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "unsigned_long"
+    },
     {
       "params" : [
         {
@@ -203,6 +539,12 @@
           "type" : "unsigned_long",
           "optional" : false,
           "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "unsigned_long",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
         }
       ],
       "variadic" : true,
@@ -225,6 +567,30 @@
       ],
       "variadic" : true,
       "returnType" : "version"
+    },
+    {
+      "params" : [
+        {
+          "name" : "condition",
+          "type" : "boolean",
+          "optional" : false,
+          "description" : "A condition."
+        },
+        {
+          "name" : "trueValue",
+          "type" : "version",
+          "optional" : false,
+          "description" : "The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches."
+        },
+        {
+          "name" : "elseValue",
+          "type" : "version",
+          "optional" : true,
+          "description" : "The value that's returned when no condition evaluates to `true`."
+        }
+      ],
+      "variadic" : true,
+      "returnType" : "version"
     }
   ],
   "examples" : [
diff --git a/docs/reference/esql/functions/kibana/definition/cosh.json b/docs/reference/esql/functions/kibana/definition/cosh.json
index a34eee15be37..dca261d971c4 100644
--- a/docs/reference/esql/functions/kibana/definition/cosh.json
+++ b/docs/reference/esql/functions/kibana/definition/cosh.json
@@ -2,15 +2,15 @@
   "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
   "type" : "eval",
   "name" : "cosh",
-  "description" : "Returns the hyperbolic cosine of an angle.",
+  "description" : "Returns the hyperbolic cosine of a number.",
   "signatures" : [
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "double",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -19,10 +19,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "integer",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -31,10 +31,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "long",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -43,10 +43,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "unsigned_long",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
diff --git a/docs/reference/esql/functions/kibana/definition/mv_median_absolute_deviation.json b/docs/reference/esql/functions/kibana/definition/mv_median_absolute_deviation.json
new file mode 100644
index 000000000000..d6f1174a4e25
--- /dev/null
+++ b/docs/reference/esql/functions/kibana/definition/mv_median_absolute_deviation.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
+  "type" : "eval",
+  "name" : "mv_median_absolute_deviation",
+  "description" : "Converts a multivalued field into a single valued field containing the median absolute deviation.\n\nIt is calculated as the median of each data point's deviation from the median of the entire sample. That is, for a random variable `X`, the median absolute deviation is `median(|median(X) - X|)`.",
+  "note" : "If the field has an even number of values, the medians will be calculated as the average of the middle two values. If the value is not a floating point number, the averages are rounded towards 0.",
+  "signatures" : [
+    {
+      "params" : [
+        {
+          "name" : "number",
+          "type" : "double",
+          "optional" : false,
+          "description" : "Multivalue expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "double"
+    },
+    {
+      "params" : [
+        {
+          "name" : "number",
+          "type" : "integer",
+          "optional" : false,
+          "description" : "Multivalue expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "integer"
+    },
+    {
+      "params" : [
+        {
+          "name" : "number",
+          "type" : "long",
+          "optional" : false,
+          "description" : "Multivalue expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "long"
+    },
+    {
+      "params" : [
+        {
+          "name" : "number",
+          "type" : "unsigned_long",
+          "optional" : false,
+          "description" : "Multivalue expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "unsigned_long"
+    }
+  ],
+  "examples" : [
+    "ROW values = [0, 2, 5, 6]\n| EVAL median_absolute_deviation = MV_MEDIAN_ABSOLUTE_DEVIATION(values), median = MV_MEDIAN(values)"
+  ]
+}
diff --git a/docs/reference/esql/functions/kibana/definition/sin.json b/docs/reference/esql/functions/kibana/definition/sin.json
index 8d092bd0c15a..ce46fa66a2ac 100644
--- a/docs/reference/esql/functions/kibana/definition/sin.json
+++ b/docs/reference/esql/functions/kibana/definition/sin.json
@@ -2,7 +2,7 @@
   "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
   "type" : "eval",
   "name" : "sin",
-  "description" : "Returns ths Sine trigonometric function of an angle.",
+  "description" : "Returns the sine of an angle.",
   "signatures" : [
     {
       "params" : [
diff --git a/docs/reference/esql/functions/kibana/definition/sinh.json b/docs/reference/esql/functions/kibana/definition/sinh.json
index 2261b18134f6..e773e95e5e9e 100644
--- a/docs/reference/esql/functions/kibana/definition/sinh.json
+++ b/docs/reference/esql/functions/kibana/definition/sinh.json
@@ -2,15 +2,15 @@
   "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
   "type" : "eval",
   "name" : "sinh",
-  "description" : "Returns the hyperbolic sine of an angle.",
+  "description" : "Returns the hyperbolic sine of a number.",
   "signatures" : [
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "double",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -19,10 +19,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "integer",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -31,10 +31,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "long",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -43,10 +43,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "unsigned_long",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
diff --git a/docs/reference/esql/functions/kibana/definition/space.json b/docs/reference/esql/functions/kibana/definition/space.json
new file mode 100644
index 000000000000..acf7466284d3
--- /dev/null
+++ b/docs/reference/esql/functions/kibana/definition/space.json
@@ -0,0 +1,23 @@
+{
+  "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
+  "type" : "eval",
+  "name" : "space",
+  "description" : "Returns a string made of `number` spaces.",
+  "signatures" : [
+    {
+      "params" : [
+        {
+          "name" : "number",
+          "type" : "integer",
+          "optional" : false,
+          "description" : "Number of spaces in result."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "keyword"
+    }
+  ],
+  "examples" : [
+    "ROW message = CONCAT(\"Hello\", SPACE(1), \"World!\");"
+  ]
+}
diff --git a/docs/reference/esql/functions/kibana/definition/tan.json b/docs/reference/esql/functions/kibana/definition/tan.json
index 7498964dc1a2..f5452f310a99 100644
--- a/docs/reference/esql/functions/kibana/definition/tan.json
+++ b/docs/reference/esql/functions/kibana/definition/tan.json
@@ -2,7 +2,7 @@
   "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
   "type" : "eval",
   "name" : "tan",
-  "description" : "Returns the Tangent trigonometric function of an angle.",
+  "description" : "Returns the tangent of an angle.",
   "signatures" : [
     {
       "params" : [
diff --git a/docs/reference/esql/functions/kibana/definition/tanh.json b/docs/reference/esql/functions/kibana/definition/tanh.json
index 507f62d394be..081d606b6421 100644
--- a/docs/reference/esql/functions/kibana/definition/tanh.json
+++ b/docs/reference/esql/functions/kibana/definition/tanh.json
@@ -2,15 +2,15 @@
   "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
   "type" : "eval",
   "name" : "tanh",
-  "description" : "Returns the Tangent hyperbolic function of an angle.",
+  "description" : "Returns the hyperbolic tangent of a number.",
   "signatures" : [
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "double",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -19,10 +19,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "integer",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -31,10 +31,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "long",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
@@ -43,10 +43,10 @@
     {
       "params" : [
         {
-          "name" : "angle",
+          "name" : "number",
           "type" : "unsigned_long",
           "optional" : false,
-          "description" : "An angle, in radians. If `null`, the function returns `null`."
+          "description" : "Numeric expression. If `null`, the function returns `null`."
         }
       ],
       "variadic" : false,
diff --git a/docs/reference/esql/functions/kibana/definition/to_dateperiod.json b/docs/reference/esql/functions/kibana/definition/to_dateperiod.json
new file mode 100644
index 000000000000..dc9176f4cc0b
--- /dev/null
+++ b/docs/reference/esql/functions/kibana/definition/to_dateperiod.json
@@ -0,0 +1,47 @@
+{
+  "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
+  "type" : "eval",
+  "name" : "to_dateperiod",
+  "description" : "Converts an input value into a `date_period` value.",
+  "signatures" : [
+    {
+      "params" : [
+        {
+          "name" : "field",
+          "type" : "date_period",
+          "optional" : false,
+          "description" : "Input value. The input is a valid constant date period expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "date_period"
+    },
+    {
+      "params" : [
+        {
+          "name" : "field",
+          "type" : "keyword",
+          "optional" : false,
+          "description" : "Input value. The input is a valid constant date period expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "date_period"
+    },
+    {
+      "params" : [
+        {
+          "name" : "field",
+          "type" : "text",
+          "optional" : false,
+          "description" : "Input value. The input is a valid constant date period expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "date_period"
+    }
+  ],
+  "examples" : [
+    "row x = \"2024-01-01\"::datetime | eval y = x + \"3 DAYS\"::date_period, z = x - to_dateperiod(\"3 days\");"
+  ]
+}
diff --git a/docs/reference/esql/functions/kibana/definition/to_timeduration.json b/docs/reference/esql/functions/kibana/definition/to_timeduration.json
new file mode 100644
index 000000000000..039de323044e
--- /dev/null
+++ b/docs/reference/esql/functions/kibana/definition/to_timeduration.json
@@ -0,0 +1,47 @@
+{
+  "comment" : "This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.",
+  "type" : "eval",
+  "name" : "to_timeduration",
+  "description" : "Converts an input value into a `time_duration` value.",
+  "signatures" : [
+    {
+      "params" : [
+        {
+          "name" : "field",
+          "type" : "keyword",
+          "optional" : false,
+          "description" : "Input value. The input is a valid constant time duration expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "time_duration"
+    },
+    {
+      "params" : [
+        {
+          "name" : "field",
+          "type" : "text",
+          "optional" : false,
+          "description" : "Input value. The input is a valid constant time duration expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "time_duration"
+    },
+    {
+      "params" : [
+        {
+          "name" : "field",
+          "type" : "time_duration",
+          "optional" : false,
+          "description" : "Input value. The input is a valid constant time duration expression."
+        }
+      ],
+      "variadic" : false,
+      "returnType" : "time_duration"
+    }
+  ],
+  "examples" : [
+    "row x = \"2024-01-01\"::datetime | eval y = x + \"3 hours\"::time_duration, z = x - to_timeduration(\"3 hours\");"
+  ]
+}
diff --git a/docs/reference/esql/functions/kibana/docs/cosh.md b/docs/reference/esql/functions/kibana/docs/cosh.md
index d5cc126650e4..033842952178 100644
--- a/docs/reference/esql/functions/kibana/docs/cosh.md
+++ b/docs/reference/esql/functions/kibana/docs/cosh.md
@@ -3,7 +3,7 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ
 -->
 
 ### COSH
-Returns the hyperbolic cosine of an angle.
+Returns the hyperbolic cosine of a number.
 
 ```
 ROW a=1.8 
diff --git a/docs/reference/esql/functions/kibana/docs/mv_median_absolute_deviation.md b/docs/reference/esql/functions/kibana/docs/mv_median_absolute_deviation.md
new file mode 100644
index 000000000000..191ce3ce60ae
--- /dev/null
+++ b/docs/reference/esql/functions/kibana/docs/mv_median_absolute_deviation.md
@@ -0,0 +1,14 @@
+<!--
+This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+-->
+
+### MV_MEDIAN_ABSOLUTE_DEVIATION
+Converts a multivalued field into a single valued field containing the median absolute deviation.
+
+It is calculated as the median of each data point's deviation from the median of the entire sample. That is, for a random variable `X`, the median absolute deviation is `median(|median(X) - X|)`.
+
+```
+ROW values = [0, 2, 5, 6]
+| EVAL median_absolute_deviation = MV_MEDIAN_ABSOLUTE_DEVIATION(values), median = MV_MEDIAN(values)
+```
+Note: If the field has an even number of values, the medians will be calculated as the average of the middle two values. If the value is not a floating point number, the averages are rounded towards 0.
diff --git a/docs/reference/esql/functions/kibana/docs/sin.md b/docs/reference/esql/functions/kibana/docs/sin.md
index 1e1fc5ee9c93..d1128350d12f 100644
--- a/docs/reference/esql/functions/kibana/docs/sin.md
+++ b/docs/reference/esql/functions/kibana/docs/sin.md
@@ -3,7 +3,7 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ
 -->
 
 ### SIN
-Returns ths Sine trigonometric function of an angle.
+Returns the sine of an angle.
 
 ```
 ROW a=1.8 
diff --git a/docs/reference/esql/functions/kibana/docs/sinh.md b/docs/reference/esql/functions/kibana/docs/sinh.md
index 886b3b95b09f..249c9bb0906c 100644
--- a/docs/reference/esql/functions/kibana/docs/sinh.md
+++ b/docs/reference/esql/functions/kibana/docs/sinh.md
@@ -3,7 +3,7 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ
 -->
 
 ### SINH
-Returns the hyperbolic sine of an angle.
+Returns the hyperbolic sine of a number.
 
 ```
 ROW a=1.8 
diff --git a/docs/reference/esql/functions/kibana/docs/space.md b/docs/reference/esql/functions/kibana/docs/space.md
new file mode 100644
index 000000000000..3112bf953dd6
--- /dev/null
+++ b/docs/reference/esql/functions/kibana/docs/space.md
@@ -0,0 +1,10 @@
+<!--
+This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+-->
+
+### SPACE
+Returns a string made of `number` spaces.
+
+```
+ROW message = CONCAT("Hello", SPACE(1), "World!");
+```
diff --git a/docs/reference/esql/functions/kibana/docs/tan.md b/docs/reference/esql/functions/kibana/docs/tan.md
index f1594f4de747..41bd3c814b17 100644
--- a/docs/reference/esql/functions/kibana/docs/tan.md
+++ b/docs/reference/esql/functions/kibana/docs/tan.md
@@ -3,7 +3,7 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ
 -->
 
 ### TAN
-Returns the Tangent trigonometric function of an angle.
+Returns the tangent of an angle.
 
 ```
 ROW a=1.8 
diff --git a/docs/reference/esql/functions/kibana/docs/tanh.md b/docs/reference/esql/functions/kibana/docs/tanh.md
index c4a70dec00ba..365add190de8 100644
--- a/docs/reference/esql/functions/kibana/docs/tanh.md
+++ b/docs/reference/esql/functions/kibana/docs/tanh.md
@@ -3,7 +3,7 @@ This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../READ
 -->
 
 ### TANH
-Returns the Tangent hyperbolic function of an angle.
+Returns the hyperbolic tangent of a number.
 
 ```
 ROW a=1.8 
diff --git a/docs/reference/esql/functions/kibana/docs/to_dateperiod.md b/docs/reference/esql/functions/kibana/docs/to_dateperiod.md
new file mode 100644
index 000000000000..adbbe7578305
--- /dev/null
+++ b/docs/reference/esql/functions/kibana/docs/to_dateperiod.md
@@ -0,0 +1,10 @@
+<!--
+This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+-->
+
+### TO_DATEPERIOD
+Converts an input value into a `date_period` value.
+
+```
+row x = "2024-01-01"::datetime | eval y = x + "3 DAYS"::date_period, z = x - to_dateperiod("3 days");
+```
diff --git a/docs/reference/esql/functions/kibana/docs/to_timeduration.md b/docs/reference/esql/functions/kibana/docs/to_timeduration.md
new file mode 100644
index 000000000000..52e32ba97d11
--- /dev/null
+++ b/docs/reference/esql/functions/kibana/docs/to_timeduration.md
@@ -0,0 +1,10 @@
+<!--
+This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+-->
+
+### TO_TIMEDURATION
+Converts an input value into a `time_duration` value.
+
+```
+row x = "2024-01-01"::datetime | eval y = x + "3 hours"::time_duration, z = x - to_timeduration("3 hours");
+```
diff --git a/docs/reference/esql/functions/kibana/inline_cast.json b/docs/reference/esql/functions/kibana/inline_cast.json
index f71572d3d651..f1aa283c52e9 100644
--- a/docs/reference/esql/functions/kibana/inline_cast.json
+++ b/docs/reference/esql/functions/kibana/inline_cast.json
@@ -3,6 +3,7 @@
   "boolean" : "to_boolean",
   "cartesian_point" : "to_cartesianpoint",
   "cartesian_shape" : "to_cartesianshape",
+  "date_period" : "to_dateperiod",
   "datetime" : "to_datetime",
   "double" : "to_double",
   "geo_point" : "to_geopoint",
@@ -14,6 +15,7 @@
   "long" : "to_long",
   "string" : "to_string",
   "text" : "to_string",
+  "time_duration" : "to_timeduration",
   "unsigned_long" : "to_unsigned_long",
   "version" : "to_version"
 }
\ No newline at end of file
diff --git a/docs/reference/esql/functions/layout/mv_median_absolute_deviation.asciidoc b/docs/reference/esql/functions/layout/mv_median_absolute_deviation.asciidoc
new file mode 100644
index 000000000000..b594d589e610
--- /dev/null
+++ b/docs/reference/esql/functions/layout/mv_median_absolute_deviation.asciidoc
@@ -0,0 +1,15 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+[discrete]
+[[esql-mv_median_absolute_deviation]]
+=== `MV_MEDIAN_ABSOLUTE_DEVIATION`
+
+*Syntax*
+
+[.text-center]
+image::esql/functions/signature/mv_median_absolute_deviation.svg[Embedded,opts=inline]
+
+include::../parameters/mv_median_absolute_deviation.asciidoc[]
+include::../description/mv_median_absolute_deviation.asciidoc[]
+include::../types/mv_median_absolute_deviation.asciidoc[]
+include::../examples/mv_median_absolute_deviation.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/space.asciidoc b/docs/reference/esql/functions/layout/space.asciidoc
new file mode 100644
index 000000000000..22355d1e2497
--- /dev/null
+++ b/docs/reference/esql/functions/layout/space.asciidoc
@@ -0,0 +1,15 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+[discrete]
+[[esql-space]]
+=== `SPACE`
+
+*Syntax*
+
+[.text-center]
+image::esql/functions/signature/space.svg[Embedded,opts=inline]
+
+include::../parameters/space.asciidoc[]
+include::../description/space.asciidoc[]
+include::../types/space.asciidoc[]
+include::../examples/space.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/to_dateperiod.asciidoc b/docs/reference/esql/functions/layout/to_dateperiod.asciidoc
new file mode 100644
index 000000000000..0345c1a6680c
--- /dev/null
+++ b/docs/reference/esql/functions/layout/to_dateperiod.asciidoc
@@ -0,0 +1,15 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+[discrete]
+[[esql-to_dateperiod]]
+=== `TO_DATEPERIOD`
+
+*Syntax*
+
+[.text-center]
+image::esql/functions/signature/to_dateperiod.svg[Embedded,opts=inline]
+
+include::../parameters/to_dateperiod.asciidoc[]
+include::../description/to_dateperiod.asciidoc[]
+include::../types/to_dateperiod.asciidoc[]
+include::../examples/to_dateperiod.asciidoc[]
diff --git a/docs/reference/esql/functions/layout/to_timeduration.asciidoc b/docs/reference/esql/functions/layout/to_timeduration.asciidoc
new file mode 100644
index 000000000000..bed4743c730a
--- /dev/null
+++ b/docs/reference/esql/functions/layout/to_timeduration.asciidoc
@@ -0,0 +1,15 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+[discrete]
+[[esql-to_timeduration]]
+=== `TO_TIMEDURATION`
+
+*Syntax*
+
+[.text-center]
+image::esql/functions/signature/to_timeduration.svg[Embedded,opts=inline]
+
+include::../parameters/to_timeduration.asciidoc[]
+include::../description/to_timeduration.asciidoc[]
+include::../types/to_timeduration.asciidoc[]
+include::../examples/to_timeduration.asciidoc[]
diff --git a/docs/reference/esql/functions/mv-functions.asciidoc b/docs/reference/esql/functions/mv-functions.asciidoc
index bd5f14cdd355..4093e44c1691 100644
--- a/docs/reference/esql/functions/mv-functions.asciidoc
+++ b/docs/reference/esql/functions/mv-functions.asciidoc
@@ -17,6 +17,7 @@
 * <<esql-mv_last>>
 * <<esql-mv_max>>
 * <<esql-mv_median>>
+* <<esql-mv_median_absolute_deviation>>
 * <<esql-mv_min>>
 * <<esql-mv_pseries_weighted_sum>>
 * <<esql-mv_sort>>
@@ -34,6 +35,7 @@ include::layout/mv_first.asciidoc[]
 include::layout/mv_last.asciidoc[]
 include::layout/mv_max.asciidoc[]
 include::layout/mv_median.asciidoc[]
+include::layout/mv_median_absolute_deviation.asciidoc[]
 include::layout/mv_min.asciidoc[]
 include::layout/mv_pseries_weighted_sum.asciidoc[]
 include::layout/mv_slice.asciidoc[]
diff --git a/docs/reference/esql/functions/parameters/case.asciidoc b/docs/reference/esql/functions/parameters/case.asciidoc
index ee6f7e499b3b..f12eade4d578 100644
--- a/docs/reference/esql/functions/parameters/case.asciidoc
+++ b/docs/reference/esql/functions/parameters/case.asciidoc
@@ -7,3 +7,6 @@ A condition.
 
 `trueValue`::
 The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches.
+
+`elseValue`::
+The value that's returned when no condition evaluates to `true`.
diff --git a/docs/reference/esql/functions/parameters/cosh.asciidoc b/docs/reference/esql/functions/parameters/cosh.asciidoc
index a1c3f7edf30c..65013f4c2126 100644
--- a/docs/reference/esql/functions/parameters/cosh.asciidoc
+++ b/docs/reference/esql/functions/parameters/cosh.asciidoc
@@ -2,5 +2,5 @@
 
 *Parameters*
 
-`angle`::
-An angle, in radians. If `null`, the function returns `null`.
+`number`::
+Numeric expression. If `null`, the function returns `null`.
diff --git a/docs/reference/esql/functions/parameters/mv_median_absolute_deviation.asciidoc b/docs/reference/esql/functions/parameters/mv_median_absolute_deviation.asciidoc
new file mode 100644
index 000000000000..47859c7e2b32
--- /dev/null
+++ b/docs/reference/esql/functions/parameters/mv_median_absolute_deviation.asciidoc
@@ -0,0 +1,6 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Parameters*
+
+`number`::
+Multivalue expression.
diff --git a/docs/reference/esql/functions/parameters/sinh.asciidoc b/docs/reference/esql/functions/parameters/sinh.asciidoc
index a1c3f7edf30c..65013f4c2126 100644
--- a/docs/reference/esql/functions/parameters/sinh.asciidoc
+++ b/docs/reference/esql/functions/parameters/sinh.asciidoc
@@ -2,5 +2,5 @@
 
 *Parameters*
 
-`angle`::
-An angle, in radians. If `null`, the function returns `null`.
+`number`::
+Numeric expression. If `null`, the function returns `null`.
diff --git a/docs/reference/esql/functions/parameters/space.asciidoc b/docs/reference/esql/functions/parameters/space.asciidoc
new file mode 100644
index 000000000000..de4efd34c0ba
--- /dev/null
+++ b/docs/reference/esql/functions/parameters/space.asciidoc
@@ -0,0 +1,6 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Parameters*
+
+`number`::
+Number of spaces in result.
diff --git a/docs/reference/esql/functions/parameters/tanh.asciidoc b/docs/reference/esql/functions/parameters/tanh.asciidoc
index a1c3f7edf30c..65013f4c2126 100644
--- a/docs/reference/esql/functions/parameters/tanh.asciidoc
+++ b/docs/reference/esql/functions/parameters/tanh.asciidoc
@@ -2,5 +2,5 @@
 
 *Parameters*
 
-`angle`::
-An angle, in radians. If `null`, the function returns `null`.
+`number`::
+Numeric expression. If `null`, the function returns `null`.
diff --git a/docs/reference/esql/functions/parameters/to_dateperiod.asciidoc b/docs/reference/esql/functions/parameters/to_dateperiod.asciidoc
new file mode 100644
index 000000000000..1e5ed14cf44a
--- /dev/null
+++ b/docs/reference/esql/functions/parameters/to_dateperiod.asciidoc
@@ -0,0 +1,6 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Parameters*
+
+`field`::
+Input value. The input is a valid constant date period expression.
diff --git a/docs/reference/esql/functions/parameters/to_timeduration.asciidoc b/docs/reference/esql/functions/parameters/to_timeduration.asciidoc
new file mode 100644
index 000000000000..0289dc37dbfe
--- /dev/null
+++ b/docs/reference/esql/functions/parameters/to_timeduration.asciidoc
@@ -0,0 +1,6 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Parameters*
+
+`field`::
+Input value. The input is a valid constant time duration expression.
diff --git a/docs/reference/esql/functions/signature/case.svg b/docs/reference/esql/functions/signature/case.svg
index d6fd7da38aca..0d51a0647627 100644
--- a/docs/reference/esql/functions/signature/case.svg
+++ b/docs/reference/esql/functions/signature/case.svg
@@ -1 +1 @@
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="480" height="46" viewbox="0 0 480 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m68 0h10m32 0h10m128 0h10m32 0h10m128 0h10m32 0h5"/><rect class="s" x="5" y="5" width="68" height="36"/><text class="k" x="15" y="31">CASE</text><rect class="s" x="83" y="5" width="32" height="36" rx="7"/><text class="syn" x="93" y="31">(</text><rect class="s" x="125" y="5" width="128" height="36" rx="7"/><text class="k" x="135" y="31">condition</text><rect class="s" x="263" y="5" width="32" height="36" rx="7"/><text class="syn" x="273" y="31">,</text><rect class="s" x="305" y="5" width="128" height="36" rx="7"/><text class="k" x="315" y="31">trueValue</text><rect class="s" x="443" y="5" width="32" height="36" rx="7"/><text class="syn" x="453" y="31">)</text></svg>
\ No newline at end of file
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="698" height="76" viewbox="0 0 698 76"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 46h5m68 0h10m32 0h30m-5 0q-5 0-5-5v-26q0-5 5-5h318q5 0 5 5v26q0 5-5 5m-185 0h10m32 0h10m128 0h50m128 0h20m-163 0q5 0 5 5v10q0 5 5 5h138q5 0 5-5v-10q0-5 5-5m5 0h10m32 0h5"/><rect class="s" x="5" y="20" width="68" height="36"/><text class="k" x="15" y="46">CASE</text><rect class="s" x="83" y="20" width="32" height="36" rx="7"/><text class="syn" x="93" y="46">(</text><rect class="s" x="145" y="20" width="128" height="36" rx="7"/><text class="k" x="155" y="46">condition</text><rect class="s" x="283" y="20" width="32" height="36" rx="7"/><text class="syn" x="293" y="46">,</text><rect class="s" x="325" y="20" width="128" height="36" rx="7"/><text class="k" x="335" y="46">trueValue</text><rect class="s" x="503" y="20" width="128" height="36" rx="7"/><text class="k" x="513" y="46">elseValue</text><rect class="s" x="661" y="20" width="32" height="36" rx="7"/><text class="syn" x="671" y="46">)</text></svg>
\ No newline at end of file
diff --git a/docs/reference/esql/functions/signature/cosh.svg b/docs/reference/esql/functions/signature/cosh.svg
index 11b14d922929..9b9eddd3cb80 100644
--- a/docs/reference/esql/functions/signature/cosh.svg
+++ b/docs/reference/esql/functions/signature/cosh.svg
@@ -1 +1 @@
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="252" height="46" viewbox="0 0 252 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m68 0h10m32 0h10m80 0h10m32 0h5"/><rect class="s" x="5" y="5" width="68" height="36"/><text class="k" x="15" y="31">COSH</text><rect class="s" x="83" y="5" width="32" height="36" rx="7"/><text class="syn" x="93" y="31">(</text><rect class="s" x="125" y="5" width="80" height="36" rx="7"/><text class="k" x="135" y="31">angle</text><rect class="s" x="215" y="5" width="32" height="36" rx="7"/><text class="syn" x="225" y="31">)</text></svg>
\ No newline at end of file
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="264" height="46" viewbox="0 0 264 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m68 0h10m32 0h10m92 0h10m32 0h5"/><rect class="s" x="5" y="5" width="68" height="36"/><text class="k" x="15" y="31">COSH</text><rect class="s" x="83" y="5" width="32" height="36" rx="7"/><text class="syn" x="93" y="31">(</text><rect class="s" x="125" y="5" width="92" height="36" rx="7"/><text class="k" x="135" y="31">number</text><rect class="s" x="227" y="5" width="32" height="36" rx="7"/><text class="syn" x="237" y="31">)</text></svg>
\ No newline at end of file
diff --git a/docs/reference/esql/functions/signature/mv_median_absolute_deviation.svg b/docs/reference/esql/functions/signature/mv_median_absolute_deviation.svg
new file mode 100644
index 000000000000..7d8a131a9101
--- /dev/null
+++ b/docs/reference/esql/functions/signature/mv_median_absolute_deviation.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="552" height="46" viewbox="0 0 552 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m356 0h10m32 0h10m92 0h10m32 0h5"/><rect class="s" x="5" y="5" width="356" height="36"/><text class="k" x="15" y="31">MV_MEDIAN_ABSOLUTE_DEVIATION</text><rect class="s" x="371" y="5" width="32" height="36" rx="7"/><text class="syn" x="381" y="31">(</text><rect class="s" x="413" y="5" width="92" height="36" rx="7"/><text class="k" x="423" y="31">number</text><rect class="s" x="515" y="5" width="32" height="36" rx="7"/><text class="syn" x="525" y="31">)</text></svg>
\ No newline at end of file
diff --git a/docs/reference/esql/functions/signature/sinh.svg b/docs/reference/esql/functions/signature/sinh.svg
index 0bb4ac31dee3..16e7ddb6b653 100644
--- a/docs/reference/esql/functions/signature/sinh.svg
+++ b/docs/reference/esql/functions/signature/sinh.svg
@@ -1 +1 @@
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="252" height="46" viewbox="0 0 252 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m68 0h10m32 0h10m80 0h10m32 0h5"/><rect class="s" x="5" y="5" width="68" height="36"/><text class="k" x="15" y="31">SINH</text><rect class="s" x="83" y="5" width="32" height="36" rx="7"/><text class="syn" x="93" y="31">(</text><rect class="s" x="125" y="5" width="80" height="36" rx="7"/><text class="k" x="135" y="31">angle</text><rect class="s" x="215" y="5" width="32" height="36" rx="7"/><text class="syn" x="225" y="31">)</text></svg>
\ No newline at end of file
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="264" height="46" viewbox="0 0 264 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m68 0h10m32 0h10m92 0h10m32 0h5"/><rect class="s" x="5" y="5" width="68" height="36"/><text class="k" x="15" y="31">SINH</text><rect class="s" x="83" y="5" width="32" height="36" rx="7"/><text class="syn" x="93" y="31">(</text><rect class="s" x="125" y="5" width="92" height="36" rx="7"/><text class="k" x="135" y="31">number</text><rect class="s" x="227" y="5" width="32" height="36" rx="7"/><text class="syn" x="237" y="31">)</text></svg>
\ No newline at end of file
diff --git a/docs/reference/esql/functions/signature/space.svg b/docs/reference/esql/functions/signature/space.svg
new file mode 100644
index 000000000000..c506c25dfcb1
--- /dev/null
+++ b/docs/reference/esql/functions/signature/space.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="276" height="46" viewbox="0 0 276 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m80 0h10m32 0h10m92 0h10m32 0h5"/><rect class="s" x="5" y="5" width="80" height="36"/><text class="k" x="15" y="31">SPACE</text><rect class="s" x="95" y="5" width="32" height="36" rx="7"/><text class="syn" x="105" y="31">(</text><rect class="s" x="137" y="5" width="92" height="36" rx="7"/><text class="k" x="147" y="31">number</text><rect class="s" x="239" y="5" width="32" height="36" rx="7"/><text class="syn" x="249" y="31">)</text></svg>
\ No newline at end of file
diff --git a/docs/reference/esql/functions/signature/tanh.svg b/docs/reference/esql/functions/signature/tanh.svg
index f7b968f8b30c..c2edfe2d6942 100644
--- a/docs/reference/esql/functions/signature/tanh.svg
+++ b/docs/reference/esql/functions/signature/tanh.svg
@@ -1 +1 @@
-<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="252" height="46" viewbox="0 0 252 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m68 0h10m32 0h10m80 0h10m32 0h5"/><rect class="s" x="5" y="5" width="68" height="36"/><text class="k" x="15" y="31">TANH</text><rect class="s" x="83" y="5" width="32" height="36" rx="7"/><text class="syn" x="93" y="31">(</text><rect class="s" x="125" y="5" width="80" height="36" rx="7"/><text class="k" x="135" y="31">angle</text><rect class="s" x="215" y="5" width="32" height="36" rx="7"/><text class="syn" x="225" y="31">)</text></svg>
\ No newline at end of file
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="264" height="46" viewbox="0 0 264 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m68 0h10m32 0h10m92 0h10m32 0h5"/><rect class="s" x="5" y="5" width="68" height="36"/><text class="k" x="15" y="31">TANH</text><rect class="s" x="83" y="5" width="32" height="36" rx="7"/><text class="syn" x="93" y="31">(</text><rect class="s" x="125" y="5" width="92" height="36" rx="7"/><text class="k" x="135" y="31">number</text><rect class="s" x="227" y="5" width="32" height="36" rx="7"/><text class="syn" x="237" y="31">)</text></svg>
\ No newline at end of file
diff --git a/docs/reference/esql/functions/signature/to_dateperiod.svg b/docs/reference/esql/functions/signature/to_dateperiod.svg
new file mode 100644
index 000000000000..302a9ee3bfa6
--- /dev/null
+++ b/docs/reference/esql/functions/signature/to_dateperiod.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="360" height="46" viewbox="0 0 360 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m176 0h10m32 0h10m80 0h10m32 0h5"/><rect class="s" x="5" y="5" width="176" height="36"/><text class="k" x="15" y="31">TO_DATEPERIOD</text><rect class="s" x="191" y="5" width="32" height="36" rx="7"/><text class="syn" x="201" y="31">(</text><rect class="s" x="233" y="5" width="80" height="36" rx="7"/><text class="k" x="243" y="31">field</text><rect class="s" x="323" y="5" width="32" height="36" rx="7"/><text class="syn" x="333" y="31">)</text></svg>
\ No newline at end of file
diff --git a/docs/reference/esql/functions/signature/to_timeduration.svg b/docs/reference/esql/functions/signature/to_timeduration.svg
new file mode 100644
index 000000000000..b237441b3b40
--- /dev/null
+++ b/docs/reference/esql/functions/signature/to_timeduration.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="384" height="46" viewbox="0 0 384 46"><defs><style type="text/css">#guide .c{fill:none;stroke:#222222;}#guide .k{fill:#000000;font-family:Roboto Mono,Sans-serif;font-size:20px;}#guide .s{fill:#e4f4ff;stroke:#222222;}#guide .syn{fill:#8D8D8D;font-family:Roboto Mono,Sans-serif;font-size:20px;}</style></defs><path class="c" d="M0 31h5m200 0h10m32 0h10m80 0h10m32 0h5"/><rect class="s" x="5" y="5" width="200" height="36"/><text class="k" x="15" y="31">TO_TIMEDURATION</text><rect class="s" x="215" y="5" width="32" height="36" rx="7"/><text class="syn" x="225" y="31">(</text><rect class="s" x="257" y="5" width="80" height="36" rx="7"/><text class="k" x="267" y="31">field</text><rect class="s" x="347" y="5" width="32" height="36" rx="7"/><text class="syn" x="357" y="31">)</text></svg>
\ No newline at end of file
diff --git a/docs/reference/esql/functions/string-functions.asciidoc b/docs/reference/esql/functions/string-functions.asciidoc
index d4b120ad1c45..ed97769b900e 100644
--- a/docs/reference/esql/functions/string-functions.asciidoc
+++ b/docs/reference/esql/functions/string-functions.asciidoc
@@ -19,6 +19,7 @@
 * <<esql-replace>>
 * <<esql-right>>
 * <<esql-rtrim>>
+* <<esql-space>>
 * <<esql-split>>
 * <<esql-starts_with>>
 * <<esql-substring>>
@@ -39,6 +40,7 @@ include::layout/repeat.asciidoc[]
 include::layout/replace.asciidoc[]
 include::layout/right.asciidoc[]
 include::layout/rtrim.asciidoc[]
+include::layout/space.asciidoc[]
 include::layout/split.asciidoc[]
 include::layout/starts_with.asciidoc[]
 include::layout/substring.asciidoc[]
diff --git a/docs/reference/esql/functions/type-conversion-functions.asciidoc b/docs/reference/esql/functions/type-conversion-functions.asciidoc
index 96c29a776bc2..9ac9ec290c07 100644
--- a/docs/reference/esql/functions/type-conversion-functions.asciidoc
+++ b/docs/reference/esql/functions/type-conversion-functions.asciidoc
@@ -16,6 +16,7 @@
 * <<esql-to_boolean>>
 * <<esql-to_cartesianpoint>>
 * <<esql-to_cartesianshape>>
+* experimental:[] <<esql-to_dateperiod>>
 * <<esql-to_datetime>>
 * <<esql-to_degrees>>
 * <<esql-to_double>>
@@ -26,6 +27,7 @@
 * <<esql-to_long>>
 * <<esql-to_radians>>
 * <<esql-to_string>>
+* experimental:[] <<esql-to_timeduration>>
 * experimental:[] <<esql-to_unsigned_long>>
 * <<esql-to_version>>
 // end::type_list[]
@@ -33,6 +35,7 @@
 include::layout/to_boolean.asciidoc[]
 include::layout/to_cartesianpoint.asciidoc[]
 include::layout/to_cartesianshape.asciidoc[]
+include::layout/to_dateperiod.asciidoc[]
 include::layout/to_datetime.asciidoc[]
 include::layout/to_degrees.asciidoc[]
 include::layout/to_double.asciidoc[]
@@ -43,5 +46,6 @@ include::layout/to_ip.asciidoc[]
 include::layout/to_long.asciidoc[]
 include::layout/to_radians.asciidoc[]
 include::layout/to_string.asciidoc[]
+include::layout/to_timeduration.asciidoc[]
 include::layout/to_unsigned_long.asciidoc[]
 include::layout/to_version.asciidoc[]
diff --git a/docs/reference/esql/functions/types/case.asciidoc b/docs/reference/esql/functions/types/case.asciidoc
index f6c8cfe9361d..e8aa3eaf5daa 100644
--- a/docs/reference/esql/functions/types/case.asciidoc
+++ b/docs/reference/esql/functions/types/case.asciidoc
@@ -4,16 +4,33 @@
 
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-condition | trueValue | result
-boolean | boolean | boolean
-boolean | cartesian_point | cartesian_point
-boolean | date | date
-boolean | double | double
-boolean | geo_point | geo_point
-boolean | integer | integer
-boolean | ip | ip
-boolean | long | long
-boolean | text | text
-boolean | unsigned_long | unsigned_long
-boolean | version | version
+condition | trueValue | elseValue | result
+boolean | boolean | boolean | boolean
+boolean | boolean | | boolean
+boolean | cartesian_point | cartesian_point | cartesian_point
+boolean | cartesian_point | | cartesian_point
+boolean | cartesian_shape | cartesian_shape | cartesian_shape
+boolean | cartesian_shape | | cartesian_shape
+boolean | date | date | date
+boolean | date | | date
+boolean | double | double | double
+boolean | double | | double
+boolean | geo_point | geo_point | geo_point
+boolean | geo_point | | geo_point
+boolean | geo_shape | geo_shape | geo_shape
+boolean | geo_shape | | geo_shape
+boolean | integer | integer | integer
+boolean | integer | | integer
+boolean | ip | ip | ip
+boolean | ip | | ip
+boolean | keyword | keyword | keyword
+boolean | keyword | | keyword
+boolean | long | long | long
+boolean | long | | long
+boolean | text | text | text
+boolean | text | | text
+boolean | unsigned_long | unsigned_long | unsigned_long
+boolean | unsigned_long | | unsigned_long
+boolean | version | version | version
+boolean | version | | version
 |===
diff --git a/docs/reference/esql/functions/types/cosh.asciidoc b/docs/reference/esql/functions/types/cosh.asciidoc
index d96a34b67853..7cda278abdb5 100644
--- a/docs/reference/esql/functions/types/cosh.asciidoc
+++ b/docs/reference/esql/functions/types/cosh.asciidoc
@@ -4,7 +4,7 @@
 
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-angle | result
+number | result
 double | double
 integer | double
 long | double
diff --git a/docs/reference/esql/functions/types/mv_median_absolute_deviation.asciidoc b/docs/reference/esql/functions/types/mv_median_absolute_deviation.asciidoc
new file mode 100644
index 000000000000..d81bbf36ae3f
--- /dev/null
+++ b/docs/reference/esql/functions/types/mv_median_absolute_deviation.asciidoc
@@ -0,0 +1,12 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Supported types*
+
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+number | result
+double | double
+integer | integer
+long | long
+unsigned_long | unsigned_long
+|===
diff --git a/docs/reference/esql/functions/types/sinh.asciidoc b/docs/reference/esql/functions/types/sinh.asciidoc
index d96a34b67853..7cda278abdb5 100644
--- a/docs/reference/esql/functions/types/sinh.asciidoc
+++ b/docs/reference/esql/functions/types/sinh.asciidoc
@@ -4,7 +4,7 @@
 
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-angle | result
+number | result
 double | double
 integer | double
 long | double
diff --git a/docs/reference/esql/functions/types/space.asciidoc b/docs/reference/esql/functions/types/space.asciidoc
new file mode 100644
index 000000000000..3f2e89f80d3e
--- /dev/null
+++ b/docs/reference/esql/functions/types/space.asciidoc
@@ -0,0 +1,9 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Supported types*
+
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+number | result
+integer | keyword
+|===
diff --git a/docs/reference/esql/functions/types/tanh.asciidoc b/docs/reference/esql/functions/types/tanh.asciidoc
index d96a34b67853..7cda278abdb5 100644
--- a/docs/reference/esql/functions/types/tanh.asciidoc
+++ b/docs/reference/esql/functions/types/tanh.asciidoc
@@ -4,7 +4,7 @@
 
 [%header.monospaced.styled,format=dsv,separator=|]
 |===
-angle | result
+number | result
 double | double
 integer | double
 long | double
diff --git a/docs/reference/esql/functions/types/to_dateperiod.asciidoc b/docs/reference/esql/functions/types/to_dateperiod.asciidoc
new file mode 100644
index 000000000000..1bbc33fe3ca7
--- /dev/null
+++ b/docs/reference/esql/functions/types/to_dateperiod.asciidoc
@@ -0,0 +1,11 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Supported types*
+
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+field | result
+date_period | date_period
+keyword | date_period
+text | date_period
+|===
diff --git a/docs/reference/esql/functions/types/to_timeduration.asciidoc b/docs/reference/esql/functions/types/to_timeduration.asciidoc
new file mode 100644
index 000000000000..b82a5bb4f9f8
--- /dev/null
+++ b/docs/reference/esql/functions/types/to_timeduration.asciidoc
@@ -0,0 +1,11 @@
+// This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
+
+*Supported types*
+
+[%header.monospaced.styled,format=dsv,separator=|]
+|===
+field | result
+keyword | time_duration
+text | time_duration
+time_duration | time_duration
+|===
diff --git a/docs/reference/index-modules/similarity.asciidoc b/docs/reference/index-modules/similarity.asciidoc
index afc3b6556c67..51a01b5b7c7e 100644
--- a/docs/reference/index-modules/similarity.asciidoc
+++ b/docs/reference/index-modules/similarity.asciidoc
@@ -5,6 +5,8 @@ A similarity (scoring / ranking model) defines how matching documents
 are scored. Similarity is per field, meaning that via the mapping one
 can define a different similarity per field.
 
+Similarity is only applicable for text type and keyword type fields.
+
 Configuring a custom similarity is considered an expert feature and the
 builtin similarities are most likely sufficient as is described in
 <<similarity>>.
diff --git a/docs/reference/index-modules/translog.asciidoc b/docs/reference/index-modules/translog.asciidoc
index 52631bc0956b..0032c7b46bfb 100644
--- a/docs/reference/index-modules/translog.asciidoc
+++ b/docs/reference/index-modules/translog.asciidoc
@@ -19,7 +19,8 @@ An {es} <<indices-flush,flush>> is the process of performing a Lucene commit and
 starting a new translog generation. Flushes are performed automatically in the
 background in order to make sure the translog does not grow too large, which
 would make replaying its operations take a considerable amount of time during
-recovery. The ability to perform a flush manually is also exposed through an
+recovery.  The translog size will never exceed `1%` of the disk size.
+The ability to perform a flush manually is also exposed through an
 API, although this is rarely needed.
 
 [discrete]
@@ -71,7 +72,8 @@ update, or bulk request. This setting accepts the following parameters:
   The translog stores all operations that are not yet safely persisted in Lucene
   (i.e., are not part of a Lucene commit point). Although these operations are
   available for reads, they will need to be replayed if the shard was stopped
-  and had to be recovered. This setting controls the maximum total size of these
-  operations, to prevent recoveries from taking too long. Once the maximum size
-  has been reached a flush will happen, generating a new Lucene commit point.
-  Defaults to `512mb`.
+  and had to be recovered.
+  This setting controls the maximum total size of these operations to prevent
+  recoveries from taking too long. Once the maximum size has been reached, a flush
+  will happen, generating a new Lucene commit point. Defaults to `10 GB`.
+ 
diff --git a/docs/reference/inference/put-inference.asciidoc b/docs/reference/inference/put-inference.asciidoc
index ba26a563541f..b106e2c4a08f 100644
--- a/docs/reference/inference/put-inference.asciidoc
+++ b/docs/reference/inference/put-inference.asciidoc
@@ -31,27 +31,46 @@ use the <<ml-df-trained-models-apis>>.
 * Requires the `manage_inference` <<privileges-list-cluster,cluster privilege>>
 (the built-in `inference_admin` role grants this privilege)
 
+[discrete]
+[[put-inference-api-path-params]]
+==== {api-path-parms-title}
+
+`<inference_id>`::
+(Required, string)
+include::inference-shared.asciidoc[tag=inference-id]
+
+`<task_type>`::
+(Required, string)
+include::inference-shared.asciidoc[tag=task-type]
++
+--
+Refer to the service list in the <<put-inference-api-desc,API description section>> for the available task types. 
+--
+
+
 [discrete]
 [[put-inference-api-desc]]
 ==== {api-description-title}
 
 The create {infer} API enables you to create an {infer} endpoint and configure a {ml} model to perform a specific {infer} task.
 
-The following services are available through the {infer} API, click the links to review the configuration details of the services:
-
-* <<infer-service-alibabacloud-ai-search,AlibabaCloud AI Search>>
-* <<infer-service-amazon-bedrock,Amazon Bedrock>>
-* <<infer-service-anthropic,Anthropic>>
-* <<infer-service-azure-ai-studio,Azure AI Studio>>
-* <<infer-service-azure-openai,Azure OpenAI>>
-* <<infer-service-cohere,Cohere>>
-* <<infer-service-elasticsearch,Elasticsearch>> (for built-in models and models uploaded through Eland)
-* <<infer-service-elser,ELSER>>
-* <<infer-service-google-ai-studio,Google AI Studio>>
-* <<infer-service-google-vertex-ai,Google Vertex AI>>
-* <<infer-service-hugging-face,Hugging Face>>
-* <<infer-service-mistral,Mistral>>
-* <<infer-service-openai,OpenAI>>
+The following services are available through the {infer} API.
+You can find the available task types next to the service name. 
+Click the links to review the configuration details of the services:
+
+* <<infer-service-alibabacloud-ai-search,AlibabaCloud AI Search>> (`rerank`, `sparse_embedding`, `text_embedding`)
+* <<infer-service-amazon-bedrock,Amazon Bedrock>> (`completion`, `text_embedding`)
+* <<infer-service-anthropic,Anthropic>> (`completion`)
+* <<infer-service-azure-ai-studio,Azure AI Studio>> (`completion`, `text_embedding`)
+* <<infer-service-azure-openai,Azure OpenAI>> (`completion`, `text_embedding`)
+* <<infer-service-cohere,Cohere>> (`completion`, `rerank`, `text_embedding`)
+* <<infer-service-elasticsearch,Elasticsearch>> (`rerank`, `sparse_embedding`, `text_embedding` - this service is for built-in models and models uploaded through Eland)
+* <<infer-service-elser,ELSER>> (`sparse_embedding`)
+* <<infer-service-google-ai-studio,Google AI Studio>> (`completion`, `text_embedding`)
+* <<infer-service-google-vertex-ai,Google Vertex AI>> (`rerank`, `text_embedding`) 
+* <<infer-service-hugging-face,Hugging Face>> (`text_embedding`)
+* <<infer-service-mistral,Mistral>> (`text_embedding`)
+* <<infer-service-openai,OpenAI>> (`completion`, `text_embedding`)
 
 The {es} and ELSER services run on a {ml} node in your {es} cluster. The rest of
 the services connect to external providers.
\ No newline at end of file
diff --git a/docs/reference/ingest/processors/inference.asciidoc b/docs/reference/ingest/processors/inference.asciidoc
index 982da1fe17f7..c942959d34e5 100644
--- a/docs/reference/ingest/processors/inference.asciidoc
+++ b/docs/reference/ingest/processors/inference.asciidoc
@@ -31,6 +31,7 @@ include::common-options.asciidoc[]
 `field_map` fields. For NLP models, use the `input_output` option. For 
 {dfanalytics} models, use the `target_field` and `field_map` option.
 * Each {infer} input field must be single strings, not arrays of strings.
+* The `input_field` is processed as is and ignores any <<mapping,index mapping>>'s <<analysis,analyzers>> at time of {infer} run.
 ==================================================
 
 [discrete]
diff --git a/docs/reference/intro.asciidoc b/docs/reference/intro.asciidoc
index 3ad5a9bd71c0..f80856368af2 100644
--- a/docs/reference/intro.asciidoc
+++ b/docs/reference/intro.asciidoc
@@ -14,12 +14,12 @@ Use {es} to search, index, store, and analyze data of all shapes and sizes in ne
 
 {es} is used for a wide and growing range of use cases. Here are a few examples:
 
-* *Monitor log and event data*. Store logs, metrics, and event data for observability and security information and event management (SIEM).
-* *Build search applications*. Add search capabilities to apps or websites, or build enterprise search engines over your organization's internal data sources.
-* *Vector database*. Store and search vectorized data, and create vector embeddings with built-in and third-party natural language processing (NLP) models.
-* *Retrieval augmented generation (RAG)*. Use {es} as a retrieval engine to augment Generative AI models.
-* *Application and security monitoring*. Monitor and analyze application performance and security data effectively.
-* *Machine learning*. Use {ml} to automatically model the behavior of your data in real-time.
+* *Monitor log and event data*: Store logs, metrics, and event data for observability and security information and event management (SIEM).
+* *Build search applications*: Add search capabilities to apps or websites, or build search engines over internal data.
+* *Vector database*: Store and search vectorized data, and create vector embeddings with built-in and third-party natural language processing (NLP) models.
+* *Retrieval augmented generation (RAG)*: Use {es} as a retrieval engine to augment generative AI models.
+* *Application and security monitoring*: Monitor and analyze application performance and security data.
+* *Machine learning*: Use {ml} to automatically model the behavior of your data in real-time.
 
 This is just a sample of search, observability, and security use cases enabled by {es}. 
 Refer to our https://www.elastic.co/customers/success-stories[customer success stories] for concrete examples across a range of industries.
@@ -41,25 +41,25 @@ https://www.elastic.co/guide/en/starting-with-the-elasticsearch-platform-and-its
 To use {es}, you need a running instance of the {es} service.
 You can deploy {es} in various ways:
 
-* <<run-elasticsearch-locally,*Local dev*>>. Get started quickly with a minimal local Docker setup. 
-* {cloud}/ec-getting-started-trial.html[*Elastic Cloud*]. {es} is available as part of our hosted Elastic Stack offering, deployed in the cloud with your provider of choice. Sign up for a https://cloud.elastic.co/registration[14 day free trial].
-* {serverless-docs}/general/sign-up-trial[*Elastic Cloud Serverless* (technical preview)]. Create serverless projects for autoscaled and fully managed {es} deployments. Sign up for a https://cloud.elastic.co/serverless-registration[14 day free trial].
+* <<run-elasticsearch-locally,*Local dev*>>: Get started quickly with a minimal local Docker setup. 
+* {cloud}/ec-getting-started-trial.html[*Elastic Cloud*]: {es} is available as part of our hosted Elastic Stack offering, deployed in the cloud with your provider of choice. Sign up for a https://cloud.elastic.co/registration[14-day free trial].
+* {serverless-docs}/general/sign-up-trial[*Elastic Cloud Serverless* (technical preview)]: Create serverless projects for autoscaled and fully managed {es} deployments. Sign up for a https://cloud.elastic.co/serverless-registration[14-day free trial].
 
 **Advanced deployment options**
 
-* <<elasticsearch-deployment-options,*Self-managed*>>. Install, configure, and run {es} on your own premises.
-* {ece-ref}/Elastic-Cloud-Enterprise-overview.html[*Elastic Cloud Enterprise*]. Deploy Elastic Cloud on public or private clouds, virtual machines, or your own premises.
-* {eck-ref}/k8s-overview.html[*Elastic Cloud on Kubernetes*]. Deploy Elastic Cloud on Kubernetes.
+* <<elasticsearch-deployment-options,*Self-managed*>>: Install, configure, and run {es} on your own premises.
+* {ece-ref}/Elastic-Cloud-Enterprise-overview.html[*Elastic Cloud Enterprise*]: Deploy Elastic Cloud on public or private clouds, virtual machines, or your own premises.
+* {eck-ref}/k8s-overview.html[*Elastic Cloud on Kubernetes*]: Deploy Elastic Cloud on Kubernetes.
 
 [discrete]
 [[elasticsearch-next-steps]]
 === Learn more
 
-Some resources to help you get started:
+Here are some resources to help you get started:
 
-* <<getting-started, Quickstart>>. A beginner's guide to deploying your first {es} instance, indexing data, and running queries.
-* https://elastic.co/webinars/getting-started-elasticsearch[Webinar: Introduction to {es}]. Register for our live webinars to learn directly from {es} experts.
-* https://www.elastic.co/search-labs[Elastic Search Labs]. Tutorials and blogs that explore AI-powered search using the latest {es} features.
+* <<getting-started, Quickstart>>: A beginner's guide to deploying your first {es} instance, indexing data, and running queries.
+* https://elastic.co/webinars/getting-started-elasticsearch[Webinar: Introduction to {es}]: Register for our live webinars to learn directly from {es} experts.
+* https://www.elastic.co/search-labs[Elastic Search Labs]: Tutorials and blogs that explore AI-powered search using the latest {es} features.
 ** Follow our tutorial https://www.elastic.co/search-labs/tutorials/search-tutorial/welcome[to build a hybrid search solution in Python].
 ** Check out the https://github.com/elastic/elasticsearch-labs?tab=readme-ov-file#elasticsearch-examples--apps[`elasticsearch-labs` repository] for a range of Python notebooks and apps for various use cases.
 
@@ -133,9 +133,9 @@ In {es}, metadata fields are prefixed with an underscore.
 
 The most important metadata fields are:
 
-* `_source`. Contains the original JSON document.
-* `_index`. The name of the index where the document is stored.
-* `_id`. The document's ID. IDs must be unique per index.
+* `_source`: Contains the original JSON document.
+* `_index`: The name of the index where the document is stored.
+* `_id`: The document's ID. IDs must be unique per index.
 
 [discrete]
 [[elasticsearch-intro-documents-fields-mappings]]
@@ -146,8 +146,8 @@ A mapping defines the <<mapping-types,data type>> for each field, how the field
 and how it should be stored.
 When adding documents to {es}, you have two options for mappings:
 
-* <<mapping-dynamic, Dynamic mapping>>. Let {es} automatically detect the data types and create the mappings for you. This is great for getting started quickly.
-* <<mapping-explicit, Explicit mapping>>. Define the mappings up front by specifying data types for each field. Recommended for production use cases.
+* <<mapping-dynamic, Dynamic mapping>>: Let {es} automatically detect the data types and create the mappings for you. This is great for getting started quickly, but can lead to unexpected results for complex data.
+* <<mapping-explicit, Explicit mapping>>: Define the mappings up front by specifying data types for each field. Recommended for production use cases, because you have much more control over how your data is indexed.
 
 [TIP]
 ====
diff --git a/docs/reference/mapping.asciidoc b/docs/reference/mapping.asciidoc
index 192f581f28d7..239614345d78 100644
--- a/docs/reference/mapping.asciidoc
+++ b/docs/reference/mapping.asciidoc
@@ -33,10 +33,13 @@ mapping values by overriding values in the mapping during the search request.
 [discrete]
 [[mapping-dynamic]]
 == Dynamic mapping
-<<dynamic-field-mapping,Dynamic mapping>> allows you to experiment with
-and explore data when you’re just getting started. {es} adds new fields
-automatically, just by indexing a document. You can add fields to the top-level
-mapping, and to inner <<object,`object`>>  and <<nested,`nested`>> fields.
+
+When you use <<dynamic-field-mapping,dynamic mapping>>, {es} automatically
+attempts to detect the data type of fields in your documents. This allows 
+you to get started quickly by just adding data to an index. If you index
+additional documents with new fields, {es} will add these fields automatically. 
+You can add fields to the top-level mapping, and to inner <<object,`object`>> 
+and <<nested,`nested`>> fields.
 
 Use <<dynamic-templates,dynamic templates>> to define custom mappings that are
 applied to dynamically added fields based on the matching condition.
@@ -44,14 +47,28 @@ applied to dynamically added fields based on the matching condition.
 [discrete]
 [[mapping-explicit]]
 == Explicit mapping
-<<explicit-mapping,Explicit mapping>> allows you to precisely choose how to
-define the mapping definition, such as:
-
-* Which string fields should be treated as full text fields.
-* Which fields contain numbers, dates, or geolocations.
-* The <<mapping-date-format,format>> of date values.
-* Custom rules to control the mapping for
-  <<dynamic-mapping,dynamically added fields>>.
+
+Use <<explicit-mapping,explicit mapping>> to define exactly how data types
+are mapped to fields, customized to your specific use case.
+
+Defining your own mappings enables you to:
+
+* Define which string fields should be treated as full-text fields.
+* Define which fields contain numbers, dates, or geolocations.
+* Use data types that cannot be automatically detected (such as `geo_point` and `geo_shape`.)
+* Choose date value <<mapping-date-format,formats>>, including custom date formats.
+* Create custom rules to control the mapping for <<dynamic-mapping,dynamically added fields>>.
+* Optimize fields for partial matching.
+* Perform language-specific text analysis.
+
+[TIP]
+====
+It’s often useful to index the same field in different ways for different purposes.
+For example, you might want to index a string field as both a text field for full-text 
+search and as a keyword field for sorting or aggregating your data. Or, you might 
+choose to use more than one language analyzer to process the contents of a string field 
+that contains user input.
+====
 
 Use <<runtime-mapping-fields,runtime fields>> to make schema changes without
 reindexing. You can use runtime fields in conjunction with indexed fields to
diff --git a/docs/reference/modules/transport.asciidoc b/docs/reference/modules/transport.asciidoc
index d08da2cfc1d2..fc7b6831ca84 100644
--- a/docs/reference/modules/transport.asciidoc
+++ b/docs/reference/modules/transport.asciidoc
@@ -185,16 +185,18 @@ configured, and defaults otherwise to `transport.tcp.reuse_address`.
 
 A transport connection between two nodes is made up of a number of long-lived
 TCP connections, some of which may be idle for an extended period of time.
-Nonetheless, Elasticsearch requires these connections to remain open, and it
-can disrupt the operation of your cluster if any inter-node connections are
-closed by an external influence such as a firewall. It is important to
-configure your network to preserve long-lived idle connections between
-Elasticsearch nodes, for instance by leaving `*.tcp.keep_alive` enabled and
-ensuring that the keepalive interval is shorter than any timeout that might
-cause idle connections to be closed, or by setting `transport.ping_schedule` if
-keepalives cannot be configured. Devices which drop connections when they reach
-a certain age are a common source of problems to Elasticsearch clusters, and
-must not be used.
+Nonetheless, {es} requires these connections to remain open, and it can disrupt
+the operation of your cluster if any inter-node connections are closed by an
+external influence such as a firewall. It is important to configure your network
+to preserve long-lived idle connections between {es} nodes, for instance by
+leaving `*.tcp.keep_alive` enabled and ensuring that the keepalive interval is
+shorter than any timeout that might cause idle connections to be closed, or by
+setting `transport.ping_schedule` if keepalives cannot be configured. Devices
+which drop connections when they reach a certain age are a common source of
+problems to {es} clusters, and must not be used.
+
+For information about troubleshooting unexpected network disconnections, see
+<<troubleshooting-unstable-cluster-network>>.
 
 [[request-compression]]
 ===== Request compression
diff --git a/docs/reference/quickstart/run-elasticsearch-locally.asciidoc b/docs/reference/quickstart/run-elasticsearch-locally.asciidoc
index 8c75510ae860..24e0f3f22350 100644
--- a/docs/reference/quickstart/run-elasticsearch-locally.asciidoc
+++ b/docs/reference/quickstart/run-elasticsearch-locally.asciidoc
@@ -114,6 +114,8 @@ docker run -p 127.0.0.1:5601:5601 -d --name kibana --network elastic-net \
   {kib-docker-image}
 ----
 
+When you access {kib}, use `elastic` as the username and the password you set earlier for the `ELASTIC_PASSWORD` environment variable.
+
 [NOTE]
 ====
 The service is started with a trial license. The trial license enables all features of Elasticsearch for a trial period of 30 days. After the trial period expires, the license is downgraded to a basic license, which is free forever. If you prefer to skip the trial and use the basic license, set the value of the `xpack.license.self_generated.type` variable to basic instead. For a detailed feature comparison between the different licenses, refer to our https://www.elastic.co/subscriptions[subscriptions page].
diff --git a/docs/reference/rest-api/usage.asciidoc b/docs/reference/rest-api/usage.asciidoc
index e10240a66fbb..a54dbe21b46c 100644
--- a/docs/reference/rest-api/usage.asciidoc
+++ b/docs/reference/rest-api/usage.asciidoc
@@ -377,10 +377,19 @@ GET /_xpack/usage
     "enabled": true,
     "count": 0,
     "default_rollover_used": true,
-    "retention": {
-        "minimum_millis": 0,
-        "maximum_millis": 0,
-        "average_millis": 0.0
+    "data_retention": {
+      "configured_data_streams": 0
+    },
+    "effective_retention": {
+      "retained_data_streams": 0
+    },
+    "global_retention": {
+      "default": {
+        "defined": false
+      },
+      "max": {
+        "defined": false
+      }
     }
   },
   "data_tiers" : {
diff --git a/docs/reference/search/search-your-data/semantic-search-deploy-model.asciidoc b/docs/reference/search/search-your-data/semantic-search-deploy-model.asciidoc
new file mode 100644
index 000000000000..6c610159ae0b
--- /dev/null
+++ b/docs/reference/search/search-your-data/semantic-search-deploy-model.asciidoc
@@ -0,0 +1,97 @@
+[[semantic-search-deployed-nlp-model]]
+=== Tutorial: semantic search with a deployed model
+
+++++
+<titleabbrev>Semantic search with deployed model</titleabbrev>
+++++
+
+[IMPORTANT]
+====
+* For the easiest way to perform semantic search in the {stack}, refer to the <<semantic-search-semantic-text, `semantic_text`>> end-to-end tutorial.
+* This tutorial was written before the <<inference-apis,{infer} endpoint>> and <<semantic-text,`semantic_text` field type>> was introduced.
+Today we have simpler options for performing semantic search. 
+====
+
+This guide shows you how to implement semantic search with models deployed in {es}: from selecting an NLP model, to writing queries.
+
+
+[discrete]
+[[deployed-select-nlp-model]]
+==== Select an NLP model
+
+{es} offers the usage of a {ml-docs}/ml-nlp-model-ref.html#ml-nlp-model-ref-text-embedding[wide range of NLP models], including both dense and sparse vector models.
+Your choice of the language model is critical for implementing semantic search successfully.
+
+While it is possible to bring your own text embedding model, achieving good search results through model tuning is challenging.
+Selecting an appropriate model from our third-party model list is the first step.
+Training the model on your own data is essential to ensure better search results than using only BM25.
+However, the model training process requires a team of data scientists and ML experts, making it expensive and time-consuming.
+
+To address this issue, Elastic provides a pre-trained representational model called {ml-docs}/ml-nlp-elser.html[Elastic Learned Sparse EncodeR (ELSER)].
+ELSER, currently available only for English, is an out-of-domain sparse vector model that does not require fine-tuning.
+This adaptability makes it suitable for various NLP use cases out of the box.
+Unless you have a team of ML specialists, it is highly recommended to use the ELSER model.
+
+In the case of sparse vector representation, the vectors mostly consist of zero values, with only a small subset containing non-zero values.
+This representation is commonly used for textual data.
+In the case of ELSER, each document in an index and the query text itself are represented by high-dimensional sparse vectors.
+Each non-zero element of the vector corresponds to a term in the model vocabulary.
+The ELSER vocabulary contains around 30000 terms, so the sparse vectors created by ELSER contain about 30000 values, the majority of which are zero.
+Effectively the ELSER model is replacing the terms in the original query with other terms that have been learnt to exist in the documents that best match the original search terms in a training dataset, and weights to control how important each is.
+
+
+[discrete]
+[[deployed-deploy-nlp-model]]
+==== Deploy the model
+
+After you decide which model you want to use for implementing semantic search, you need to deploy the model in {es}.
+
+include::{es-ref-dir}/tab-widgets/semantic-search/deploy-nlp-model-widget.asciidoc[]
+
+
+[discrete]
+[[deployed-field-mappings]]
+==== Map a field for the text embeddings
+
+Before you start using the deployed model to generate embeddings based on your input text, you need to prepare your index mapping first.
+The mapping of the index depends on the type of model.
+
+include::{es-ref-dir}/tab-widgets/semantic-search/field-mappings-widget.asciidoc[]
+
+
+[discrete]
+[[deployed-generate-embeddings]]
+==== Generate text embeddings
+
+Once you have created the mappings for the index, you can generate text embeddings from your input text.
+This can be done by using an
+<<ingest,ingest pipeline>> with an <<inference-processor,inference processor>>.
+The ingest pipeline processes the input data and indexes it into the destination index.
+At index time, the inference ingest processor uses the trained model to infer against the data ingested through the pipeline.
+After you created the ingest pipeline with the inference processor, you can ingest your data through it to generate the model output.
+
+include::{es-ref-dir}/tab-widgets/semantic-search/generate-embeddings-widget.asciidoc[]
+
+Now it is time to perform semantic search!
+
+
+[discrete]
+[[deployed-search]]
+==== Search the data
+
+Depending on the type of model you have deployed, you can query rank features with a <<query-dsl-sparse-vector-query, sparse vector>> query, or dense vectors with a kNN search.
+
+include::{es-ref-dir}/tab-widgets/semantic-search/search-widget.asciidoc[]
+
+
+[discrete]
+[[deployed-hybrid-search]]
+==== Beyond semantic search with hybrid search
+
+In some situations, lexical search may perform better than semantic search.
+For example, when searching for single words or IDs, like product numbers.
+
+Combining semantic and lexical search into one hybrid search request using <<rrf,reciprocal rank fusion>> provides the best of both worlds.
+Not only that, but hybrid search using reciprocal rank fusion {blog-ref}improving-information-retrieval-elastic-stack-hybrid[has been shown to perform better in general].
+
+include::{es-ref-dir}/tab-widgets/semantic-search/hybrid-search-widget.asciidoc[]
\ No newline at end of file
diff --git a/docs/reference/search/search-your-data/semantic-search.asciidoc b/docs/reference/search/search-your-data/semantic-search.asciidoc
index fa84c3848b78..62e41b3eef3d 100644
--- a/docs/reference/search/search-your-data/semantic-search.asciidoc
+++ b/docs/reference/search/search-your-data/semantic-search.asciidoc
@@ -7,109 +7,93 @@ Semantic search is a search method that helps you find data based on the intent
 Using an NLP model enables you to extract text embeddings out of text.
 Embeddings are vectors that provide a numeric representation of a text.
 Pieces of content with similar meaning have similar representations.
-NLP models can be used in the {stack} various ways, you can:
 
-* deploy models in {es}
-* use the <<semantic-search-semantic-text, `semantic_text` workflow>> (recommended)
-* use the <<semantic-search-inference, {infer} API workflow>>
+You have several options for using NLP models in the {stack}:
 
+* use the `semantic_text` workflow (recommended)
+* use the {infer} API workflow
+* deploy models directly in {es}
 
-[[semantic-search-diagram]]
-.A simplified representation of encoding textual concepts as vectors
-image::images/search/vector-search-oversimplification.png[A simplified representation of encoding textual concepts as vectors,align="center"]
+Refer to <<using-nlp-models,this section>> to choose your workflow.
 
-At query time, {es} can use the same NLP model to convert a query into embeddings, enabling you to find documents with similar text embeddings.
+You can also store your own embeddings in {es} as vectors.
+Refer to <<using-query,this section>> for guidance on which query type to use for semantic search.
 
-This guide shows you how to implement semantic search with {es}: From selecting an NLP model, to writing queries.
+At query time, {es} can use the same NLP model to convert a query into embeddings, enabling you to find documents with similar text embeddings.
 
-IMPORTANT: For the easiest way to perform semantic search in the {stack}, refer to the <<semantic-search-semantic-text, `semantic_text`>> end-to-end tutorial.
 
 [discrete]
-[[semantic-search-select-nlp-model]]
-=== Select an NLP model
-
-{es} offers the usage of a
-{ml-docs}/ml-nlp-model-ref.html#ml-nlp-model-ref-text-embedding[wide range of NLP models], including both dense and sparse vector models.
-Your choice of the language model is critical for implementing semantic search successfully.
-
-While it is possible to bring your own text embedding model, achieving good search results through model tuning is challenging.
-Selecting an appropriate model from our third-party model list is the first step.
-Training the model on your own data is essential to ensure better search results than using only BM25.
-However, the model training process requires a team of data scientists and ML experts, making it expensive and time-consuming.
-
-To address this issue, Elastic provides a pre-trained representational model called {ml-docs}/ml-nlp-elser.html[Elastic Learned Sparse EncodeR (ELSER)].
-ELSER, currently available only for English, is an out-of-domain sparse vector model that does not require fine-tuning.
-This adaptability makes it suitable for various NLP use cases out of the box.
-Unless you have a team of ML specialists, it is highly recommended to use the ELSER model.
-
-In the case of sparse vector representation, the vectors mostly consist of zero values, with only a small subset containing non-zero values.
-This representation is commonly used for textual data.
-In the case of ELSER, each document in an index and the query text itself are represented by high-dimensional sparse vectors.
-Each non-zero element of the vector corresponds to a term in the model vocabulary.
-The ELSER vocabulary contains around 30000 terms, so the sparse vectors created by ELSER contain about 30000 values, the majority of which are zero.
-Effectively the ELSER model is replacing the terms in the original query with other terms that have been learnt to exist in the documents that best match the original search terms in a training dataset, and weights to control how important each is.
+[[using-nlp-models]]
+=== Choose a semantic search workflow
 
 [discrete]
-[[semantic-search-deploy-nlp-model]]
-=== Deploy the model
+==== `semantic_text` workflow
 
-After you decide which model you want to use for implementing semantic search, you need to deploy the model in {es}.
+The simplest way to use NLP models in the {stack} is through the <<semantic-search-semantic-text, `semantic_text` workflow>>.
+We recommend using this approach because it abstracts away a lot of manual work.
+All you need to do is create an {infer} endpoint and an index mapping to start ingesting, embedding, and querying data.
+There is no need to define model-related settings and parameters, or to create {infer} ingest pipelines.
+Refer to the <<put-inference-api, Create an {infer} endpoint API>> documentation for a list of supported services.
 
-include::{es-ref-dir}/tab-widgets/semantic-search/deploy-nlp-model-widget.asciidoc[]
+The <<semantic-search-semantic-text, Semantic search with `semantic_text`>> tutorial shows you the process end-to-end.
 
 [discrete]
-[[semantic-search-field-mappings]]
-=== Map a field for the text embeddings
+==== {infer} API workflow
 
-Before you start using the deployed model to generate embeddings based on your input text, you need to prepare your index mapping first.
-The mapping of the index depends on the type of model.
+The <<semantic-search-inference, {infer} API workflow>> is more complex but offers greater control over the {infer} endpoint configuration.
+You need to create an {infer} endpoint, provide various model-related settings and parameters, define an index mapping, and set up an {infer} ingest pipeline with the appropriate settings.
 
-include::{es-ref-dir}/tab-widgets/semantic-search/field-mappings-widget.asciidoc[]
+The <<semantic-search-inference, Semantic search with the {infer} API>> tutorial shows you the process end-to-end.
 
 [discrete]
-[[semantic-search-generate-embeddings]]
-=== Generate text embeddings
+==== Model deployment workflow
 
-Once you have created the mappings for the index, you can generate text embeddings from your input text.
-This can be done by using an
-<<ingest,ingest pipeline>> with an <<inference-processor,inference processor>>.
-The ingest pipeline processes the input data and indexes it into the destination index.
-At index time, the inference ingest processor uses the trained model to infer against the data ingested through the pipeline.
-After you created the ingest pipeline with the inference processor, you can ingest your data through it to generate the model output.
+You can also deploy NLP in {es} manually, without using an {infer} endpoint.
+This is the most complex and labor intensive workflow for performing semantic search in the {stack}.
+You need to select an NLP model from the {ml-docs}/ml-nlp-model-ref.html#ml-nlp-model-ref-text-embedding[list of supported dense and sparse vector models], deploy it using the Eland client, create an index mapping, and set up a suitable ingest pipeline to start ingesting and querying data.
 
-include::{es-ref-dir}/tab-widgets/semantic-search/generate-embeddings-widget.asciidoc[]
+The <<semantic-search-deployed-nlp-model, Semantic search with a model deployed in {es}>> tutorial shows you the process end-to-end.
 
-Now it is time to perform semantic search!
 
 [discrete]
-[[semantic-search-search]]
-=== Search the data
+[[using-query]]
+=== Using the right query
 
-Depending on the type of model you have deployed, you can query rank features with a <<query-dsl-sparse-vector-query, sparse vector>> query, or dense vectors with a kNN search.
+Crafting the right query is crucial for semantic search.
+Which query you use and which field you target in your queries depends on your chosen workflow.
+If you're using the `semantic_text` workflow it's quite simple.
+If not, it depends on which type of embeddings you're working with.
 
-include::{es-ref-dir}/tab-widgets/semantic-search/search-widget.asciidoc[]
+[cols="30%, 30%, 40%", options="header"]
+|=======================================================================================================================================================================================================
+| Field type to query                    | Query to use                                      | Notes                                                                                                                                                             
+| <<semantic-text,`semantic_text`>>      | <<query-dsl-semantic-query,`semantic`>>           | The `semantic_text` field handles generating embeddings for you at index time and query time.                                                               
+| <<sparse-vector,`sparse_vector`>>      | <<query-dsl-sparse-vector-query,`sparse_vector`>> | The `sparse_vector` query can generate query embeddings for you, but you can also provide your own. You must provide embeddings at index time.
+| <<dense-vector,`dense_vector`>>        | <<query-dsl-knn-query,`knn`>>                     | The `knn` query can generate query embeddings for you, but you can also provide your own. You must provide embeddings at index time.
+|=======================================================================================================================================================================================================
 
-[discrete]
-[[semantic-search-hybrid-search]]
-=== Beyond semantic search with hybrid search
+If you want {es} to generate embeddings at both index and query time, use the `semantic_text` field and the `semantic` query.
+If you want to bring your own embeddings, use the `sparse_vector` or `dense_vector` field type and the associated query depending on the NLP model you used to generate the embeddings.
 
-In some situations, lexical search may perform better than semantic search.
-For example, when searching for single words or IDs, like product numbers.
-
-Combining semantic and lexical search into one hybrid search request using
-<<rrf,reciprocal rank fusion>> provides the best of both worlds.
-Not only that, but hybrid search using reciprocal rank fusion {blog-ref}improving-information-retrieval-elastic-stack-hybrid[has been shown to perform better in general].
+IMPORTANT: For the easiest way to perform semantic search in the {stack}, refer to the <<semantic-search-semantic-text, `semantic_text`>> end-to-end tutorial.
 
-include::{es-ref-dir}/tab-widgets/semantic-search/hybrid-search-widget.asciidoc[]
 
 [discrete]
 [[semantic-search-read-more]]
 === Read more
 
 * Tutorials:
-** <<semantic-search-elser,Semantic search with ELSER>>
+** <<semantic-search-semantic-text, Semantic search with `semantic_text`>>
+** <<semantic-search-inference, Semantic search with the {infer} API>>
+** <<semantic-search-elser,Semantic search with ELSER>> using the model deployment workflow
+** <<semantic-search-deployed-nlp-model, Semantic search with a model deployed in {es}>>
 ** {ml-docs}/ml-nlp-text-emb-vector-search-example.html[Semantic search with the msmarco-MiniLM-L-12-v3 sentence-transformer model]
+* Interactive examples:
+** The https://github.com/elastic/elasticsearch-labs[`elasticsearch-labs`] repo contains a number of interactive semantic search examples in the form of executable Python notebooks, using the {es} Python client
+** https://github.com/elastic/elasticsearch-labs/blob/main/notebooks/search/03-ELSER.ipynb[Semantic search with ELSER using the model deployment workflow]
+** https://github.com/elastic/elasticsearch-labs/blob/main/notebooks/search/09-semantic-text.ipynb[Semantic search with `semantic_text`]
 * Blogs:
+** https://www.elastic.co/search-labs/blog/semantic-search-simplified-semantic-text[{es} new semantic_text mapping: Simplifying semantic search]
 ** {blog-ref}may-2023-launch-sparse-encoder-ai-model[Introducing Elastic Learned Sparse Encoder: Elastic's AI model for semantic search]
 ** {blog-ref}lexical-ai-powered-search-elastic-vector-database[How to get the best of lexical and AI-powered search with Elastic's vector database]
 ** Information retrieval blog series:
@@ -117,10 +101,10 @@ include::{es-ref-dir}/tab-widgets/semantic-search/hybrid-search-widget.asciidoc[
 *** {blog-ref}improving-information-retrieval-elastic-stack-benchmarking-passage-retrieval[Part 2: Benchmarking passage retrieval]
 *** {blog-ref}may-2023-launch-information-retrieval-elasticsearch-ai-model[Part 3: Introducing Elastic Learned Sparse Encoder, our new retrieval model]
 *** {blog-ref}improving-information-retrieval-elastic-stack-hybrid[Part 4: Hybrid retrieval]
-* Interactive examples:
-** The https://github.com/elastic/elasticsearch-labs[`elasticsearch-labs`] repo contains a number of interactive semantic search examples in the form of executable Python notebooks, using the {es} Python client
 
-include::semantic-search-elser.asciidoc[]
+
 include::semantic-search-semantic-text.asciidoc[]
 include::semantic-search-inference.asciidoc[]
+include::semantic-search-elser.asciidoc[]
 include::cohere-es.asciidoc[]
+include::semantic-search-deploy-model.asciidoc[]
diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc
index c7e146a5442c..f6093494b6e5 100644
--- a/docs/reference/setup/install/deb.asciidoc
+++ b/docs/reference/setup/install/deb.asciidoc
@@ -108,7 +108,7 @@ include::skip-set-kernel-parameters.asciidoc[]
 
 ifeval::["{release-state}"=="unreleased"]
 
-WARNING: Version {version} of Elasticsearch has not yet been released.
+WARNING: Version {version} of Elasticsearch has not yet been released. The package might not be available.
 
 endif::[]
 
diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc
index 60815d570ab3..085c48b0ce4b 100644
--- a/docs/reference/setup/install/rpm.asciidoc
+++ b/docs/reference/setup/install/rpm.asciidoc
@@ -101,7 +101,7 @@ endif::[]
 
 ifeval::["{release-state}"=="unreleased"]
 
-WARNING: Version {version} of Elasticsearch has not yet been released.
+WARNING: Version {version} of Elasticsearch has not yet been released. The RPM might not be available.
 
 endif::[]
 
diff --git a/docs/reference/setup/install/targz.asciidoc b/docs/reference/setup/install/targz.asciidoc
index d40a4bfdd7e7..cab5be47a8c4 100644
--- a/docs/reference/setup/install/targz.asciidoc
+++ b/docs/reference/setup/install/targz.asciidoc
@@ -21,7 +21,7 @@ see the <<jvm-version, JVM version requirements>>
 
 ifeval::["{release-state}"=="unreleased"]
 
-WARNING: Version {version} of {es} has not yet been released.
+WARNING: Version {version} of {es} has not yet been released. The archive might not be available.
 
 endif::[]
 
@@ -44,7 +44,7 @@ cd elasticsearch-{version}/ <2>
 
 ifeval::["{release-state}"=="unreleased"]
 
-WARNING: Version {version} of {es} has not yet been released.
+WARNING: Version {version} of {es} has not yet been released. The archive might not be available.
 
 endif::[]
 
diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc
index eb84ff149f8b..27a330debd81 100644
--- a/docs/reference/setup/install/zip-windows.asciidoc
+++ b/docs/reference/setup/install/zip-windows.asciidoc
@@ -31,7 +31,7 @@ see the <<jvm-version, JVM version requirements>>
 
 ifeval::["{release-state}"=="unreleased"]
 
-WARNING: Version {version} of {es} has not yet been released.
+WARNING: Version {version} of {es} has not yet been released. The archive might not be available.
 
 endif::[]
 
diff --git a/docs/reference/setup/stopping.asciidoc b/docs/reference/setup/stopping.asciidoc
index 8c3a8d40fa1d..f80812f02693 100644
--- a/docs/reference/setup/stopping.asciidoc
+++ b/docs/reference/setup/stopping.asciidoc
@@ -50,9 +50,14 @@ such a shutdown, it does not go through an orderly shutdown as described above.
 process will also return with a special status code indicating the nature of the error.
 
 [horizontal]
+Killed by jvmkiller agent:: 158
+User or kernel SIGTERM:: 143
+Slain by kernel oom-killer:: 137
+Segmentation fault:: 134
 JVM internal error:: 128
 Out of memory error:: 127
 Stack overflow error:: 126
 Unknown virtual machine error:: 125
 Serious I/O error:: 124
+Bootstrap check failure:: 78
 Unknown fatal error:: 1
diff --git a/docs/reference/snapshot-restore/apis/snapshot-restore-apis.asciidoc b/docs/reference/snapshot-restore/apis/snapshot-restore-apis.asciidoc
index 6cdf65ba54e7..b8bb6a2cd7d1 100644
--- a/docs/reference/snapshot-restore/apis/snapshot-restore-apis.asciidoc
+++ b/docs/reference/snapshot-restore/apis/snapshot-restore-apis.asciidoc
@@ -28,6 +28,7 @@ For more information, see <<snapshot-restore>>.
 include::put-repo-api.asciidoc[]
 include::verify-repo-api.asciidoc[]
 include::repo-analysis-api.asciidoc[]
+include::verify-repo-integrity-api.asciidoc[]
 include::get-repo-api.asciidoc[]
 include::delete-repo-api.asciidoc[]
 include::clean-up-repo-api.asciidoc[]
diff --git a/docs/reference/snapshot-restore/apis/verify-repo-integrity-api.asciidoc b/docs/reference/snapshot-restore/apis/verify-repo-integrity-api.asciidoc
new file mode 100644
index 000000000000..99ae126b401f
--- /dev/null
+++ b/docs/reference/snapshot-restore/apis/verify-repo-integrity-api.asciidoc
@@ -0,0 +1,232 @@
+[role="xpack"]
+[[verify-repo-integrity-api]]
+=== Verify repository integrity API
+++++
+<titleabbrev>Verify repository integrity</titleabbrev>
+++++
+
+Verifies the integrity of the contents of a snapshot repository.
+
+////
+[source,console]
+----
+PUT /_snapshot/my_repository
+{
+  "type": "fs",
+  "settings": {
+    "location": "my_backup_location"
+  }
+}
+----
+// TESTSETUP
+////
+
+[source,console]
+----
+POST /_snapshot/my_repository/_verify_integrity
+----
+
+[[verify-repo-integrity-api-request]]
+==== {api-request-title}
+
+`POST /_snapshot/<repository>/_verify_integrity`
+
+[[verify-repo-integrity-api-prereqs]]
+==== {api-prereq-title}
+
+* If the {es} {security-features} are enabled, you must have the `manage`
+<<privileges-list-cluster,cluster privilege>> to use this API. For more
+information, see <<security-privileges>>.
+
+[[verify-repo-integrity-api-desc]]
+==== {api-description-title}
+
+This API allows you to perform a comprehensive check of the contents of a
+repository, looking for any anomalies in its data or metadata which might
+prevent you from restoring snapshots from the repository or which might cause
+future snapshot create or delete operations to fail.
+
+If you suspect the integrity of the contents of one of your snapshot
+repositories, cease all write activity to this repository immediately, set its
+`read_only` option to `true`, and use this API to verify its integrity. Until
+you do so:
+
+* It may not be possible to <<snapshots-restore-snapshot,restore some
+  snapshots>> from this repository.
+
+* <<searchable-snapshots>> may report errors when searched, or may have
+  unassigned shards.
+
+* <<snapshots-take-snapshot,Taking snapshots>> into this repository may fail,
+  or may appear to succeed having created a snapshot which cannot be restored.
+
+* <<delete-snapshot-api,Deleting snapshots>> from this repository may fail, or
+  may appear to succeed leaving the underlying data on disk.
+
+* Continuing to write to the repository while it is in an invalid state may
+  causing additional damage to its contents.
+
+If the <<verify-repo-integrity-api>> API finds any problems with the integrity
+of the contents of your repository, {es} will not be able to repair the damage.
+The only way to bring the repository back into a fully working state after its
+contents have been damaged is by restoring its contents from a
+<<snapshots-repository-backup,repository backup>> which was taken before the
+damage occurred. You must also identify what caused the damage and take action
+to prevent it from happening again.
+
+If you cannot restore a repository backup,
+<<snapshots-register-repository,register a new repository>> and use this for
+all future snapshot operations. In some cases it may be possible to recover
+some of the contents of a damaged repository, either by
+<<snapshots-restore-snapshot,restoring>> as many of its snapshots as needed and
+<<snapshots-take-snapshot,taking new snapshots>> of the restored data, or by
+using the <<docs-reindex>> API to copy data from any <<searchable-snapshots>>
+mounted from the damaged repository.
+
+Avoid all operations which write to the repository while the
+<<verify-repo-integrity-api>> API is running. If something changes the
+repository contents while an integrity verification is running then {es} may
+incorrectly report having detected some anomalies in its contents due to the
+concurrent writes. It may also incorrectly fail to report some anomalies that
+the concurrent writes prevented it from detecting.
+
+NOTE: This API is intended for exploratory use by humans. You should expect the
+request parameters and the response format to vary in future versions.
+
+NOTE: This API may not work correctly in a mixed-version cluster.
+
+[[verify-repo-integrity-api-path-params]]
+==== {api-path-parms-title}
+
+`<repository>`::
+(Required, string)
+Name of the snapshot repository whose integrity to verify.
+
+[[verify-repo-integrity-api-query-params]]
+==== {api-query-parms-title}
+
+The default values for the parameters of this API are designed to limit the
+impact of the integrity verification on other activities in your cluster. For
+instance, by default it will only use at most half of the `snapshot_meta`
+threads to verify the integrity of each snapshot, allowing other snapshot
+operations to use the other half of this thread pool.
+
+If you modify these parameters to speed up the verification process, you risk
+disrupting other snapshot-related operations in your cluster. For large
+repositories, consider setting up a separate single-node {es} cluster just for
+running the integrity verification API.
+
+`snapshot_verification_concurrency`::
+(Optional, integer) Specifies the number of snapshots to verify concurrently.
+Defaults to `0` which means to use at most half of the `snapshot_meta` thread
+pool at once.
+
+`index_verification_concurrency`::
+(Optional, integer) Specifies the number of indices to verify concurrently.
+Defaults to `0` which means to use the entire `snapshot_meta` thread pool.
+
+`meta_thread_pool_concurrency`::
+(Optional, integer) Specifies the maximum number of snapshot metadata
+operations to execute concurrently. Defaults to `0` which means to use at most
+half of the `snapshot_meta` thread pool at once.
+
+`index_snapshot_verification_concurrency`::
+(Optional, integer) Specifies the maximum number of index snapshots to verify
+concurrently within each index verification. Defaults to `1`.
+
+`max_failed_shard_snapshots`::
+(Optional, integer) Limits the number of shard snapshot failures to track
+during integrity verification, in order to avoid excessive resource usage. If
+your repository contains more than this number of shard snapshot failures then
+the verification will fail. Defaults to `10000`.
+
+`verify_blob_contents`::
+(Optional, boolean) Specifies whether to verify the checksum of every data blob
+in the repository. Defaults to `false`. If this feature is enabled, {es} will
+read the entire repository contents, which may be extremely slow and expensive.
+
+`blob_thread_pool_concurrency`::
+(Optional, integer) If `?verify_blob_contents` is `true`, this parameter
+specifies how many blobs to verify at once. Defaults to `1`.
+
+`max_bytes_per_sec`::
+(Optional, <<size-units, size units>>)
+If `?verify_blob_contents` is `true`, this parameter specifies the maximum
+amount of data that {es} will read from the repository every second. Defaults
+to `10mb`.
+
+[role="child_attributes"]
+[[verify-repo-integrity-api-response-body]]
+==== {api-response-body-title}
+
+The response exposes implementation details of the analysis which may change
+from version to version. The response body format is therefore not considered
+stable and may be different in newer versions.
+
+`log`::
+(array) A sequence of objects that report the progress of the analysis.
++
+.Properties of `log`
+[%collapsible%open]
+====
+`timestamp_in_millis`::
+(integer) The timestamp of this log entry, represented as the number of
+milliseconds since the {wikipedia}/Unix_time[Unix epoch].
+
+`timestamp`::
+(string) The timestamp of this log entry, represented as a string formatted
+according to {wikipedia}/ISO_8601[ISO 8601]. Only included if the
+<<common-options,`?human`>> flag is set.
+
+`snapshot`::
+(object) If the log entry pertains to a particular snapshot then the snapshot
+will be described in this object.
+
+`index`::
+(object) If the log entry pertains to a particular index then the index will be
+described in this object.
+
+`snapshot_restorability`::
+(object) If the log entry pertains to the restorability of an index then the
+details will be described in this object.
+
+`anomaly`::
+(string) If the log entry pertains to an anomaly in the repository contents then
+this string will describe the anomaly.
+
+`exception`::
+(object) If the log entry pertains to an exception that {es} encountered during
+the verification then the details will be included in this object.
+
+====
+
+`results`::
+(object) An object which describes the final results of the analysis.
++
+.Properties of `results`
+[%collapsible%open]
+====
+`status`::
+(object) The final status of the analysis task.
+
+`final_repository_generation`::
+(integer) The repository generation at the end of the analysis. If there were
+any writes to the repository during the analysis then this value will be
+different from the `generation` reported in the task status, and the analysis
+may have detected spurious anomalies due to the concurrent writes, or may even
+have failed to detect some anomalies in the repository contents.
+
+`total_anomalies`::
+(integer) The total number of anomalies detected during the analysis.
+
+`result`::
+(string) The final result of the analysis. If the repository contents appear to
+be intact then this will be the string `pass`. If this field is missing, or
+contains some other value, then the repository contents were not fully
+verified.
+
+====
+
+`exception`::
+(object) If the analysis encountered an exception which prevented it from
+completing successfully then this exception will be reported here.
diff --git a/docs/reference/snapshot-restore/register-repository.asciidoc b/docs/reference/snapshot-restore/register-repository.asciidoc
index 28b0640a8fae..2147ad3c684f 100644
--- a/docs/reference/snapshot-restore/register-repository.asciidoc
+++ b/docs/reference/snapshot-restore/register-repository.asciidoc
@@ -272,7 +272,9 @@ filesystem snapshot of this repository.
 When restoring a repository from a backup, you must not register the repository
 with {es} until the repository contents are fully restored. If you alter the
 contents of a repository while it is registered with {es} then the repository
-may become unreadable or may silently lose some of its contents.
+may become unreadable or may silently lose some of its contents. After
+restoring a repository from a backup, use the <<verify-repo-integrity-api>> API
+to verify its integrity before you start to use the repository.
 
 include::repository-azure.asciidoc[]
 include::repository-gcs.asciidoc[]
diff --git a/libs/core/src/main/java/org/elasticsearch/core/RestApiVersion.java b/libs/core/src/main/java/org/elasticsearch/core/RestApiVersion.java
index 74acb00925e5..e0c18f35f6cb 100644
--- a/libs/core/src/main/java/org/elasticsearch/core/RestApiVersion.java
+++ b/libs/core/src/main/java/org/elasticsearch/core/RestApiVersion.java
@@ -17,13 +17,16 @@
  */
 public enum RestApiVersion {
 
+    V_9(9),
+
     V_8(8),
 
-    @UpdateForV9 // v9 will not need to support the v7 REST API
     V_7(7);
 
     public final byte major;
 
+    @UpdateForV9
+    // We need to bump current and previous to V_9 and V_8, respectively
     private static final RestApiVersion CURRENT = V_8;
     private static final RestApiVersion PREVIOUS = V_7;
 
@@ -49,6 +52,7 @@ public static RestApiVersion minimumSupported() {
 
     public static Predicate<RestApiVersion> equalTo(RestApiVersion restApiVersion) {
         return switch (restApiVersion) {
+            case V_9 -> r -> r.major == V_9.major;
             case V_8 -> r -> r.major == V_8.major;
             case V_7 -> r -> r.major == V_7.major;
         };
@@ -56,11 +60,14 @@ public static Predicate<RestApiVersion> equalTo(RestApiVersion restApiVersion) {
 
     public static Predicate<RestApiVersion> onOrAfter(RestApiVersion restApiVersion) {
         return switch (restApiVersion) {
+            case V_9 -> r -> r.major >= V_9.major;
             case V_8 -> r -> r.major >= V_8.major;
             case V_7 -> r -> r.major >= V_7.major;
         };
     }
 
+    @UpdateForV9
+    // Right now we return api version 8 for major version 9 until we bump the api version above
     public static RestApiVersion forMajor(int major) {
         switch (major) {
             case 7 -> {
@@ -69,6 +76,9 @@ public static RestApiVersion forMajor(int major) {
             case 8 -> {
                 return V_8;
             }
+            case 9 -> {
+                return V_8;
+            }
             default -> throw new IllegalArgumentException("Unknown REST API version " + major);
         }
     }
diff --git a/libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java b/libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java
index c59f003d9cb0..63191084ca83 100644
--- a/libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java
+++ b/libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java
@@ -111,7 +111,7 @@ public String text() throws IOException {
     }
 
     private void throwOnNoText() {
-        throw new IllegalStateException("Can't get text on a " + currentToken() + " at " + getTokenLocation());
+        throw new IllegalArgumentException("Expected text at " + getTokenLocation() + " but found " + currentToken());
     }
 
     @Override
diff --git a/modules/aggregations/build.gradle b/modules/aggregations/build.gradle
index 91f3303d9d4a..5e233f423aa1 100644
--- a/modules/aggregations/build.gradle
+++ b/modules/aggregations/build.gradle
@@ -36,30 +36,6 @@ if (BuildParams.isSnapshotBuild() == false) {
   }
 }
 
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.skipTest("search.aggregation/20_terms/string profiler via global ordinals filters implementation", "The profiler results aren't backwards compatible.")
-  task.skipTest("search.aggregation/20_terms/string profiler via global ordinals native implementation", "The profiler results aren't backwards compatible.")
-  task.skipTest("search.aggregation/20_terms/string profiler via map", "The profiler results aren't backwards compatible.")
-  task.skipTest("search.aggregation/20_terms/numeric profiler", "The profiler results aren't backwards compatible.")
-  task.skipTest("search.aggregation/210_top_hits_nested_metric/top_hits aggregation with sequence numbers", "#42809 the use nested path and filter sort throws an exception")
-  task.skipTest("search.aggregation/370_doc_count_field/Test filters agg with doc_count", "Uses profiler for assertions which is not backwards compatible")
-
-  // In 8.9.0, the default t-digest algorithm changed from AVL-tree-based to hybrid, combining a sorted array of samples with a merging
-  // implementation. This change leads to slight different percentile results, compared to previous versions.
-  task.skipTest("search.aggregation/180_percentiles_tdigest_metric/Basic test", "Hybrid t-digest produces different results.")
-  task.skipTest("search.aggregation/180_percentiles_tdigest_metric/Non-keyed test", "Hybrid t-digest produces different results.")
-  task.skipTest("search.aggregation/180_percentiles_tdigest_metric/Only aggs test", "Hybrid t-digest produces different results.")
-  task.skipTest("search.aggregation/180_percentiles_tdigest_metric/Explicit Percents test", "Hybrid t-digest produces different results.")
-  task.skipTest("search.aggregation/180_percentiles_tdigest_metric/Metadata test", "Hybrid t-digest produces different results.")
-  task.skipTest("search.aggregation/180_percentiles_tdigest_metric/Filtered test", "Hybrid t-digest produces different results.")
-  task.skipTest("search.aggregation/420_percentile_ranks_tdigest_metric/filtered", "Hybrid t-digest produces different results.")
-
-  // Something has changed with response codes
-  task.skipTest("search.aggregation/20_terms/IP test", "Hybrid t-digest produces different results.")
-
-  task.addAllowedWarningRegex("\\[types removal\\].*")
-}
-
 artifacts {
   restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test"))
 }
diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle
index 1fc42a1b294f..b43124f52552 100644
--- a/modules/analysis-common/build.gradle
+++ b/modules/analysis-common/build.gradle
@@ -29,13 +29,6 @@ dependencies {
   clusterModules project(':modules:mapper-extras')
 }
 
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.skipTest("indices.analyze/10_analyze/htmlStrip_deprecated", "Cleanup versioned deprecations in analysis #41560")
-  task.skipTest("analysis-common/40_token_filters/delimited_payload_filter_error", "Remove preconfigured delimited_payload_filter #43686")
-  task.skipTest("analysis-common/20_analyzers/standard_html_strip", "Cleanup versioned deprecations in analysis #41560")
-  task.skipTest("search.query/50_queries_with_synonyms/Test common terms query with stacked tokens", "#42654 -  `common` query throws an exception")
-}
-
 artifacts {
   restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test"))
 }
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisPluginTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisPluginTests.java
index c18cb3dddf0a..4c8e88a0cedb 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisPluginTests.java
+++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisPluginTests.java
@@ -52,25 +52,6 @@ public void testNGramFilterInCustomAnalyzerDeprecationError() throws IOException
                 ex.getMessage()
             );
         }
-
-        final Settings settingsPre7 = Settings.builder()
-            .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
-            .put(
-                IndexMetadata.SETTING_VERSION_CREATED,
-                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_6_0)
-            )
-            .put("index.analysis.analyzer.custom_analyzer.type", "custom")
-            .put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard")
-            .putList("index.analysis.analyzer.custom_analyzer.filter", "my_ngram")
-            .put("index.analysis.filter.my_ngram.type", "nGram")
-            .build();
-        try (CommonAnalysisPlugin commonAnalysisPlugin = new CommonAnalysisPlugin()) {
-            createTestAnalysis(IndexSettingsModule.newIndexSettings("index", settingsPre7), settingsPre7, commonAnalysisPlugin);
-            assertWarnings(
-                "The [nGram] token filter name is deprecated and will be removed in a future version. "
-                    + "Please change the filter name to [ngram] instead."
-            );
-        }
     }
 
     /**
@@ -101,26 +82,6 @@ public void testEdgeNGramFilterInCustomAnalyzerDeprecationError() throws IOExcep
                 ex.getMessage()
             );
         }
-
-        final Settings settingsPre7 = Settings.builder()
-            .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
-            .put(
-                IndexMetadata.SETTING_VERSION_CREATED,
-                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_6_0)
-            )
-            .put("index.analysis.analyzer.custom_analyzer.type", "custom")
-            .put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard")
-            .putList("index.analysis.analyzer.custom_analyzer.filter", "my_ngram")
-            .put("index.analysis.filter.my_ngram.type", "edgeNGram")
-            .build();
-
-        try (CommonAnalysisPlugin commonAnalysisPlugin = new CommonAnalysisPlugin()) {
-            createTestAnalysis(IndexSettingsModule.newIndexSettings("index", settingsPre7), settingsPre7, commonAnalysisPlugin);
-            assertWarnings(
-                "The [edgeNGram] token filter name is deprecated and will be removed in a future version. "
-                    + "Please change the filter name to [edge_ngram] instead."
-            );
-        }
     }
 
     /**
@@ -128,39 +89,6 @@ public void testEdgeNGramFilterInCustomAnalyzerDeprecationError() throws IOExcep
      * disallow usages for indices created after 8.0
      */
     public void testNGramTokenizerDeprecation() throws IOException {
-        // tests for prebuilt tokenizer
-        doTestPrebuiltTokenizerDeprecation(
-            "nGram",
-            "ngram",
-            IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_5_2),
-            false
-        );
-        doTestPrebuiltTokenizerDeprecation(
-            "edgeNGram",
-            "edge_ngram",
-            IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_5_2),
-            false
-        );
-        doTestPrebuiltTokenizerDeprecation(
-            "nGram",
-            "ngram",
-            IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.V_7_6_0,
-                IndexVersion.max(IndexVersions.V_7_6_0, IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0))
-            ),
-            true
-        );
-        doTestPrebuiltTokenizerDeprecation(
-            "edgeNGram",
-            "edge_ngram",
-            IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.V_7_6_0,
-                IndexVersion.max(IndexVersions.V_7_6_0, IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0))
-            ),
-            true
-        );
         expectThrows(
             IllegalArgumentException.class,
             () -> doTestPrebuiltTokenizerDeprecation(
@@ -179,40 +107,6 @@ public void testNGramTokenizerDeprecation() throws IOException {
                 true
             )
         );
-
-        // same batch of tests for custom tokenizer definition in the settings
-        doTestCustomTokenizerDeprecation(
-            "nGram",
-            "ngram",
-            IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_5_2),
-            false
-        );
-        doTestCustomTokenizerDeprecation(
-            "edgeNGram",
-            "edge_ngram",
-            IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_5_2),
-            false
-        );
-        doTestCustomTokenizerDeprecation(
-            "nGram",
-            "ngram",
-            IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.V_7_6_0,
-                IndexVersion.max(IndexVersions.V_7_6_0, IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0))
-            ),
-            true
-        );
-        doTestCustomTokenizerDeprecation(
-            "edgeNGram",
-            "edge_ngram",
-            IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.V_7_6_0,
-                IndexVersion.max(IndexVersions.V_7_6_0, IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0))
-            ),
-            true
-        );
         expectThrows(
             IllegalArgumentException.class,
             () -> doTestCustomTokenizerDeprecation(
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java
index 412e3ba3e380..48bc60b5ad0b 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java
+++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java
@@ -17,14 +17,12 @@
 import org.elasticsearch.index.IndexService.IndexCreationContext;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.analysis.IndexAnalyzers;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
 import org.elasticsearch.indices.analysis.AnalysisModule;
 import org.elasticsearch.plugins.scanners.StablePluginsRegistry;
 import org.elasticsearch.test.ESTokenStreamTestCase;
 import org.elasticsearch.test.IndexSettingsModule;
-import org.elasticsearch.test.index.IndexVersionUtils;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -47,61 +45,10 @@ private IndexAnalyzers buildAnalyzers(IndexVersion version, String tokenizer) th
     }
 
     public void testPreConfiguredTokenizer() throws IOException {
-
-        // Before 7.3 we return ngrams of length 1 only
-        {
-            IndexVersion version = IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.V_7_0_0,
-                IndexVersionUtils.getPreviousVersion(IndexVersions.V_7_3_0)
-            );
-            try (IndexAnalyzers indexAnalyzers = buildAnalyzers(version, "edge_ngram")) {
-                NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
-                assertNotNull(analyzer);
-                assertAnalyzesTo(analyzer, "test", new String[] { "t" });
-            }
-        }
-
-        // Check deprecated name as well
-        {
-            IndexVersion version = IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.V_7_0_0,
-                IndexVersionUtils.getPreviousVersion(IndexVersions.V_7_3_0)
-            );
-            try (IndexAnalyzers indexAnalyzers = buildAnalyzers(version, "edgeNGram")) {
-                NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
-                assertNotNull(analyzer);
-                assertAnalyzesTo(analyzer, "test", new String[] { "t" });
-            }
-        }
-
-        // Afterwards, we return ngrams of length 1 and 2, to match the default factory settings
-        {
-            try (IndexAnalyzers indexAnalyzers = buildAnalyzers(IndexVersion.current(), "edge_ngram")) {
-                NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
-                assertNotNull(analyzer);
-                assertAnalyzesTo(analyzer, "test", new String[] { "t", "te" });
-            }
-        }
-
-        // Check deprecated name as well, needs version before 8.0 because throws IAE after that
-        {
-            try (
-                IndexAnalyzers indexAnalyzers = buildAnalyzers(
-                    IndexVersionUtils.randomVersionBetween(
-                        random(),
-                        IndexVersions.V_7_3_0,
-                        IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0)
-                    ),
-                    "edgeNGram"
-                )
-            ) {
-                NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
-                assertNotNull(analyzer);
-                assertAnalyzesTo(analyzer, "test", new String[] { "t", "te" });
-
-            }
+        try (IndexAnalyzers indexAnalyzers = buildAnalyzers(IndexVersion.current(), "edge_ngram")) {
+            NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
+            assertNotNull(analyzer);
+            assertAnalyzesTo(analyzer, "test", new String[] { "t", "te" });
         }
 
     }
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java
index 7a2bd2a82298..16288c754e92 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java
+++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java
@@ -337,7 +337,7 @@ public void testShingleFilters() {
         Settings settings = Settings.builder()
             .put(
                 IndexMetadata.SETTING_VERSION_CREATED,
-                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersion.current())
+                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current())
             )
             .put("path.home", createTempDir().toString())
             .put("index.analysis.filter.synonyms.type", "synonym")
@@ -391,7 +391,7 @@ public void testPreconfiguredTokenFilters() throws IOException {
         Settings settings = Settings.builder()
             .put(
                 IndexMetadata.SETTING_VERSION_CREATED,
-                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersion.current())
+                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current())
             )
             .put("path.home", createTempDir().toString())
             .build();
@@ -423,7 +423,7 @@ public void testDisallowedTokenFilters() throws IOException {
         Settings settings = Settings.builder()
             .put(
                 IndexMetadata.SETTING_VERSION_CREATED,
-                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersion.current())
+                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current())
             )
             .put("path.home", createTempDir().toString())
             .putList("common_words", "a", "b")
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
index 68e6d6661f94..39fda0636303 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
@@ -16,7 +16,6 @@
 import org.elasticsearch.index.IndexService.IndexCreationContext;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.analysis.AnalysisTestsHelper;
 import org.elasticsearch.index.analysis.IndexAnalyzers;
 import org.elasticsearch.index.analysis.NamedAnalyzer;
@@ -25,7 +24,6 @@
 import org.elasticsearch.plugins.scanners.StablePluginsRegistry;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.IndexSettingsModule;
-import org.elasticsearch.test.index.IndexVersionUtils;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -180,61 +178,26 @@ public void testIgnoreKeywords() throws IOException {
     }
 
     public void testPreconfiguredFilter() throws IOException {
-        // Before 7.3 we don't adjust offsets
-        {
-            Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()).build();
-            Settings indexSettings = Settings.builder()
-                .put(
-                    IndexMetadata.SETTING_VERSION_CREATED,
-                    IndexVersionUtils.randomVersionBetween(
-                        random(),
-                        IndexVersions.V_7_0_0,
-                        IndexVersionUtils.getPreviousVersion(IndexVersions.V_7_3_0)
-                    )
-                )
-                .put("index.analysis.analyzer.my_analyzer.tokenizer", "standard")
-                .putList("index.analysis.analyzer.my_analyzer.filter", "word_delimiter_graph")
-                .build();
-            IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", indexSettings);
-
-            try (
-                IndexAnalyzers indexAnalyzers = new AnalysisModule(
-                    TestEnvironment.newEnvironment(settings),
-                    Collections.singletonList(new CommonAnalysisPlugin()),
-                    new StablePluginsRegistry()
-                ).getAnalysisRegistry().build(IndexCreationContext.CREATE_INDEX, idxSettings)
-            ) {
-
-                NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
-                assertNotNull(analyzer);
-                assertAnalyzesTo(analyzer, "h100", new String[] { "h", "100" }, new int[] { 0, 0 }, new int[] { 4, 4 });
-
-            }
-        }
-
-        // Afger 7.3 we do adjust offsets
-        {
-            Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()).build();
-            Settings indexSettings = Settings.builder()
-                .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
-                .put("index.analysis.analyzer.my_analyzer.tokenizer", "standard")
-                .putList("index.analysis.analyzer.my_analyzer.filter", "word_delimiter_graph")
-                .build();
-            IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", indexSettings);
+        Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()).build();
+        Settings indexSettings = Settings.builder()
+            .put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
+            .put("index.analysis.analyzer.my_analyzer.tokenizer", "standard")
+            .putList("index.analysis.analyzer.my_analyzer.filter", "word_delimiter_graph")
+            .build();
+        IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", indexSettings);
 
-            try (
-                IndexAnalyzers indexAnalyzers = new AnalysisModule(
-                    TestEnvironment.newEnvironment(settings),
-                    Collections.singletonList(new CommonAnalysisPlugin()),
-                    new StablePluginsRegistry()
-                ).getAnalysisRegistry().build(IndexCreationContext.CREATE_INDEX, idxSettings)
-            ) {
+        try (
+            IndexAnalyzers indexAnalyzers = new AnalysisModule(
+                TestEnvironment.newEnvironment(settings),
+                Collections.singletonList(new CommonAnalysisPlugin()),
+                new StablePluginsRegistry()
+            ).getAnalysisRegistry().build(IndexCreationContext.CREATE_INDEX, idxSettings)
+        ) {
 
-                NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
-                assertNotNull(analyzer);
-                assertAnalyzesTo(analyzer, "h100", new String[] { "h", "100" }, new int[] { 0, 1 }, new int[] { 1, 4 });
+            NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
+            assertNotNull(analyzer);
+            assertAnalyzesTo(analyzer, "h100", new String[] { "h", "100" }, new int[] { 0, 1 }, new int[] { 1, 4 });
 
-            }
         }
     }
 }
diff --git a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
index 802e599b89f1..71c26372dac5 100644
--- a/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
+++ b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
@@ -317,22 +317,24 @@
           body:
             text: "a/b/c"
             explain: true
-            tokenizer:
-              type: PathHierarchy
+            tokenizer: path_hierarchy
     - length: { detail.tokenizer.tokens: 3 }
-    - match:  { detail.tokenizer.name: __anonymous__PathHierarchy }
+    - match:  { detail.tokenizer.name: path_hierarchy }
     - match:  { detail.tokenizer.tokens.0.token: a }
     - match:  { detail.tokenizer.tokens.1.token: a/b }
     - match:  { detail.tokenizer.tokens.2.token: a/b/c }
 
+---
+"PathHierarchy":
     - do:
         indices.analyze:
           body:
             text: "a/b/c"
             explain: true
-            tokenizer: path_hierarchy
+            tokenizer:
+              type: PathHierarchy
     - length: { detail.tokenizer.tokens: 3 }
-    - match:  { detail.tokenizer.name: path_hierarchy }
+    - match:  { detail.tokenizer.name: __anonymous__PathHierarchy }
     - match:  { detail.tokenizer.tokens.0.token: a }
     - match:  { detail.tokenizer.tokens.1.token: a/b }
     - match:  { detail.tokenizer.tokens.2.token: a/b/c }
diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java
index e3da69b7b2f0..ebe5546c0907 100644
--- a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java
+++ b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java
@@ -597,8 +597,8 @@ public void testResolvabilityOfDataStreamsInAPIs() throws Exception {
             false
         );
         verifyResolvability(dataStreamName, indicesAdmin().prepareGetSettings(dataStreamName), false);
-        verifyResolvability(dataStreamName, clusterAdmin().prepareHealth(dataStreamName), false);
-        verifyResolvability(dataStreamName, clusterAdmin().prepareState().setIndices(dataStreamName), false);
+        verifyResolvability(dataStreamName, clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, dataStreamName), false);
+        verifyResolvability(dataStreamName, clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setIndices(dataStreamName), false);
         verifyResolvability(dataStreamName, client().prepareFieldCaps(dataStreamName).setFields("*"), false);
         verifyResolvability(dataStreamName, indicesAdmin().prepareGetIndex().addIndices(dataStreamName), false);
         verifyResolvability(dataStreamName, indicesAdmin().prepareOpen(dataStreamName), false);
@@ -644,8 +644,8 @@ public void testResolvabilityOfDataStreamsInAPIs() throws Exception {
             indicesAdmin().prepareUpdateSettings(wildcardExpression).setSettings(Settings.builder().put("index.number_of_replicas", 0)),
             false
         );
-        verifyResolvability(wildcardExpression, clusterAdmin().prepareHealth(wildcardExpression), false);
-        verifyResolvability(wildcardExpression, clusterAdmin().prepareState().setIndices(wildcardExpression), false);
+        verifyResolvability(wildcardExpression, clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, wildcardExpression), false);
+        verifyResolvability(wildcardExpression, clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setIndices(wildcardExpression), false);
         verifyResolvability(wildcardExpression, client().prepareFieldCaps(wildcardExpression).setFields("*"), false);
         verifyResolvability(wildcardExpression, indicesAdmin().prepareGetIndex().addIndices(wildcardExpression), false);
         verifyResolvability(wildcardExpression, indicesAdmin().prepareOpen(wildcardExpression), false);
@@ -1594,7 +1594,7 @@ public void testClusterStateIncludeDataStream() throws Exception {
         client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).get();
 
         // when querying a backing index then the data stream should be included as well.
-        ClusterStateRequest request = new ClusterStateRequest().indices(".ds-metrics-foo-*000001");
+        ClusterStateRequest request = new ClusterStateRequest(TEST_REQUEST_TIMEOUT).indices(".ds-metrics-foo-*000001");
         ClusterState state = clusterAdmin().state(request).get().getState();
         assertThat(state.metadata().dataStreams().size(), equalTo(1));
         assertThat(state.metadata().dataStreams().get("metrics-foo").getName(), equalTo("metrics-foo"));
diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/IngestFailureStoreMetricsIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/IngestFailureStoreMetricsIT.java
index a52016e8c7f0..66bb06ca4240 100644
--- a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/IngestFailureStoreMetricsIT.java
+++ b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/IngestFailureStoreMetricsIT.java
@@ -19,14 +19,11 @@
 import org.elasticsearch.action.bulk.FailureStoreMetrics;
 import org.elasticsearch.action.datastreams.CreateDataStreamAction;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Template;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.index.mapper.DateFieldMapper;
@@ -237,7 +234,7 @@ public void testRerouteSuccessfulCorrectName() throws IOException {
         createDataStream();
 
         String destination = dataStream + "-destination";
-        final var createDataStreamRequest = new CreateDataStreamAction.Request(destination);
+        final var createDataStreamRequest = new CreateDataStreamAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, destination);
         assertAcked(client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).actionGet());
         createReroutePipeline(destination);
 
@@ -306,7 +303,7 @@ private void putComposableIndexTemplate(boolean failureStore) throws IOException
     }
 
     private void createDataStream() {
-        final var createDataStreamRequest = new CreateDataStreamAction.Request(dataStream);
+        final var createDataStreamRequest = new CreateDataStreamAction.Request(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, dataStream);
         assertAcked(client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest).actionGet());
     }
 
@@ -319,9 +316,7 @@ private void createReroutePipeline(String destination) {
     }
 
     private void createPipeline(String processor) {
-        String pipelineDefinition = Strings.format("{\"processors\": [{%s}]}", processor);
-        BytesReference bytes = new BytesArray(pipelineDefinition);
-        clusterAdmin().putPipeline(new PutPipelineRequest(pipeline, bytes, XContentType.JSON)).actionGet();
+        putJsonPipeline(pipeline, Strings.format("{\"processors\": [{%s}]}", processor));
     }
 
     private void indexDocs(String dataStream, int numDocs, String pipeline) {
diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/ResolveClusterDataStreamIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/ResolveClusterDataStreamIT.java
index ef785086a0ef..7fdc3b660433 100644
--- a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/ResolveClusterDataStreamIT.java
+++ b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/ResolveClusterDataStreamIT.java
@@ -405,7 +405,7 @@ private Map<String, Object> setupThreeClusters(boolean useAlias) throws IOExcept
         assertFalse(
             client(REMOTE_CLUSTER_2).admin()
                 .cluster()
-                .prepareHealth(remoteIndex2)
+                .prepareHealth(TEST_REQUEST_TIMEOUT, remoteIndex2)
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java
index ee17521ad757..65f911d27bf6 100644
--- a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java
+++ b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java
@@ -917,7 +917,7 @@ public void testDataLifecycleServiceConfiguresTheMergePolicy() throws Exception
         String firstGenerationIndex = getBackingIndices(dataStreamName).get(0);
         ClusterGetSettingsAction.Response response = client().execute(
             ClusterGetSettingsAction.INSTANCE,
-            new ClusterGetSettingsAction.Request()
+            new ClusterGetSettingsAction.Request(TEST_REQUEST_TIMEOUT)
         ).get();
         Settings clusterSettings = response.persistentSettings();
 
@@ -1093,7 +1093,7 @@ public void testLifecycleAppliedToFailureStore() throws Exception {
         // Let's verify the merge settings
         ClusterGetSettingsAction.Response response = client().execute(
             ClusterGetSettingsAction.INSTANCE,
-            new ClusterGetSettingsAction.Request()
+            new ClusterGetSettingsAction.Request(TEST_REQUEST_TIMEOUT)
         ).get();
         Settings clusterSettings = response.persistentSettings();
 
diff --git a/modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/LogsIndexModeCustomSettingsIT.java b/modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/LogsIndexModeCustomSettingsIT.java
index d3a2867fe2ec..f0279702812c 100644
--- a/modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/LogsIndexModeCustomSettingsIT.java
+++ b/modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/LogsIndexModeCustomSettingsIT.java
@@ -283,35 +283,6 @@ public void testOverrideIgnoreDynamicBeyondLimit() throws IOException {
         assertThat(ignoreDynamicBeyondLimitIndexSetting, equalTo("false"));
     }
 
-    public void testAddNonCompatibleMapping() throws IOException {
-        var nonCompatibleMappingAdditionTemplate = """
-            {
-              "template": {
-                "mappings": {
-                  "properties": {
-                    "bomb": {
-                      "type": "ip",
-                      "doc_values": false
-                    }
-                  }
-                }
-              }
-            }""";
-
-        Exception e = assertThrows(
-            ResponseException.class,
-            () -> putComponentTemplate(client, "logs@custom", nonCompatibleMappingAdditionTemplate)
-        );
-        assertThat(
-            e.getMessage(),
-            containsString("updating component template [logs@custom] results in invalid composable template [logs]")
-        );
-        assertThat(
-            e.getMessage(),
-            containsString("field [bomb] of type [ip] doesn't support synthetic source because it doesn't have doc values")
-        );
-    }
-
     private static Map<String, Object> getMapping(final RestClient client, final String indexName) throws IOException {
         final Request request = new Request("GET", "/" + indexName + "/_mapping");
 
diff --git a/modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/qa/StandardVersusLogsIndexModeRandomDataChallengeRestIT.java b/modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/qa/StandardVersusLogsIndexModeRandomDataChallengeRestIT.java
index ad4302cb04b4..404914cda6a7 100644
--- a/modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/qa/StandardVersusLogsIndexModeRandomDataChallengeRestIT.java
+++ b/modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/logsdb/qa/StandardVersusLogsIndexModeRandomDataChallengeRestIT.java
@@ -17,7 +17,6 @@
 import org.elasticsearch.logsdb.datageneration.DataGenerator;
 import org.elasticsearch.logsdb.datageneration.DataGeneratorSpecification;
 import org.elasticsearch.logsdb.datageneration.FieldDataGenerator;
-import org.elasticsearch.logsdb.datageneration.FieldType;
 import org.elasticsearch.logsdb.datageneration.datasource.DataSourceHandler;
 import org.elasticsearch.logsdb.datageneration.datasource.DataSourceRequest;
 import org.elasticsearch.logsdb.datageneration.datasource.DataSourceResponse;
@@ -78,7 +77,18 @@ public DataSourceResponse.ObjectMappingParametersGenerator handle(DataSourceRequ
         }))
             .withPredefinedFields(
                 List.of(
-                    new PredefinedField.WithType("host.name", FieldType.KEYWORD),
+                    // Customized because it always needs doc_values for aggregations.
+                    new PredefinedField.WithGenerator("host.name", new FieldDataGenerator() {
+                        @Override
+                        public CheckedConsumer<XContentBuilder, IOException> mappingWriter() {
+                            return b -> b.startObject().field("type", "keyword").endObject();
+                        }
+
+                        @Override
+                        public CheckedConsumer<XContentBuilder, IOException> fieldValueGenerator() {
+                            return b -> b.value(randomAlphaOfLength(5));
+                        }
+                    }),
                     // Needed for terms query
                     new PredefinedField.WithGenerator("method", new FieldDataGenerator() {
                         @Override
diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java
index 99d4f8bb7cd2..d8f8ae9d080a 100644
--- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java
+++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleService.java
@@ -561,7 +561,13 @@ private Set<Index> waitForInProgressOrTriggerDownsampling(
      * Issues a request downsample the source index to the downsample index for the specified round.
      */
     private void downsampleIndexOnce(DataStreamLifecycle.Downsampling.Round round, String sourceIndex, String downsampleIndexName) {
-        DownsampleAction.Request request = new DownsampleAction.Request(sourceIndex, downsampleIndexName, null, round.config());
+        DownsampleAction.Request request = new DownsampleAction.Request(
+            TimeValue.THIRTY_SECONDS /* TODO should this be longer/configurable? */,
+            sourceIndex,
+            downsampleIndexName,
+            null,
+            round.config()
+        );
         transportActionsDeduplicator.executeOnce(
             request,
             new ErrorRecordingActionListener(
diff --git a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/rest/RestGetDataStreamsAction.java b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/rest/RestGetDataStreamsAction.java
index c3fd47961631..29cda588bc26 100644
--- a/modules/data-streams/src/main/java/org/elasticsearch/datastreams/rest/RestGetDataStreamsAction.java
+++ b/modules/data-streams/src/main/java/org/elasticsearch/datastreams/rest/RestGetDataStreamsAction.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestUtils;
@@ -61,17 +62,19 @@ public Set<String> supportedCapabilities() {
 
     @Override
     public Set<String> supportedQueryParameters() {
-        return Set.of(
-            "name",
-            "include_defaults",
-            "timeout",
-            "master_timeout",
-            RestRequest.PATH_RESTRICTED,
-            IndicesOptions.WildcardOptions.EXPAND_WILDCARDS,
-            IndicesOptions.ConcreteTargetOptions.IGNORE_UNAVAILABLE,
-            IndicesOptions.WildcardOptions.ALLOW_NO_INDICES,
-            IndicesOptions.GatekeeperOptions.IGNORE_THROTTLED,
-            "verbose"
+        return Sets.union(
+            RestRequest.INTERNAL_MARKER_REQUEST_PARAMETERS,
+            Set.of(
+                "name",
+                "include_defaults",
+                "timeout",
+                "master_timeout",
+                IndicesOptions.WildcardOptions.EXPAND_WILDCARDS,
+                IndicesOptions.ConcreteTargetOptions.IGNORE_UNAVAILABLE,
+                IndicesOptions.WildcardOptions.ALLOW_NO_INDICES,
+                IndicesOptions.GatekeeperOptions.IGNORE_THROTTLED,
+                "verbose"
+            )
         );
     }
 }
diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamsStatsTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamsStatsTests.java
index bc313d145c17..b2ddab164b31 100644
--- a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamsStatsTests.java
+++ b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamsStatsTests.java
@@ -131,7 +131,10 @@ public void testStatsClosedBackingIndexDataStream() throws Exception {
         assertTrue(indicesAdmin().close(new CloseIndexRequest(".ds-" + dataStreamName + "-*-000001")).actionGet().isAcknowledged());
 
         assertBusy(
-            () -> assertNotEquals(ClusterHealthStatus.RED, clusterAdmin().health(new ClusterHealthRequest()).actionGet().getStatus())
+            () -> assertNotEquals(
+                ClusterHealthStatus.RED,
+                clusterAdmin().health(new ClusterHealthRequest(TEST_REQUEST_TIMEOUT)).actionGet().getStatus()
+            )
         );
 
         DataStreamsStatsAction.Response stats = getDataStreamsStats();
diff --git a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/LookAHeadTimeTests.java b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/LookAHeadTimeTests.java
index a61258726246..e3d5ad0d63e8 100644
--- a/modules/data-streams/src/test/java/org/elasticsearch/datastreams/LookAHeadTimeTests.java
+++ b/modules/data-streams/src/test/java/org/elasticsearch/datastreams/LookAHeadTimeTests.java
@@ -118,7 +118,9 @@ public void testLookAheadTimeSettingHigherThanTimeSeriesPollIntervalSetting() {
     }
 
     private void updateClusterSettings(Settings settings) {
-        clusterAdmin().updateSettings(new ClusterUpdateSettingsRequest().persistentSettings(settings)).actionGet();
+        clusterAdmin().updateSettings(
+            new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).persistentSettings(settings)
+        ).actionGet();
     }
 
     private void updateIndexSettings(Settings settings) {
diff --git a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml
index 991504b27f65..af3204ed443a 100644
--- a/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml
+++ b/modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/190_failure_store_redirection.yml
@@ -748,3 +748,43 @@ teardown:
       indices.delete:
         index: .fs-logs-foobar-*
   - is_true: acknowledged
+
+---
+"Version conflicts are not redirected to failure store":
+  - requires:
+      cluster_features: ["gte_v8.16.0"]
+      reason: "Redirecting version conflicts to the failure store is considered a bug fixed in 8.16"
+      test_runner_features: [allowed_warnings, contains]
+
+  - do:
+      allowed_warnings:
+        - "index template [generic_logs_template] has index patterns [logs-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [generic_logs_template] will take precedence during new index creation"
+      indices.put_index_template:
+        name: generic_logs_template
+        body:
+          index_patterns: logs-*
+          data_stream:
+            failure_store: true
+          template:
+            settings:
+              number_of_shards:   1
+              number_of_replicas: 1
+            mappings:
+              properties:
+                '@timestamp':
+                  type: date
+                count:
+                  type: long
+
+  - do:
+      bulk:
+        refresh: true
+        body:
+          - '{ "create": { "_index": "logs-foobar", "_id": "1" } }'
+          - '{ "@timestamp": "2022-01-01", "baz": "quick", "a": "brown", "b": "fox" }'
+          - '{ "create": { "_index": "logs-foobar", "_id": "1" } }'
+          - '{ "@timestamp": "2022-01-01", "baz": "lazy", "a": "dog" }'
+  - is_true: errors
+  - match: { items.1.create._index: '/\.ds-logs-foobar-(\d{4}\.\d{2}\.\d{2}-)?000001/' }
+  - match: { items.1.create.status: 409 }
+  - match: { items.1.create.error.type: version_conflict_engine_exception}
diff --git a/modules/health-shards-availability/build.gradle b/modules/health-shards-availability/build.gradle
index 6c7cf5a19c8a..b98824d84af9 100644
--- a/modules/health-shards-availability/build.gradle
+++ b/modules/health-shards-availability/build.gradle
@@ -19,7 +19,3 @@ restResources {
     include '_common', 'indices', 'index', 'cluster', 'nodes', 'get', 'ingest'
   }
 }
-
-tasks.named("yamlRestTestV7CompatTransform").configure {task ->
-  task.addAllowedWarningRegex("setting \\[ecs\\] is deprecated as ECS format is the default and only option")
-}
diff --git a/modules/ingest-attachment/build.gradle b/modules/ingest-attachment/build.gradle
index 89f0b530713c..f708448c10d7 100644
--- a/modules/ingest-attachment/build.gradle
+++ b/modules/ingest-attachment/build.gradle
@@ -138,14 +138,6 @@ tasks.named("forbiddenPatterns").configure {
   exclude '**/text-cjk-*.txt'
 }
 
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  // 2 new tika metadata fields are returned in v8
-  task.replaceValueInLength("_source.attachment", 8, "Test ingest attachment processor with .doc file")
-  task.replaceValueInLength("_source.attachment", 8, "Test ingest attachment processor with .docx file")
-  // Tika 2.4.0 adds an extra newline for each embedded attachment, making the content_length larger
-  task.replaceValueInMatch("_source.attachment.content_length", 20, "Test ingest attachment processor with .docx file")
-}
-
 tasks.named("thirdPartyAudit").configure {
   ignoreMissingClasses()
 }
@@ -153,5 +145,5 @@ tasks.named("thirdPartyAudit").configure {
 if (BuildParams.inFipsJvm) {
   tasks.named("test").configure { enabled = false }
   tasks.named("yamlRestTest").configure { enabled = false };
-  tasks.named("yamlRestTestV7CompatTest").configure { enabled = false };
+  tasks.named("yamlRestCompatTest").configure { enabled = false };
 }
diff --git a/modules/ingest-common/build.gradle b/modules/ingest-common/build.gradle
index d7100745680b..ee923132aa6a 100644
--- a/modules/ingest-common/build.gradle
+++ b/modules/ingest-common/build.gradle
@@ -49,7 +49,3 @@ tasks.named("thirdPartyAudit").configure {
     'org.apache.commons.logging.LogFactory',
   )
 }
-
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.addAllowedWarningRegex("\\[types removal\\].*")
-}
diff --git a/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/IngestRestartIT.java b/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/IngestRestartIT.java
index f1c592e6e834..4a0a55dce948 100644
--- a/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/IngestRestartIT.java
+++ b/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/IngestRestartIT.java
@@ -15,14 +15,11 @@
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.get.MultiGetResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.client.internal.Requests;
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.node.DiscoveryNodeRole;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
 import org.elasticsearch.core.Strings;
@@ -79,7 +76,7 @@ public void testFailureInConditionalProcessor() {
         internalCluster().ensureAtLeastNumDataNodes(1);
         internalCluster().startMasterOnlyNode();
         final String pipelineId = "foo";
-        clusterAdmin().preparePutPipeline(pipelineId, new BytesArray(Strings.format("""
+        putJsonPipeline(pipelineId, Strings.format("""
             {
               "processors": [
                 {
@@ -99,7 +96,7 @@ public void testFailureInConditionalProcessor() {
                   }
                 }
               ]
-            }""", MockScriptEngine.NAME)), XContentType.JSON).get();
+            }""", MockScriptEngine.NAME));
 
         Exception e = expectThrows(
             Exception.class,
@@ -126,22 +123,16 @@ public void testScriptDisabled() throws Exception {
         String pipelineIdWithScript = pipelineIdWithoutScript + "_script";
         internalCluster().startNode();
 
-        BytesReference pipelineWithScript = new BytesArray(Strings.format("""
+        putJsonPipeline(pipelineIdWithScript, Strings.format("""
             {
               "processors": [ { "script": { "lang": "%s", "source": "my_script" } } ]
             }""", MockScriptEngine.NAME));
-        BytesReference pipelineWithoutScript = new BytesArray("""
+        putJsonPipeline(pipelineIdWithoutScript, """
             {
               "processors": [ { "set": { "field": "y", "value": 0 } } ]
             }""");
 
-        Consumer<String> checkPipelineExists = (id) -> assertThat(
-            clusterAdmin().prepareGetPipeline(id).get().pipelines().get(0).getId(),
-            equalTo(id)
-        );
-
-        clusterAdmin().preparePutPipeline(pipelineIdWithScript, pipelineWithScript, XContentType.JSON).get();
-        clusterAdmin().preparePutPipeline(pipelineIdWithoutScript, pipelineWithoutScript, XContentType.JSON).get();
+        Consumer<String> checkPipelineExists = (id) -> assertThat(getPipelines(id).pipelines().get(0).getId(), equalTo(id));
 
         checkPipelineExists.accept(pipelineIdWithScript);
         checkPipelineExists.accept(pipelineIdWithoutScript);
@@ -197,14 +188,13 @@ public void testPipelineWithScriptProcessorThatHasStoredScript() throws Exceptio
         putJsonStoredScript("1", Strings.format("""
             {"script": {"lang": "%s", "source": "my_script"} }
             """, MockScriptEngine.NAME));
-        BytesReference pipeline = new BytesArray("""
+        putJsonPipeline("_id", """
             {
               "processors" : [
                   {"set" : {"field": "y", "value": 0}},
                   {"script" : {"id": "1"}}
               ]
             }""");
-        clusterAdmin().preparePutPipeline("_id", pipeline, XContentType.JSON).get();
 
         prepareIndex("index").setId("1").setSource("x", 0).setPipeline("_id").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
 
@@ -232,13 +222,12 @@ public void testWithDedicatedIngestNode() throws Exception {
         String node = internalCluster().startNode();
         String ingestNode = internalCluster().startNode(onlyRole(DiscoveryNodeRole.INGEST_ROLE));
 
-        BytesReference pipeline = new BytesArray("""
+        putJsonPipeline("_id", """
             {
               "processors" : [
                   {"set" : {"field": "y", "value": 0}}
               ]
             }""");
-        clusterAdmin().preparePutPipeline("_id", pipeline, XContentType.JSON).get();
 
         prepareIndex("index").setId("1").setSource("x", 0).setPipeline("_id").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
 
@@ -264,7 +253,7 @@ public void testWithDedicatedIngestNode() throws Exception {
     public void testDefaultPipelineWaitForClusterStateRecovered() throws Exception {
         internalCluster().startNode();
 
-        final var pipeline = new BytesArray("""
+        putJsonPipeline("test_pipeline", """
             {
               "processors" : [
                 {
@@ -275,8 +264,8 @@ public void testDefaultPipelineWaitForClusterStateRecovered() throws Exception {
                 }
               ]
             }""");
+
         final TimeValue timeout = TimeValue.timeValueSeconds(10);
-        client().admin().cluster().preparePutPipeline("test_pipeline", pipeline, XContentType.JSON).get(timeout);
         client().admin().indices().preparePutTemplate("pipeline_template").setPatterns(Collections.singletonList("*")).setSettings("""
             {
               "index" : {
@@ -357,16 +346,13 @@ public void testForwardBulkWithSystemWritePoolDisabled() throws Exception {
         // Create Bulk Request
         createIndex("index");
 
-        BytesReference source = new BytesArray("""
+        putJsonPipeline("_id", """
             {
               "processors" : [
                   {"set" : {"field": "y", "value": 0}}
               ]
             }""");
 
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest("_id", source, XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).get();
-
         int numRequests = scaledRandomIntBetween(32, 128);
         BulkRequest bulkRequest = new BulkRequest();
         BulkResponse response;
diff --git a/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/ManyNestedPipelinesIT.java b/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/ManyNestedPipelinesIT.java
index c9f3f023b43e..2c9ea27805a1 100644
--- a/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/ManyNestedPipelinesIT.java
+++ b/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/ManyNestedPipelinesIT.java
@@ -15,7 +15,6 @@
 import org.elasticsearch.action.ingest.SimulateDocumentVerboseResult;
 import org.elasticsearch.action.ingest.SimulatePipelineResponse;
 import org.elasticsearch.action.ingest.SimulateProcessorResult;
-import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.ingest.GraphStructureException;
@@ -166,7 +165,7 @@ private void createChainedPipelines(String prefix, int count) {
     private void createChainedPipeline(String prefix, int number) {
         String pipelineId = prefix + "pipeline_" + number;
         String nextPipelineId = prefix + "pipeline_" + (number + 1);
-        String pipelineTemplate = """
+        putJsonPipeline(pipelineId, Strings.format("""
             {
                 "processors": [
                     {
@@ -176,9 +175,7 @@ private void createChainedPipeline(String prefix, int number) {
                     }
                 ]
             }
-            """;
-        String pipeline = Strings.format(pipelineTemplate, nextPipelineId);
-        clusterAdmin().preparePutPipeline(pipelineId, new BytesArray(pipeline), XContentType.JSON).get();
+            """, nextPipelineId));
     }
 
     private void createLastPipeline(String prefix, int number) {
@@ -195,6 +192,6 @@ private void createLastPipeline(String prefix, int number) {
                 ]
             }
             """;
-        clusterAdmin().preparePutPipeline(pipelineId, new BytesArray(pipeline), XContentType.JSON).get();
+        putJsonPipeline(pipelineId, pipeline);
     }
 }
diff --git a/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorWithPipelinesIT.java b/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorWithPipelinesIT.java
index 7f0910ea5cc4..0b93609b3156 100644
--- a/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorWithPipelinesIT.java
+++ b/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/plugins/internal/XContentMeteringParserDecoratorWithPipelinesIT.java
@@ -10,9 +10,6 @@
 
 import org.elasticsearch.action.DocWriteRequest;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.mapper.ParsedDocument;
 import org.elasticsearch.ingest.common.IngestCommonPlugin;
@@ -21,7 +18,6 @@
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.xcontent.FilterXContentParserWrapper;
 import org.elasticsearch.xcontent.XContentParser;
-import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -44,7 +40,7 @@ public class XContentMeteringParserDecoratorWithPipelinesIT extends ESIntegTestC
     public void testDocumentIsReportedWithPipelines() throws Exception {
         hasWrappedParser = false;
         // pipeline adding fields, changing destination is not affecting reporting
-        final BytesReference pipelineBody = new BytesArray("""
+        putJsonPipeline("pipeline", """
             {
               "processors": [
                 {
@@ -62,7 +58,6 @@ public void testDocumentIsReportedWithPipelines() throws Exception {
               ]
             }
             """);
-        clusterAdmin().putPipeline(new PutPipelineRequest("pipeline", pipelineBody, XContentType.JSON)).actionGet();
 
         client().index(
             new IndexRequest(TEST_INDEX_NAME).setPipeline("pipeline")
diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle
index bc5bb165cd0d..64a679581f76 100644
--- a/modules/ingest-geoip/build.gradle
+++ b/modules/ingest-geoip/build.gradle
@@ -84,11 +84,6 @@ tasks.named("dependencyLicenses").configure {
   ignoreFile 'elastic-geoip-database-service-agreement-LICENSE.txt'
 }
 
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.skipTestsByFilePattern("**/ingest_geoip/20_geoip_processor.yml", "from 8.0 yaml rest tests use geoip test fixture and default geoip are no longer packaged. In 7.x yaml tests used default databases which makes tests results very different, so skipping these tests")
-  // task.skipTest("lang_mustache/50_multi_search_template/Multi-search template with errors", "xxx")
-}
-
 artifacts {
   restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test"))
 }
diff --git a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle
index a97664923438..e930b4ca3823 100644
--- a/modules/ingest-geoip/qa/full-cluster-restart/build.gradle
+++ b/modules/ingest-geoip/qa/full-cluster-restart/build.gradle
@@ -20,12 +20,10 @@ dependencies {
   javaRestTestImplementation(testArtifact(project(":qa:full-cluster-restart"), "javaRestTest"))
 }
 
-assert Version.fromString(VersionProperties.getVersions().get("elasticsearch")).getMajor() == 8 :
-  "If we are targeting a branch other than 8, we should enable migration tests"
 
 // once we are ready to test migrations from 8.x to 9.x, we can set the compatible version to 8.0.0
 // see https://github.com/elastic/elasticsearch/pull/93666
-BuildParams.bwcVersions.withWireCompatible(v -> v.before("7.0.0")) { bwcVersion, baseName ->
+BuildParams.bwcVersions.withWireCompatible(v -> v.before("9.0.0")) { bwcVersion, baseName ->
   tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {
     usesBwcDistribution(bwcVersion)
     systemProperty("tests.old_cluster_version", bwcVersion)
diff --git a/modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java b/modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java
index 4f8abf4b8239..b4d178868811 100644
--- a/modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java
+++ b/modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java
@@ -12,7 +12,9 @@
 import com.carrotsearch.randomizedtesting.annotations.Name;
 
 import org.apache.http.util.EntityUtils;
+import org.apache.lucene.tests.util.LuceneTestCase;
 import org.elasticsearch.client.Request;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.FeatureFlag;
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
@@ -31,6 +33,8 @@
 
 import static org.hamcrest.Matchers.contains;
 
+@UpdateForV9
+@LuceneTestCase.AwaitsFix(bugUrl = "we need to figure out the index migrations here for 9.0")
 public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCase {
 
     private static final boolean useFixture = Boolean.getBoolean("geoip_use_service") == false;
diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloaderIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloaderIT.java
index cc757c413713..15e7299dc104 100644
--- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloaderIT.java
+++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloaderIT.java
@@ -19,10 +19,8 @@
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.MockSecureSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.CollectionUtils;
@@ -36,9 +34,7 @@
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.transport.RemoteTransportException;
-import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.xcontent.json.JsonXContent;
 import org.junit.ClassRule;
 
 import java.io.IOException;
@@ -47,7 +43,6 @@
 
 import static org.elasticsearch.ingest.EnterpriseGeoIpTask.ENTERPRISE_GEOIP_DOWNLOADER;
 import static org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderTaskExecutor.MAXMIND_LICENSE_KEY_SETTING;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 
 public class EnterpriseGeoIpDownloaderIT extends ESIntegTestCase {
@@ -155,31 +150,24 @@ private void configureDatabase(String databaseType) throws Exception {
     }
 
     private void createGeoIpPipeline(String pipelineName, String databaseType, String sourceField, String targetField) throws IOException {
-        final BytesReference bytes;
-        try (XContentBuilder builder = JsonXContent.contentBuilder()) {
-            builder.startObject();
+        putJsonPipeline(pipelineName, (builder, params) -> {
+            builder.field("description", "test");
+            builder.startArray("processors");
             {
-                builder.field("description", "test");
-                builder.startArray("processors");
+                builder.startObject();
                 {
-                    builder.startObject();
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", sourceField);
-                            builder.field("target_field", targetField);
-                            builder.field("database_file", databaseType + ".mmdb");
-                        }
-                        builder.endObject();
+                        builder.field("field", sourceField);
+                        builder.field("target_field", targetField);
+                        builder.field("database_file", databaseType + ".mmdb");
                     }
                     builder.endObject();
                 }
-                builder.endArray();
+                builder.endObject();
             }
-            builder.endObject();
-            bytes = BytesReference.bytes(builder);
-        }
-        assertAcked(clusterAdmin().putPipeline(new PutPipelineRequest(pipelineName, bytes, XContentType.JSON)).actionGet());
+            return builder.endArray();
+        });
     }
 
     private String ingestDocument(String indexName, String pipelineName, String sourceField) {
diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java
index d994bd70eb7a..41d711be2dee 100644
--- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java
+++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java
@@ -530,91 +530,84 @@ private void putGeoIpPipeline(String pipelineId) throws IOException {
      * @throws IOException
      */
     private void putGeoIpPipeline(String pipelineId, boolean downloadDatabaseOnPipelineCreation) throws IOException {
-        BytesReference bytes;
-        try (XContentBuilder builder = JsonXContent.contentBuilder()) {
-            builder.startObject();
+        putJsonPipeline(pipelineId, ((builder, params) -> {
+            builder.startArray("processors");
             {
-                builder.startArray("processors");
+                /*
+                 * First we add a non-geo pipeline with a random field value. This is purely here so that each call to this method
+                 * creates a pipeline that is unique. Creating the a pipeline twice with the same ID and exact same bytes
+                 * results in a no-op, meaning that the pipeline won't actually be updated and won't actually trigger all of the
+                 * things we expect it to.
+                 */
+                builder.startObject();
                 {
-                    /*
-                     * First we add a non-geo pipeline with a random field value. This is purely here so that each call to this method
-                     * creates a pipeline that is unique. Creating the a pipeline twice with the same ID and exact same bytes
-                     * results in a no-op, meaning that the pipeline won't actually be updated and won't actually trigger all of the
-                     * things we expect it to.
-                     */
-                    builder.startObject();
+                    builder.startObject(NonGeoProcessorsPlugin.NON_GEO_PROCESSOR_TYPE);
                     {
-                        builder.startObject(NonGeoProcessorsPlugin.NON_GEO_PROCESSOR_TYPE);
-                        {
-                            builder.field("randomField", randomAlphaOfLength(20));
-                        }
-                        builder.endObject();
+                        builder.field("randomField", randomAlphaOfLength(20));
                     }
                     builder.endObject();
+                }
+                builder.endObject();
 
-                    builder.startObject();
+                builder.startObject();
+                {
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-city");
-                            builder.field("database_file", "GeoLite2-City.mmdb");
-                            if (downloadDatabaseOnPipelineCreation == false || randomBoolean()) {
-                                builder.field("download_database_on_pipeline_creation", downloadDatabaseOnPipelineCreation);
-                            }
+                        builder.field("field", "ip");
+                        builder.field("target_field", "ip-city");
+                        builder.field("database_file", "GeoLite2-City.mmdb");
+                        if (downloadDatabaseOnPipelineCreation == false || randomBoolean()) {
+                            builder.field("download_database_on_pipeline_creation", downloadDatabaseOnPipelineCreation);
                         }
-                        builder.endObject();
                     }
                     builder.endObject();
-                    builder.startObject();
+                }
+                builder.endObject();
+                builder.startObject();
+                {
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-country");
-                            builder.field("database_file", "GeoLite2-Country.mmdb");
-                            if (downloadDatabaseOnPipelineCreation == false || randomBoolean()) {
-                                builder.field("download_database_on_pipeline_creation", downloadDatabaseOnPipelineCreation);
-                            }
+                        builder.field("field", "ip");
+                        builder.field("target_field", "ip-country");
+                        builder.field("database_file", "GeoLite2-Country.mmdb");
+                        if (downloadDatabaseOnPipelineCreation == false || randomBoolean()) {
+                            builder.field("download_database_on_pipeline_creation", downloadDatabaseOnPipelineCreation);
                         }
-                        builder.endObject();
                     }
                     builder.endObject();
-                    builder.startObject();
+                }
+                builder.endObject();
+                builder.startObject();
+                {
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-asn");
-                            builder.field("database_file", "GeoLite2-ASN.mmdb");
-                            if (downloadDatabaseOnPipelineCreation == false || randomBoolean()) {
-                                builder.field("download_database_on_pipeline_creation", downloadDatabaseOnPipelineCreation);
-                            }
+                        builder.field("field", "ip");
+                        builder.field("target_field", "ip-asn");
+                        builder.field("database_file", "GeoLite2-ASN.mmdb");
+                        if (downloadDatabaseOnPipelineCreation == false || randomBoolean()) {
+                            builder.field("download_database_on_pipeline_creation", downloadDatabaseOnPipelineCreation);
                         }
-                        builder.endObject();
                     }
                     builder.endObject();
-                    builder.startObject();
+                }
+                builder.endObject();
+                builder.startObject();
+                {
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-city");
-                            builder.field("database_file", "MyCustomGeoLite2-City.mmdb");
-                            if (downloadDatabaseOnPipelineCreation == false || randomBoolean()) {
-                                builder.field("download_database_on_pipeline_creation", downloadDatabaseOnPipelineCreation);
-                            }
+                        builder.field("field", "ip");
+                        builder.field("target_field", "ip-city");
+                        builder.field("database_file", "MyCustomGeoLite2-City.mmdb");
+                        if (downloadDatabaseOnPipelineCreation == false || randomBoolean()) {
+                            builder.field("download_database_on_pipeline_creation", downloadDatabaseOnPipelineCreation);
                         }
-                        builder.endObject();
                     }
                     builder.endObject();
                 }
-                builder.endArray();
+                builder.endObject();
             }
-            builder.endObject();
-            bytes = BytesReference.bytes(builder);
-        }
-        assertAcked(clusterAdmin().preparePutPipeline(pipelineId, bytes, XContentType.JSON).get());
+            return builder.endArray();
+        }));
     }
 
     /**
@@ -626,40 +619,33 @@ private void putNonGeoipPipeline(String pipelineId) throws IOException {
          * Adding the exact same pipeline twice is treated as a no-op. The random values that go into randomField make each pipeline
          * created by this method is unique to avoid this.
          */
-        BytesReference bytes;
-        try (XContentBuilder builder = JsonXContent.contentBuilder()) {
-            builder.startObject();
+        putJsonPipeline(pipelineId, ((builder, params) -> {
+            builder.startArray("processors");
             {
-                builder.startArray("processors");
+                builder.startObject();
                 {
-                    builder.startObject();
-                    {
-                        builder.startObject(NonGeoProcessorsPlugin.NON_GEO_PROCESSOR_TYPE);
-                        builder.field("randomField", randomAlphaOfLength(20));
-                        builder.endObject();
-                    }
+                    builder.startObject(NonGeoProcessorsPlugin.NON_GEO_PROCESSOR_TYPE);
+                    builder.field("randomField", randomAlphaOfLength(20));
                     builder.endObject();
-                    builder.startObject();
-                    {
-                        builder.startObject(NonGeoProcessorsPlugin.NON_GEO_PROCESSOR_TYPE);
-                        builder.field("randomField", randomAlphaOfLength(20));
-                        builder.endObject();
-                    }
+                }
+                builder.endObject();
+                builder.startObject();
+                {
+                    builder.startObject(NonGeoProcessorsPlugin.NON_GEO_PROCESSOR_TYPE);
+                    builder.field("randomField", randomAlphaOfLength(20));
                     builder.endObject();
-                    builder.startObject();
-                    {
-                        builder.startObject(NonGeoProcessorsPlugin.NON_GEO_PROCESSOR_TYPE);
-                        builder.field("randomField", randomAlphaOfLength(20));
-                        builder.endObject();
-                    }
+                }
+                builder.endObject();
+                builder.startObject();
+                {
+                    builder.startObject(NonGeoProcessorsPlugin.NON_GEO_PROCESSOR_TYPE);
+                    builder.field("randomField", randomAlphaOfLength(20));
                     builder.endObject();
                 }
-                builder.endArray();
+                builder.endObject();
             }
-            builder.endObject();
-            bytes = BytesReference.bytes(builder);
-        }
-        assertAcked(clusterAdmin().preparePutPipeline(pipelineId, bytes, XContentType.JSON).get());
+            return builder.endArray();
+        }));
     }
 
     private List<Path> getGeoIpTmpDirs() throws IOException {
diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java
index ec54317e144d..51ad7cedba98 100644
--- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java
+++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderStatsIT.java
@@ -19,8 +19,6 @@
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
-import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.xcontent.json.JsonXContent;
 import org.junit.After;
 
 import java.io.IOException;
@@ -29,7 +27,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.xcontent.ToXContent.EMPTY_PARAMS;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.equalTo;
@@ -98,30 +95,23 @@ public void testStats() throws Exception {
     }
 
     private void putPipeline() throws IOException {
-        BytesReference bytes;
-        try (XContentBuilder builder = JsonXContent.contentBuilder()) {
-            builder.startObject();
+        putJsonPipeline("_id", (builder, params) -> {
+            builder.startArray("processors");
             {
-                builder.startArray("processors");
+                builder.startObject();
                 {
-                    builder.startObject();
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-city");
-                            builder.field("database_file", "GeoLite2-City.mmdb");
-                        }
-                        builder.endObject();
+                        builder.field("field", "ip");
+                        builder.field("target_field", "ip-city");
+                        builder.field("database_file", "GeoLite2-City.mmdb");
                     }
                     builder.endObject();
                 }
-                builder.endArray();
+                builder.endObject();
             }
-            builder.endObject();
-            bytes = BytesReference.bytes(builder);
-        }
-        assertAcked(clusterAdmin().preparePutPipeline("_id", bytes, XContentType.JSON).get());
+            return builder.endArray();
+        });
     }
 
     public static Map<String, Object> convertToMap(ToXContent part) throws IOException {
diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java
index f34f647a01e0..58fdc81b72ae 100644
--- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java
+++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java
@@ -11,22 +11,16 @@
 import org.apache.lucene.util.Constants;
 import org.elasticsearch.action.DocWriteResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.ingest.IngestService;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.NodeRoles;
-import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentType;
-import org.elasticsearch.xcontent.json.JsonXContent;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
 
 import static org.elasticsearch.test.NodeRoles.nonIngestNode;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.equalTo;
 
 public class GeoIpProcessorNonIngestNodeIT extends AbstractGeoIpIT {
@@ -43,53 +37,46 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
      */
     public void testLazyLoading() throws IOException {
         assumeFalse("https://github.com/elastic/elasticsearch/issues/37342", Constants.WINDOWS);
-        final BytesReference bytes;
-        try (XContentBuilder builder = JsonXContent.contentBuilder()) {
-            builder.startObject();
+        putJsonPipeline("geoip", (builder, params) -> {
+            builder.field("description", "test");
+            builder.startArray("processors");
             {
-                builder.field("description", "test");
-                builder.startArray("processors");
+                builder.startObject();
                 {
-                    builder.startObject();
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-city");
-                            builder.field("database_file", "GeoLite2-City.mmdb");
-                        }
-                        builder.endObject();
+                        builder.field("field", "ip");
+                        builder.field("target_field", "ip-city");
+                        builder.field("database_file", "GeoLite2-City.mmdb");
                     }
                     builder.endObject();
-                    builder.startObject();
+                }
+                builder.endObject();
+                builder.startObject();
+                {
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-country");
-                            builder.field("database_file", "GeoLite2-Country.mmdb");
-                        }
-                        builder.endObject();
+                        builder.field("field", "ip");
+                        builder.field("target_field", "ip-country");
+                        builder.field("database_file", "GeoLite2-Country.mmdb");
                     }
                     builder.endObject();
-                    builder.startObject();
+                }
+                builder.endObject();
+                builder.startObject();
+                {
+                    builder.startObject("geoip");
                     {
-                        builder.startObject("geoip");
-                        {
-                            builder.field("field", "ip");
-                            builder.field("target_field", "ip-asn");
-                            builder.field("database_file", "GeoLite2-ASN.mmdb");
-                        }
-                        builder.endObject();
+                        builder.field("field", "ip");
+                        builder.field("target_field", "ip-asn");
+                        builder.field("database_file", "GeoLite2-ASN.mmdb");
                     }
                     builder.endObject();
                 }
-                builder.endArray();
+                builder.endObject();
             }
-            builder.endObject();
-            bytes = BytesReference.bytes(builder);
-        }
-        assertAcked(clusterAdmin().putPipeline(new PutPipelineRequest("geoip", bytes, XContentType.JSON)).actionGet());
+            return builder.endArray();
+        });
         // the geo-IP databases should not be loaded on any nodes as they are all non-ingest nodes
         Arrays.stream(internalCluster().getNodeNames()).forEach(node -> assertDatabaseLoadStatus(node, false));
 
diff --git a/modules/ingest-user-agent/build.gradle b/modules/ingest-user-agent/build.gradle
index 64cd38c58482..d124770e33cc 100644
--- a/modules/ingest-user-agent/build.gradle
+++ b/modules/ingest-user-agent/build.gradle
@@ -18,7 +18,3 @@ restResources {
     include '_common', 'indices', 'index', 'cluster', 'nodes', 'get', 'ingest'
   }
 }
-
-tasks.named("yamlRestTestV7CompatTransform").configure {task ->
-  task.addAllowedWarningRegex("setting \\[ecs\\] is deprecated as ECS format is the default and only option")
-}
diff --git a/modules/lang-mustache/build.gradle b/modules/lang-mustache/build.gradle
index c36275699e21..3cbcabed20a9 100644
--- a/modules/lang-mustache/build.gradle
+++ b/modules/lang-mustache/build.gradle
@@ -26,7 +26,3 @@ restResources {
   }
 }
 
-tasks.named("yamlRestTestV7CompatTransform").configure {task ->
-  task.addAllowedWarningRegex("\\[types removal\\].*")
-  task.replaceValueInMatch("responses.1.error.root_cause.0.type", "x_content_e_o_f_exception", "Multi-search template with errors")
-}
diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle
index cc557ac2289f..0b2882934a12 100644
--- a/modules/lang-painless/build.gradle
+++ b/modules/lang-painless/build.gradle
@@ -61,48 +61,6 @@ tasks.named("test").configure {
     jvmArgs '-XX:-OmitStackTraceInFastThrow', '-XX:-HeapDumpOnOutOfMemoryError'
 }
 
-tasks.named("yamlRestTestV7CompatTest").configure {
-    systemProperty 'tests.rest.blacklist', [
-            'painless/20_scriptfield/Scripted Field Doing Compare (fields api)',
-            'painless/70_execute_painless_scripts/Execute with double field context (single-value, fields api)',
-            'painless/70_execute_painless_scripts/Execute with double field context (single-value, fields api)',
-            '70_execute_painless_scripts/Execute with geo point field context (multi-value, fields api)',
-            '70_execute_painless_scripts/Execute with ip field context (single-value, fields api)',
-            '70_execute_painless_scripts/Execute with boolean field context (single-value, fields api)',
-            'painless/70_execute_painless_scripts/Execute with boolean field context (multi-value, fields api)',
-            'painless/40_fields_api/date to long',
-            'painless/130_metric_agg/Scripted Metric Agg Total (fields api)',
-            'painless/70_execute_painless_scripts/Execute with keyword field context (multi-value, fields api)',
-            'painless/100_terms_agg/Double Value Script with doc notation (fields api)',
-            'painless/100_terms_agg/Long Value Script with doc notation (fields api)',
-            'painless/20_scriptfield/Access a date (fields api)',
-            'painless/70_execute_painless_scripts/Execute with date field context (multi-value, fields api)',
-            'painless/70_execute_painless_scripts/Execute with keyword field context (single-value, fields api)',
-            'painless/70_execute_painless_scripts/Execute with long field context (multi-value, fields api)',
-            'painless/20_scriptfield/Scripted Field (fields api)',
-            'painless/70_execute_painless_scripts/Execute with long field context (single-value, fields api)',
-            'painless/70_execute_painless_scripts/Execute with geo point field context (single-value, fields api)',
-            'painless/70_execute_painless_scripts/Execute with date field context (single-value, fields api)',
-            'painless/40_fields_api/missing field',
-            'painless/40_fields_api/sort script fields api',
-            'painless/20_scriptfield/Access many dates (fields api)',
-            'painless/70_execute_painless_scripts/Execute with long field context (single-value, fields api)',
-            'painless/70_execute_painless_scripts/Execute with geo point field context (single-value, fields api)',
-            'painless/70_execute_painless_scripts/Execute with date field context (single-value, fields api)',
-            'painless/40_fields_api/missing field',
-            'painless/40_fields_api/sort script fields api',
-            'painless/20_scriptfield/Access many dates (fields api)',
-            'painless/100_terms_agg/String Value Script with doc notation (fields api)',
-            'painless/40_fields_api/string to long and bigint',
-            'painless/40_fields_api/boolean to long and bigint',
-            'painless/40_fields_api/script fields api for dates',
-            'painless/70_execute_painless_scripts/Execute with double field context (multi-value, fields api)',
-            'painless/40_fields_api/filter script fields api',
-            'painless/40_fields_api/script score fields api',
-            'painless/70_mov_fn_agg/*' // Agg moved to a module.
-    ].join(',')
-}
-
 esplugin.bundleSpec.into("spi") {
     from(configurations.spi)
 }
diff --git a/modules/lang-painless/src/internalClusterTest/java/org/elasticsearch/painless/action/CrossClusterPainlessExecuteIT.java b/modules/lang-painless/src/internalClusterTest/java/org/elasticsearch/painless/action/CrossClusterPainlessExecuteIT.java
index 1bd6468c562f..99fb0edd4334 100644
--- a/modules/lang-painless/src/internalClusterTest/java/org/elasticsearch/painless/action/CrossClusterPainlessExecuteIT.java
+++ b/modules/lang-painless/src/internalClusterTest/java/org/elasticsearch/painless/action/CrossClusterPainlessExecuteIT.java
@@ -175,7 +175,7 @@ private void setupTwoClusters() throws Exception {
         assertFalse(
             client(REMOTE_CLUSTER).admin()
                 .cluster()
-                .prepareHealth(REMOTE_INDEX)
+                .prepareHealth(TEST_REQUEST_TIMEOUT, REMOTE_INDEX)
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
diff --git a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java
index 2808dae31239..f41d365f305b 100644
--- a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java
+++ b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapper.java
@@ -352,7 +352,7 @@ private static int getLevels(int treeLevels, double precisionInMeters, int defau
         public LegacyGeoShapeFieldMapper build(MapperBuilderContext context) {
             LegacyGeoShapeParser parser = new LegacyGeoShapeParser();
             GeoShapeFieldType ft = buildFieldType(parser, context);
-            return new LegacyGeoShapeFieldMapper(leafName(), ft, multiFieldsBuilder.build(this, context), copyTo, parser, this);
+            return new LegacyGeoShapeFieldMapper(leafName(), ft, builderParams(this, context), parser, this);
         }
     }
 
@@ -537,20 +537,18 @@ public PrefixTreeStrategy resolvePrefixTreeStrategy(String strategyName) {
     public LegacyGeoShapeFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         LegacyGeoShapeParser parser,
         Builder builder
     ) {
         super(
             simpleName,
             mappedFieldType,
+            builderParams,
             builder.ignoreMalformed.get(),
             builder.coerce.get(),
             builder.ignoreZValue.get(),
             builder.orientation.get(),
-            multiFields,
-            copyTo,
             parser
         );
         this.indexCreatedVersion = builder.indexCreatedVersion;
diff --git a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/GeoJsonShapeParserTests.java b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/GeoJsonShapeParserTests.java
index 4fa1d7b7a310..0e9d7ca5f15c 100644
--- a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/GeoJsonShapeParserTests.java
+++ b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/GeoJsonShapeParserTests.java
@@ -14,6 +14,7 @@
 import org.elasticsearch.common.geo.GeometryNormalizer;
 import org.elasticsearch.common.geo.GeometryParser;
 import org.elasticsearch.common.geo.Orientation;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.geometry.Geometry;
 import org.elasticsearch.geometry.GeometryCollection;
 import org.elasticsearch.geometry.Line;
@@ -342,6 +343,8 @@ public void testParsePolygon() throws IOException, ParseException {
         assertGeometryEquals(p, polygonGeoJson, false);
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this test is using pre 8.0.0 index versions so needs to be removed or updated")
     public void testParse3DPolygon() throws IOException, ParseException {
         XContentBuilder polygonGeoJson = XContentFactory.jsonBuilder()
             .startObject()
diff --git a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/GeoWKTShapeParserTests.java b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/GeoWKTShapeParserTests.java
index 6e8a61277ccc..74340e705b57 100644
--- a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/GeoWKTShapeParserTests.java
+++ b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/GeoWKTShapeParserTests.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.common.geo.GeometryNormalizer;
 import org.elasticsearch.common.geo.Orientation;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.geometry.Geometry;
 import org.elasticsearch.geometry.Line;
 import org.elasticsearch.geometry.MultiLine;
@@ -301,6 +302,8 @@ public void testParseMixedDimensionPolyWithHole() throws IOException, ParseExcep
         assertThat(e, hasToString(containsString("coordinate dimensions do not match")));
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this test is using pre 8.0.0 index versions so needs to be removed or updated")
     public void testParseMixedDimensionPolyWithHoleStoredZ() throws IOException {
         List<Coordinate> shellCoordinates = new ArrayList<>();
         shellCoordinates.add(new Coordinate(100, 0));
@@ -334,6 +337,8 @@ public void testParseMixedDimensionPolyWithHoleStoredZ() throws IOException {
         assertThat(e, hasToString(containsString("unable to add coordinate to CoordinateBuilder: coordinate dimensions do not match")));
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this test is using pre 8.0.0 index versions so needs to be removed or updated")
     public void testParsePolyWithStoredZ() throws IOException {
         List<Coordinate> shellCoordinates = new ArrayList<>();
         shellCoordinates.add(new Coordinate(100, 0, 0));
@@ -357,6 +362,8 @@ public void testParsePolyWithStoredZ() throws IOException {
         assertEquals(shapeBuilder.numDimensions(), 3);
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this test is using pre 8.0.0 index versions so needs to be removed or updated")
     public void testParseOpenPolygon() throws IOException {
         String openPolygon = "POLYGON ((100 5, 100 10, 90 10, 90 5))";
 
diff --git a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapperTests.java b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapperTests.java
index 0a0bb12bedba..407f372bee26 100644
--- a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapperTests.java
+++ b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapperTests.java
@@ -12,6 +12,7 @@
 import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
 import org.apache.lucene.spatial.prefix.tree.GeohashPrefixTree;
 import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree;
+import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.geo.GeoUtils;
@@ -19,6 +20,7 @@
 import org.elasticsearch.common.geo.ShapeRelation;
 import org.elasticsearch.common.geo.SpatialStrategy;
 import org.elasticsearch.core.CheckedConsumer;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.geometry.Point;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -53,6 +55,8 @@
 import static org.mockito.Mockito.when;
 
 @SuppressWarnings("deprecation")
+@UpdateForV9
+@AwaitsFix(bugUrl = "this is testing legacy functionality so can likely be removed in 9.0")
 public class LegacyGeoShapeFieldMapperTests extends MapperTestCase {
 
     @Override
diff --git a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldTypeTests.java b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldTypeTests.java
index dc74b9cd295c..a64352c5306e 100644
--- a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldTypeTests.java
+++ b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldTypeTests.java
@@ -7,7 +7,9 @@
  */
 package org.elasticsearch.legacygeo.mapper;
 
+import org.apache.lucene.tests.util.LuceneTestCase;
 import org.elasticsearch.common.geo.SpatialStrategy;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.FieldTypeTestCase;
@@ -20,6 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
+@UpdateForV9
+@LuceneTestCase.AwaitsFix(bugUrl = "this is testing legacy functionality so can likely be removed in 9.0")
 public class LegacyGeoShapeFieldTypeTests extends FieldTypeTestCase {
 
     /**
diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java
index b3cd3586fca5..a616fe9c20c2 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapper.java
@@ -45,7 +45,6 @@
 import org.elasticsearch.index.mapper.DocumentParserContext;
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.MapperBuilderContext;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.StringFieldType;
 import org.elasticsearch.index.mapper.StringStoredFieldFieldLoader;
@@ -139,13 +138,11 @@ private MatchOnlyTextFieldType buildFieldType(MapperBuilderContext context) {
         @Override
         public MatchOnlyTextFieldMapper build(MapperBuilderContext context) {
             MatchOnlyTextFieldType tft = buildFieldType(context);
-            MultiFields multiFields = multiFieldsBuilder.build(this, context);
             return new MatchOnlyTextFieldMapper(
                 leafName(),
                 Defaults.FIELD_TYPE,
                 tft,
-                multiFields,
-                copyTo,
+                builderParams(this, context),
                 context.isSourceSynthetic(),
                 this
             );
@@ -382,12 +379,11 @@ private MatchOnlyTextFieldMapper(
         String simpleName,
         FieldType fieldType,
         MatchOnlyTextFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean storeSource,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, false, null);
+        super(simpleName, mappedFieldType, builderParams);
         assert mappedFieldType.getTextSearchInfo().isTokenized();
         assert mappedFieldType.hasDocValues() == false;
         this.fieldType = freezeAndDeduplicateFieldType(fieldType);
@@ -436,22 +432,14 @@ public MatchOnlyTextFieldType fieldType() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-        return new StringStoredFieldFieldLoader(fieldType().storedFieldNameForSyntheticSource(), leafName()) {
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        var loader = new StringStoredFieldFieldLoader(fieldType().storedFieldNameForSyntheticSource(), leafName()) {
             @Override
             protected void write(XContentBuilder b, Object value) throws IOException {
                 b.value((String) value);
             }
         };
+
+        return new SyntheticSourceSupport.Native(loader);
     }
 }
diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java
index bd3845e1ee18..0b475641e429 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapper.java
@@ -98,8 +98,7 @@ public RankFeatureFieldMapper build(MapperBuilderContext context) {
                     positiveScoreImpact.getValue(),
                     nullValue.getValue()
                 ),
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 positiveScoreImpact.getValue(),
                 nullValue.getValue()
             );
@@ -172,12 +171,11 @@ public Query termQuery(Object value, SearchExecutionContext context) {
     private RankFeatureFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean positiveScoreImpact,
         Float nullValue
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, false, null);
+        super(simpleName, mappedFieldType, builderParams);
         this.positiveScoreImpact = positiveScoreImpact;
         this.nullValue = nullValue;
     }
diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureMetaFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureMetaFieldMapper.java
index c45065037b5a..366145be02d8 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureMetaFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeatureMetaFieldMapper.java
@@ -12,7 +12,6 @@
 import org.apache.lucene.search.Query;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MetadataFieldMapper;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.TextSearchInfo;
 import org.elasticsearch.index.mapper.ValueFetcher;
 import org.elasticsearch.index.query.SearchExecutionContext;
@@ -75,9 +74,4 @@ private RankFeatureMetaFieldMapper() {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java
index e6cb3010f996..5b1d35ec03c0 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapper.java
@@ -66,8 +66,7 @@ public RankFeaturesFieldMapper build(MapperBuilderContext context) {
             return new RankFeaturesFieldMapper(
                 leafName(),
                 new RankFeaturesFieldType(context.buildFullName(leafName()), meta.getValue(), positiveScoreImpact.getValue()),
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 positiveScoreImpact.getValue()
             );
         }
@@ -122,11 +121,10 @@ private static String indexedValueForSearch(Object value) {
     private RankFeaturesFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean positiveScoreImpact
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, false, null);
+        super(simpleName, mappedFieldType, builderParams);
         this.positiveScoreImpact = positiveScoreImpact;
     }
 
diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java
index c346a7d66914..ac236d13cc58 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java
@@ -38,7 +38,6 @@
 import org.elasticsearch.index.mapper.NumberFieldMapper;
 import org.elasticsearch.index.mapper.SimpleMappedFieldType;
 import org.elasticsearch.index.mapper.SortedNumericDocValuesSyntheticFieldLoader;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.TextSearchInfo;
 import org.elasticsearch.index.mapper.TimeSeriesParams;
@@ -197,14 +196,7 @@ public ScaledFloatFieldMapper build(MapperBuilderContext context) {
                 metric.getValue(),
                 indexMode
             );
-            return new ScaledFloatFieldMapper(
-                leafName(),
-                type,
-                multiFieldsBuilder.build(this, context),
-                copyTo,
-                context.isSourceSynthetic(),
-                this
-            );
+            return new ScaledFloatFieldMapper(leafName(), type, builderParams(this, context), context.isSourceSynthetic(), this);
         }
     }
 
@@ -470,12 +462,11 @@ public String toString() {
     private ScaledFloatFieldMapper(
         String simpleName,
         ScaledFloatFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean isSourceSynthetic,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+        super(simpleName, mappedFieldType, builderParams);
         this.isSourceSynthetic = isSourceSynthetic;
         this.indexed = builder.indexed.getValue();
         this.hasDocValues = builder.hasDocValues.getValue();
@@ -713,32 +704,19 @@ public int docValueCount() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        if (hasDocValues) {
+            var loader = new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed.value()) {
+                @Override
+                protected void writeValue(XContentBuilder b, long value) throws IOException {
+                    b.value(decodeForSyntheticSource(value, scalingFactor));
+                }
+            };
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasDocValues == false) {
-            throw new IllegalArgumentException(
-                "field ["
-                    + fullPath()
-                    + "] of type ["
-                    + typeName()
-                    + "] doesn't support synthetic source because it doesn't have doc values"
-            );
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
+            return new SyntheticSourceSupport.Native(loader);
         }
-        return new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed.value()) {
-            @Override
-            protected void writeValue(XContentBuilder b, long value) throws IOException {
-                b.value(decodeForSyntheticSource(value, scalingFactor));
-            }
-        };
+
+        return super.syntheticSourceSupport();
     }
 
     /**
diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java
index d521f9b2d2a3..57ac8fdfbb02 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapper.java
@@ -262,11 +262,10 @@ public SearchAsYouTypeFieldMapper build(MapperBuilderContext context) {
             return new SearchAsYouTypeFieldMapper(
                 leafName(),
                 ft,
-                copyTo,
+                builderParams(this, context),
                 indexAnalyzers,
                 prefixFieldMapper,
                 shingleFieldMappers,
-                multiFieldsBuilder.build(this, context),
                 this
             );
         }
@@ -498,7 +497,7 @@ static final class PrefixFieldMapper extends FieldMapper {
         final FieldType fieldType;
 
         PrefixFieldMapper(FieldType fieldType, PrefixFieldType mappedFieldType) {
-            super(mappedFieldType.name(), mappedFieldType, MultiFields.empty(), CopyTo.empty());
+            super(mappedFieldType.name(), mappedFieldType, BuilderParams.empty());
             this.fieldType = Mapper.freezeAndDeduplicateFieldType(fieldType);
         }
 
@@ -537,7 +536,7 @@ static final class ShingleFieldMapper extends FieldMapper {
         private final FieldType fieldType;
 
         ShingleFieldMapper(FieldType fieldType, ShingleFieldType mappedFieldtype) {
-            super(mappedFieldtype.name(), mappedFieldtype, MultiFields.empty(), CopyTo.empty());
+            super(mappedFieldtype.name(), mappedFieldtype, BuilderParams.empty());
             this.fieldType = freezeAndDeduplicateFieldType(fieldType);
         }
 
@@ -672,14 +671,13 @@ public SpanQuery spanPrefixQuery(String value, SpanMultiTermQueryWrapper.SpanRew
     public SearchAsYouTypeFieldMapper(
         String simpleName,
         SearchAsYouTypeFieldType mappedFieldType,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Map<String, NamedAnalyzer> indexAnalyzers,
         PrefixFieldMapper prefixField,
         ShingleFieldMapper[] shingleFields,
-        MultiFields multiFields,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, false, null);
+        super(simpleName, mappedFieldType, builderParams);
         this.prefixField = prefixField;
         this.shingleFields = shingleFields;
         this.maxShingleSize = builder.maxShingleSize.getValue();
diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java
index 9db677ddddff..fa0a96a548a9 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapper.java
@@ -87,7 +87,7 @@ public TokenCountFieldMapper build(MapperBuilderContext context) {
                 nullValue.getValue(),
                 meta.getValue()
             );
-            return new TokenCountFieldMapper(leafName(), ft, multiFieldsBuilder.build(this, context), copyTo, this);
+            return new TokenCountFieldMapper(leafName(), ft, builderParams(this, context), this);
         }
     }
 
@@ -135,14 +135,8 @@ public ValueFetcher valueFetcher(SearchExecutionContext context, String format)
     private final boolean enablePositionIncrements;
     private final Integer nullValue;
 
-    protected TokenCountFieldMapper(
-        String simpleName,
-        MappedFieldType defaultFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
-        Builder builder
-    ) {
-        super(simpleName, defaultFieldType, multiFields, copyTo);
+    protected TokenCountFieldMapper(String simpleName, MappedFieldType defaultFieldType, BuilderParams builderParams, Builder builder) {
+        super(simpleName, defaultFieldType, builderParams);
         this.analyzer = builder.analyzer.getValue();
         this.enablePositionIncrements = builder.enablePositionIncrements.getValue();
         this.nullValue = builder.nullValue.getValue();
diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java
index 56b9bb7f748b..765e72091a1b 100644
--- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java
+++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java
@@ -470,12 +470,7 @@ private void mapping(XContentBuilder b) throws IOException {
 
         @Override
         public List<SyntheticSourceInvalidExample> invalidExample() throws IOException {
-            return List.of(
-                new SyntheticSourceInvalidExample(
-                    equalTo("field [field] of type [scaled_float] doesn't support synthetic source because it doesn't have doc values"),
-                    b -> b.field("type", "scaled_float").field("scaling_factor", 10).field("doc_values", false)
-                )
-            );
+            return List.of();
         }
     }
 
diff --git a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml
index 7d1d6e2edec3..b4ee226f7269 100644
--- a/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml
+++ b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/match_only_text/10_basic.yml
@@ -351,3 +351,45 @@ tsdb:
         "@timestamp" : "2000-01-01T00:00:00.000Z"
         "dimension" : "a"
         foo: "Apache Lucene powers Elasticsearch"
+
+---
+synthetic_source with copy_to:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires copy_to support in synthetic source
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              foo:
+                type: match_only_text
+                copy_to: copy
+              copy:
+                type: keyword
+
+  - do:
+      index:
+        index: synthetic_source_test
+        id:    "1"
+        refresh: true
+        body:
+          foo: "Apache Lucene powers Elasticsearch"
+
+  - do:
+      search:
+        index: synthetic_source_test
+        body:
+          fields: ["copy"]
+
+  - match: { "hits.total.value": 1 }
+  - match:
+      hits.hits.0._source.foo: "Apache Lucene powers Elasticsearch"
+  - match:
+      hits.hits.0.fields.copy.0: "Apache Lucene powers Elasticsearch"
+
+
diff --git a/modules/parent-join/build.gradle b/modules/parent-join/build.gradle
index 844478c83e7c..3a1d8a396c4b 100644
--- a/modules/parent-join/build.gradle
+++ b/modules/parent-join/build.gradle
@@ -19,7 +19,3 @@ restResources {
     include '_common', 'bulk', 'cluster', 'get', 'nodes', 'indices', 'index', 'search'
   }
 }
-
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.skipTest("/30_inner_hits/profile fetch", "profile output has changed")
-}
diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java
index 7e9b6916e99d..f6392f32a88d 100644
--- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java
+++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentIdFieldMapper.java
@@ -88,7 +88,7 @@ public Object valueForDisplay(Object value) {
     }
 
     protected ParentIdFieldMapper(String name, boolean eagerGlobalOrdinals) {
-        super(name, new ParentIdFieldType(name, eagerGlobalOrdinals), MultiFields.empty(), CopyTo.empty(), false, null);
+        super(name, new ParentIdFieldType(name, eagerGlobalOrdinals), BuilderParams.empty());
     }
 
     @Override
diff --git a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java
index dc760c0b07b7..ccb67f5c51ac 100644
--- a/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java
+++ b/modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java
@@ -210,7 +210,7 @@ protected ParentJoinFieldMapper(
         boolean eagerGlobalOrdinals,
         List<Relations> relations
     ) {
-        super(simpleName, mappedFieldType, MultiFields.empty(), CopyTo.empty(), false, null);
+        super(simpleName, mappedFieldType, BuilderParams.empty());
         this.parentIdFields = parentIdFields;
         this.eagerGlobalOrdinals = eagerGlobalOrdinals;
         this.relations = relations;
diff --git a/modules/percolator/build.gradle b/modules/percolator/build.gradle
index b9b257a42e05..041fbb8bce34 100644
--- a/modules/percolator/build.gradle
+++ b/modules/percolator/build.gradle
@@ -23,7 +23,3 @@ restResources {
     include '_common', 'get', 'indices', 'index', 'search', 'msearch'
   }
 }
-
-tasks.named("yamlRestTestV7CompatTransform").configure{ task ->
-  task.addAllowedWarningRegex("\\[types removal\\].*")
-}
diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java
index ad936a5491b6..576ea4dbd5d2 100644
--- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java
+++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java
@@ -137,8 +137,6 @@ protected Parameter<?>[] getParameters() {
         @Override
         public PercolatorFieldMapper build(MapperBuilderContext context) {
             PercolatorFieldType fieldType = new PercolatorFieldType(context.buildFullName(leafName()), meta.getValue());
-            // TODO should percolator even allow multifields?
-            MultiFields multiFields = multiFieldsBuilder.build(this, context);
             context = context.createChildContext(leafName(), null);
             KeywordFieldMapper extractedTermsField = createExtractQueryFieldBuilder(
                 EXTRACTED_TERMS_FIELD_NAME,
@@ -165,8 +163,7 @@ public PercolatorFieldMapper build(MapperBuilderContext context) {
             return new PercolatorFieldMapper(
                 leafName(),
                 fieldType,
-                multiFields,
-                copyTo,
+                builderParams(this, context),
                 searchExecutionContext,
                 extractedTermsField,
                 extractionResultField,
@@ -375,8 +372,7 @@ static Tuple<List<BytesRef>, Map<String, List<byte[]>>> extractTermsAndRanges(In
     PercolatorFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Supplier<SearchExecutionContext> searchExecutionContext,
         KeywordFieldMapper queryTermsField,
         KeywordFieldMapper extractionResultField,
@@ -387,7 +383,7 @@ static Tuple<List<BytesRef>, Map<String, List<byte[]>>> extractTermsAndRanges(In
         IndexVersion indexCreatedVersion,
         Supplier<TransportVersion> clusterTransportVersion
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+        super(simpleName, mappedFieldType, builderParams);
         this.searchExecutionContext = searchExecutionContext;
         this.queryTermsField = queryTermsField;
         this.extractionResultField = extractionResultField;
diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle
index 9cd7963224cf..9e1e1e842ba5 100644
--- a/modules/reindex/build.gradle
+++ b/modules/reindex/build.gradle
@@ -160,30 +160,3 @@ if (OS.current() == OS.WINDOWS) {
     }
   }
 }
-
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-    task.skipTest("reindex/20_validation/reindex without source gives useful error message", "exception with a type. Not much benefit adding _doc there.")
-    task.skipTest("update_by_query/20_validation/update_by_query without source gives useful error message", "exception with a type. Not much benefit adding _doc there.")
-
-    // these tests are all relying on a call to refresh all indices, when they could easily be changed
-    // in 7.x to call the specific index they want to refresh.
-    // See https://github.com/elastic/elasticsearch/issues/81188
-    task.skipTest("delete_by_query/70_throttle/Rethrottle to -1 which turns off throttling", "test relies on system index being non-hidden")
-    task.skipTest("delete_by_query/80_slices/Multiple slices with rethrottle", "test relies on system index being non-hidden")
-    task.skipTest("delete_by_query/80_slices/Multiple slices with wait_for_completion=false", "test relies on system index being non-hidden")
-    task.skipTest("reindex/80_slices/Multiple slices with rethrottle", "test relies on system index being non-hidden")
-    task.skipTest("reindex/80_slices/Multiple slices with wait_for_completion=false", "test relies on system index being non-hidden")
-    task.skipTest("update_by_query/70_slices/Multiple slices with rethrottle", "test relies on system index being non-hidden")
-    task.skipTest("update_by_query/70_slices/Multiple slices with wait_for_completion=false", "test relies on system index being non-hidden")
-
-    task.addAllowedWarningRegex("\\[types removal\\].*")
-}
-
-tasks.named("yamlRestTestV7CompatTest").configure {
-  systemProperty 'tests.rest.blacklist', [
-    'update_by_query/80_scripting/Can\'t change _id',
-    'update_by_query/80_scripting/Set unsupported operation type',
-    'update_by_query/80_scripting/Setting bogus context is an error',
-
-  ].join(',')
-}
diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/FeatureMigrationIT.java b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/FeatureMigrationIT.java
index ac850e991296..bf34c322c1a9 100644
--- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/FeatureMigrationIT.java
+++ b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/FeatureMigrationIT.java
@@ -88,8 +88,8 @@ public void testStartMigrationAndImmediatelyCheckStatus() throws Exception {
 
         ensureGreen();
 
-        PostFeatureUpgradeRequest migrationRequest = new PostFeatureUpgradeRequest();
-        GetFeatureUpgradeStatusRequest getStatusRequest = new GetFeatureUpgradeStatusRequest();
+        PostFeatureUpgradeRequest migrationRequest = new PostFeatureUpgradeRequest(TEST_REQUEST_TIMEOUT);
+        GetFeatureUpgradeStatusRequest getStatusRequest = new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT);
 
         // Start the migration and *immediately* request the status. We're trying to detect a race condition with this test, so we need to
         // do this as fast as possible, but not before the request to start the migration completes.
@@ -170,7 +170,7 @@ public void testMigrateInternalManagedSystemIndex() throws Exception {
             postUpgradeHookCalled.set(true);
         });
 
-        PostFeatureUpgradeRequest migrationRequest = new PostFeatureUpgradeRequest();
+        PostFeatureUpgradeRequest migrationRequest = new PostFeatureUpgradeRequest(TEST_REQUEST_TIMEOUT);
         PostFeatureUpgradeResponse migrationResponse = client().execute(PostFeatureUpgradeAction.INSTANCE, migrationRequest).get();
         assertThat(migrationResponse.getReason(), nullValue());
         assertThat(migrationResponse.getElasticsearchException(), nullValue());
@@ -180,7 +180,7 @@ public void testMigrateInternalManagedSystemIndex() throws Exception {
             .collect(Collectors.toSet());
         assertThat(migratingFeatures, hasItem(FEATURE_NAME));
 
-        GetFeatureUpgradeStatusRequest getStatusRequest = new GetFeatureUpgradeStatusRequest();
+        GetFeatureUpgradeStatusRequest getStatusRequest = new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT);
         // The feature upgrade may take longer than ten seconds when tests are running
         // in parallel, so we give assertBusy a sixty-second timeout.
         assertBusy(() -> {
@@ -196,7 +196,7 @@ public void testMigrateInternalManagedSystemIndex() throws Exception {
         assertTrue("the pre-migration hook wasn't actually called", preUpgradeHookCalled.get());
         assertTrue("the post-migration hook wasn't actually called", postUpgradeHookCalled.get());
 
-        Metadata finalMetadata = clusterAdmin().prepareState().get().getState().metadata();
+        Metadata finalMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         // Check that the results metadata is what we expect.
         FeatureMigrationResults currentResults = finalMetadata.custom(FeatureMigrationResults.TYPE);
         assertThat(currentResults, notNullValue());
@@ -246,12 +246,12 @@ public void testMigrateIndexWithWriteBlock() throws Exception {
         updateIndexSettings(Settings.builder().put("index.blocks.write", true), indexName);
         ensureGreen();
 
-        client().execute(PostFeatureUpgradeAction.INSTANCE, new PostFeatureUpgradeRequest()).get();
+        client().execute(PostFeatureUpgradeAction.INSTANCE, new PostFeatureUpgradeRequest(TEST_REQUEST_TIMEOUT)).get();
 
         assertBusy(() -> {
             GetFeatureUpgradeStatusResponse statusResp = client().execute(
                 GetFeatureUpgradeStatusAction.INSTANCE,
-                new GetFeatureUpgradeStatusRequest()
+                new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT)
             ).get();
             logger.info(Strings.toString(statusResp));
             assertThat(statusResp.getUpgradeStatus(), equalTo(GetFeatureUpgradeStatusResponse.UpgradeStatus.NO_MIGRATION_NEEDED));
@@ -299,7 +299,7 @@ public void onFailure(Exception e) {
             fail("cluster state update failed, see log for details");
         }
 
-        PostFeatureUpgradeRequest migrationRequest = new PostFeatureUpgradeRequest();
+        PostFeatureUpgradeRequest migrationRequest = new PostFeatureUpgradeRequest(TEST_REQUEST_TIMEOUT);
         PostFeatureUpgradeResponse migrationResponse = client().execute(PostFeatureUpgradeAction.INSTANCE, migrationRequest).get();
         // Make sure we actually started the migration
         assertTrue(
@@ -309,7 +309,7 @@ public void onFailure(Exception e) {
 
         // Now wait for the migration to finish (otherwise the test infra explodes)
         assertBusy(() -> {
-            GetFeatureUpgradeStatusRequest getStatusRequest = new GetFeatureUpgradeStatusRequest();
+            GetFeatureUpgradeStatusRequest getStatusRequest = new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT);
             GetFeatureUpgradeStatusResponse statusResp = client().execute(GetFeatureUpgradeStatusAction.INSTANCE, getStatusRequest).get();
             logger.info(Strings.toString(statusResp));
             assertThat(statusResp.getUpgradeStatus(), equalTo(GetFeatureUpgradeStatusResponse.UpgradeStatus.NO_MIGRATION_NEEDED));
@@ -337,8 +337,10 @@ private void migrateWithTemplatesV1(String templatePrefix, SystemIndexDescriptor
 
         ensureGreen();
 
-        PostFeatureUpgradeResponse migrationResponse = client().execute(PostFeatureUpgradeAction.INSTANCE, new PostFeatureUpgradeRequest())
-            .get();
+        PostFeatureUpgradeResponse migrationResponse = client().execute(
+            PostFeatureUpgradeAction.INSTANCE,
+            new PostFeatureUpgradeRequest(TEST_REQUEST_TIMEOUT)
+        ).get();
 
         assertTrue(migrationResponse.isAccepted());
     }
@@ -349,7 +351,7 @@ public void testBailOnMigrateWithTemplatesV1() throws Exception {
         assertBusy(() -> {
             GetFeatureUpgradeStatusResponse statusResp = client().execute(
                 GetFeatureUpgradeStatusAction.INSTANCE,
-                new GetFeatureUpgradeStatusRequest()
+                new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT)
             ).get();
             logger.info(Strings.toString(statusResp));
             assertThat(statusResp.getUpgradeStatus(), equalTo(GetFeatureUpgradeStatusResponse.UpgradeStatus.ERROR));
@@ -364,7 +366,7 @@ public void testMigrateWithTemplatesV1() throws Exception {
         assertBusy(() -> {
             GetFeatureUpgradeStatusResponse statusResp = client().execute(
                 GetFeatureUpgradeStatusAction.INSTANCE,
-                new GetFeatureUpgradeStatusRequest()
+                new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT)
             ).get();
             logger.info(Strings.toString(statusResp));
             assertThat(statusResp.getUpgradeStatus(), equalTo(GetFeatureUpgradeStatusResponse.UpgradeStatus.NO_MIGRATION_NEEDED));
@@ -426,8 +428,10 @@ private void migrateWithTemplatesV2(String prefix, SystemIndexDescriptor... desc
 
         ensureGreen();
 
-        PostFeatureUpgradeResponse migrationResponse = client().execute(PostFeatureUpgradeAction.INSTANCE, new PostFeatureUpgradeRequest())
-            .get();
+        PostFeatureUpgradeResponse migrationResponse = client().execute(
+            PostFeatureUpgradeAction.INSTANCE,
+            new PostFeatureUpgradeRequest(TEST_REQUEST_TIMEOUT)
+        ).get();
         assertTrue(migrationResponse.isAccepted());
     }
 
@@ -437,7 +441,7 @@ public void testBailOnMigrateWithTemplatesV2() throws Exception {
         assertBusy(() -> {
             GetFeatureUpgradeStatusResponse statusResp = client().execute(
                 GetFeatureUpgradeStatusAction.INSTANCE,
-                new GetFeatureUpgradeStatusRequest()
+                new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT)
             ).get();
             logger.info(Strings.toString(statusResp));
             assertThat(statusResp.getUpgradeStatus(), equalTo(GetFeatureUpgradeStatusResponse.UpgradeStatus.ERROR));
@@ -452,7 +456,7 @@ public void testMigrateWithTemplatesV2() throws Exception {
         assertBusy(() -> {
             GetFeatureUpgradeStatusResponse statusResp = client().execute(
                 GetFeatureUpgradeStatusAction.INSTANCE,
-                new GetFeatureUpgradeStatusRequest()
+                new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT)
             ).get();
             logger.info(Strings.toString(statusResp));
             assertThat(statusResp.getUpgradeStatus(), equalTo(GetFeatureUpgradeStatusResponse.UpgradeStatus.NO_MIGRATION_NEEDED));
diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/MultiFeatureMigrationIT.java b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/MultiFeatureMigrationIT.java
index 8f9c2b7f3410..f02695c63a7e 100644
--- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/MultiFeatureMigrationIT.java
+++ b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/MultiFeatureMigrationIT.java
@@ -176,7 +176,7 @@ public void testMultipleFeatureMigration() throws Exception {
             hooksCalled.countDown();
         });
 
-        PostFeatureUpgradeRequest migrationRequest = new PostFeatureUpgradeRequest();
+        PostFeatureUpgradeRequest migrationRequest = new PostFeatureUpgradeRequest(TEST_REQUEST_TIMEOUT);
         PostFeatureUpgradeResponse migrationResponse = client().execute(PostFeatureUpgradeAction.INSTANCE, migrationRequest).get();
         assertThat(migrationResponse.getReason(), nullValue());
         assertThat(migrationResponse.getElasticsearchException(), nullValue());
@@ -189,7 +189,7 @@ public void testMultipleFeatureMigration() throws Exception {
         // wait for all the plugin methods to have been called before assertBusy since that will exponentially backoff
         assertThat(hooksCalled.await(30, TimeUnit.SECONDS), is(true));
 
-        GetFeatureUpgradeStatusRequest getStatusRequest = new GetFeatureUpgradeStatusRequest();
+        GetFeatureUpgradeStatusRequest getStatusRequest = new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT);
         assertBusy(() -> {
             GetFeatureUpgradeStatusResponse statusResponse = client().execute(GetFeatureUpgradeStatusAction.INSTANCE, getStatusRequest)
                 .get();
@@ -203,7 +203,7 @@ public void testMultipleFeatureMigration() throws Exception {
         assertTrue("the second plugin's pre-migration hook wasn't actually called", secondPluginPreMigrationHookCalled.get());
         assertTrue("the second plugin's post-migration hook wasn't actually called", secondPluginPostMigrationHookCalled.get());
 
-        Metadata finalMetadata = clusterAdmin().prepareState().get().getState().metadata();
+        Metadata finalMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         // Check that the results metadata is what we expect
         FeatureMigrationResults currentResults = finalMetadata.custom(FeatureMigrationResults.TYPE);
         assertThat(currentResults, notNullValue());
@@ -264,12 +264,12 @@ public void testMultipleFeatureMigration() throws Exception {
         .setAliasName(".second-internal-managed-alias")
         .setPrimaryIndex(".second-int-man-old")
         .setType(SystemIndexDescriptor.Type.INTERNAL_MANAGED)
-        .setSettings(createSettings(IndexVersions.V_7_0_0, 0))
+        .setSettings(createSettings(IndexVersions.MINIMUM_COMPATIBLE, 0))
         .setMappings(createMapping(true, true))
         .setOrigin(ORIGIN)
         .setVersionMetaKey(VERSION_META_KEY)
         .setAllowedElasticProductOrigins(Collections.emptyList())
-        .setMinimumNodeVersion(Version.V_7_0_0)
+        .setMinimumNodeVersion(Version.CURRENT.minimumCompatibilityVersion())
         .setPriorSystemIndexDescriptors(Collections.emptyList())
         .build();
 
diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/SystemIndexMigrationIT.java b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/SystemIndexMigrationIT.java
index 47c6e8faf15b..6484d483bbcd 100644
--- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/SystemIndexMigrationIT.java
+++ b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/SystemIndexMigrationIT.java
@@ -85,7 +85,7 @@ public void testSystemIndexMigrationCanBeInterruptedWithShutdown() throws Except
         clusterService.addListener(clusterStateListener);
 
         // create task by calling API
-        final PostFeatureUpgradeRequest req = new PostFeatureUpgradeRequest();
+        final PostFeatureUpgradeRequest req = new PostFeatureUpgradeRequest(TEST_REQUEST_TIMEOUT);
         client().execute(PostFeatureUpgradeAction.INSTANCE, req);
         logger.info("migrate feature api called");
 
@@ -101,12 +101,12 @@ public Settings onNodeStopped(String nodeName) throws Exception {
 
         assertBusy(() -> {
             // Wait for the node we restarted to completely rejoin the cluster
-            ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+            ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertThat("expected restarted node to rejoin cluster", clusterState.getNodes().size(), equalTo(2));
 
             GetFeatureUpgradeStatusResponse statusResponse = client().execute(
                 GetFeatureUpgradeStatusAction.INSTANCE,
-                new GetFeatureUpgradeStatusRequest()
+                new GetFeatureUpgradeStatusRequest(TEST_REQUEST_TIMEOUT)
             ).get();
             assertThat(
                 "expected migration to fail due to restarting only data node",
diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java
index a2911090ab93..4c914764cdb5 100644
--- a/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java
+++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java
@@ -15,9 +15,6 @@
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
 import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
-import org.elasticsearch.action.ingest.DeletePipelineRequest;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.index.IndexModule;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.engine.Engine.Operation.Origin;
@@ -35,7 +32,6 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.tasks.TaskCancelledException;
 import org.elasticsearch.tasks.TaskInfo;
-import org.elasticsearch.xcontent.XContentType;
 import org.hamcrest.Matcher;
 import org.junit.Before;
 
@@ -47,7 +43,6 @@
 import java.util.stream.IntStream;
 
 import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.hamcrest.Matchers.emptyIterable;
 import static org.hamcrest.Matchers.equalTo;
@@ -231,14 +226,13 @@ public void testReindexCancel() throws Exception {
     }
 
     public void testUpdateByQueryCancel() throws Exception {
-        BytesReference pipeline = new BytesArray("""
+        putJsonPipeline("set-processed", """
             {
               "description" : "sets processed to true",
               "processors" : [ {
                   "test" : {}
               } ]
             }""");
-        assertAcked(clusterAdmin().preparePutPipeline("set-processed", pipeline, XContentType.JSON).get());
 
         testCancel(
             UpdateByQueryAction.INSTANCE,
@@ -250,7 +244,7 @@ public void testUpdateByQueryCancel() throws Exception {
             equalTo("update-by-query [" + INDEX + "]")
         );
 
-        assertAcked(clusterAdmin().deletePipeline(new DeletePipelineRequest("set-processed")).get());
+        deletePipeline("set-processed");
     }
 
     public void testDeleteByQueryCancel() throws Exception {
@@ -279,14 +273,13 @@ public void testReindexCancelWithWorkers() throws Exception {
     }
 
     public void testUpdateByQueryCancelWithWorkers() throws Exception {
-        BytesReference pipeline = new BytesArray("""
+        putJsonPipeline("set-processed", """
             {
               "description" : "sets processed to true",
               "processors" : [ {
                   "test" : {}
               } ]
             }""");
-        assertAcked(clusterAdmin().preparePutPipeline("set-processed", pipeline, XContentType.JSON).get());
 
         testCancel(
             UpdateByQueryAction.INSTANCE,
@@ -298,7 +291,7 @@ public void testUpdateByQueryCancelWithWorkers() throws Exception {
             equalTo("update-by-query [" + INDEX + "]")
         );
 
-        assertAcked(clusterAdmin().deletePipeline(new DeletePipelineRequest("set-processed")).get());
+        deletePipeline("set-processed");
     }
 
     public void testDeleteByQueryCancelWithWorkers() throws Exception {
diff --git a/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java b/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java
index 1ab370ad203f..7916bb5942fc 100644
--- a/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java
+++ b/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java
@@ -85,6 +85,7 @@
 import java.util.stream.StreamSupport;
 
 import static org.elasticsearch.repositories.RepositoriesMetrics.METRIC_REQUESTS_TOTAL;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.getRepositoryDataBlobName;
 import static org.elasticsearch.repositories.blobstore.BlobStoreTestUtil.randomNonDataPurpose;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
@@ -428,12 +429,7 @@ public void testEnforcedCooldownPeriod() throws IOException {
         );
         repository.blobStore()
             .blobContainer(repository.basePath())
-            .writeBlobAtomic(
-                randomNonDataPurpose(),
-                BlobStoreRepository.INDEX_FILE_PREFIX + modifiedRepositoryData.getGenId(),
-                serialized,
-                true
-            );
+            .writeBlobAtomic(randomNonDataPurpose(), getRepositoryDataBlobName(modifiedRepositoryData.getGenId()), serialized, true);
 
         final String newSnapshotName = "snapshot-new";
         final long beforeThrottledSnapshot = repository.threadPool().relativeTimeInNanos();
diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle
index 3fe2f9d9bae4..3537d430e212 100644
--- a/modules/repository-url/build.gradle
+++ b/modules/repository-url/build.gradle
@@ -33,11 +33,6 @@ dependencies {
   internalClusterTestImplementation project(':test:fixtures:url-fixture')
 }
 
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.skipTest("repository_url/10_basic/Restore with repository-url using file://", "Error message has changed")
-  task.skipTest("repository_url/10_basic/Restore with repository-url using http://", "Error message has changed")
-}
-
 tasks.named("thirdPartyAudit").configure {
   ignoreMissingClasses(
     'javax.servlet.ServletContextEvent',
diff --git a/modules/runtime-fields-common/build.gradle b/modules/runtime-fields-common/build.gradle
index 5a2d268cf7a4..f9485b6ed302 100644
--- a/modules/runtime-fields-common/build.gradle
+++ b/modules/runtime-fields-common/build.gradle
@@ -21,10 +21,3 @@ dependencies {
   api project(':libs:elasticsearch-grok')
   api project(':libs:elasticsearch-dissect')
 }
-
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.skipTest("runtime_fields/100_geo_point/fetch fields from source", "Format changed. Old format was a bug.")
-  task.skipTest("runtime_fields/101_geo_point_from_source/fetch fields from source", "Format changed. Old format was a bug.")
-  task.skipTest("runtime_fields/102_geo_point_source_in_query/fetch fields from source", "Format changed. Old format was a bug.")
-  task.skipTest("runtime_fields/103_geo_point_calculated_at_index/fetch fields from source", "Format changed. Old format was a bug.")
-}
diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml
index 11214907eb17..8728d4ac413b 100644
--- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml
+++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/10_keyword.yml
@@ -19,7 +19,7 @@ setup:
                 script: |
                   Instant instant = Instant.ofEpochMilli(params._source.timestamp);
                   ZonedDateTime dt = ZonedDateTime.ofInstant(instant, ZoneId.of("UTC"));
-                  emit(dt.dayOfWeek.getDisplayName(TextStyle.FULL, Locale.ROOT));
+                  emit(dt.dayOfWeek.getDisplayName(TextStyle.FULL, Locale.ENGLISH));
               # Test fetching many values
               day_of_week_letters:
                 type: keyword
@@ -218,7 +218,7 @@ setup:
             day_of_week:
               type: keyword
               script: |
-                emit(doc['timestamp'].value.dayOfWeekEnum.getDisplayName(TextStyle.SHORT, Locale.ROOT));
+                emit(doc['timestamp'].value.dayOfWeekEnum.getDisplayName(TextStyle.SHORT, Locale.ENGLISH));
   - do:
       search:
         index: sensor
diff --git a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/13_keyword_calculated_at_index.yml b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/13_keyword_calculated_at_index.yml
index 4bedfa3e923a..c27ddab72bff 100644
--- a/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/13_keyword_calculated_at_index.yml
+++ b/modules/runtime-fields-common/src/yamlRestTest/resources/rest-api-spec/test/runtime_fields/13_keyword_calculated_at_index.yml
@@ -28,7 +28,7 @@ setup:
                 script: |
                   Instant instant = Instant.ofEpochMilli(params._source.timestamp);
                   ZonedDateTime dt = ZonedDateTime.ofInstant(instant, ZoneId.of("UTC"));
-                  emit(dt.dayOfWeek.getDisplayName(TextStyle.FULL, Locale.ROOT));
+                  emit(dt.dayOfWeek.getDisplayName(TextStyle.FULL, Locale.ENGLISH));
               # Test fetching many values
               day_of_week_letters:
                 type: keyword
diff --git a/muted-tests.yml b/muted-tests.yml
index a8136219b3da..88d532d39e81 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -5,9 +5,6 @@ tests:
 - class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
   method: test {yaml=reference/esql/esql-async-query-api/line_17}
   issue: https://github.com/elastic/elasticsearch/issues/109260
-- class: "org.elasticsearch.index.engine.frozen.FrozenIndexIT"
-  issue: "https://github.com/elastic/elasticsearch/issues/109315"
-  method: "testTimestampFieldTypeExposedByAllIndicesServices"
 - class: "org.elasticsearch.analysis.common.CommonAnalysisClientYamlTestSuiteIT"
   issue: "https://github.com/elastic/elasticsearch/issues/109318"
   method: "test {yaml=analysis-common/50_char_filters/pattern_replace error handling (too complex pattern)}"
@@ -38,9 +35,6 @@ tests:
 - class: org.elasticsearch.backwards.SearchWithMinCompatibleSearchNodeIT
   method: testCcsMinimizeRoundtripsIsFalse
   issue: https://github.com/elastic/elasticsearch/issues/101974
-- class: org.elasticsearch.backwards.SearchWithMinCompatibleSearchNodeIT
-  method: testMinVersionAsOldVersion
-  issue: https://github.com/elastic/elasticsearch/issues/109454
 - class: "org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests"
   issue: "https://github.com/elastic/elasticsearch/issues/110408"
   method: "testCreateAndRestorePartialSearchableSnapshot"
@@ -101,9 +95,6 @@ tests:
 - class: org.elasticsearch.xpack.restart.CoreFullClusterRestartIT
   method: testSnapshotRestore {cluster=UPGRADED}
   issue: https://github.com/elastic/elasticsearch/issues/111799
-- class: org.elasticsearch.xpack.esql.qa.mixed.FieldExtractorIT
-  method: testScaledFloat
-  issue: https://github.com/elastic/elasticsearch/issues/112003
 - class: org.elasticsearch.xpack.inference.InferenceRestIT
   method: test {p0=inference/80_random_rerank_retriever/Random rerank retriever predictably shuffles results}
   issue: https://github.com/elastic/elasticsearch/issues/111999
@@ -124,9 +115,6 @@ tests:
 - class: org.elasticsearch.xpack.ml.integration.MlJobIT
   method: testDeleteJobAsync
   issue: https://github.com/elastic/elasticsearch/issues/112212
-- class: org.elasticsearch.search.retriever.rankdoc.RankDocsSortBuilderTests
-  method: testEqualsAndHashcode
-  issue: https://github.com/elastic/elasticsearch/issues/112312
 - class: org.elasticsearch.search.retriever.RankDocRetrieverBuilderIT
   method: testRankDocsRetrieverWithCollapse
   issue: https://github.com/elastic/elasticsearch/issues/112254
@@ -141,9 +129,6 @@ tests:
 - class: org.elasticsearch.xpack.ml.integration.MlJobIT
   method: testMultiIndexDelete
   issue: https://github.com/elastic/elasticsearch/issues/112381
-- class: org.elasticsearch.xpack.searchablesnapshots.cache.shared.NodesCachesStatsIntegTests
-  method: testNodesCachesStats
-  issue: https://github.com/elastic/elasticsearch/issues/112384
 - class: org.elasticsearch.action.admin.cluster.stats.CCSTelemetrySnapshotTests
   method: testToXContent
   issue: https://github.com/elastic/elasticsearch/issues/112325
@@ -167,17 +152,68 @@ tests:
 - class: org.elasticsearch.xpack.inference.external.http.RequestBasedTaskRunnerTests
   method: testLoopOneAtATime
   issue: https://github.com/elastic/elasticsearch/issues/112471
-- class: org.elasticsearch.xpack.security.authc.kerberos.SimpleKdcLdapServerTests
-  method: testClientServiceMutualAuthentication
-  issue: https://github.com/elastic/elasticsearch/issues/112529
 - class: org.elasticsearch.ingest.geoip.IngestGeoIpClientYamlTestSuiteIT
   issue: https://github.com/elastic/elasticsearch/issues/111497
 - class: org.elasticsearch.smoketest.SmokeTestIngestWithAllDepsClientYamlTestSuiteIT
   method: test {yaml=ingest/80_ingest_simulate/Test ingest simulate with reroute and mapping validation from templates}
   issue: https://github.com/elastic/elasticsearch/issues/112575
-- class: org.elasticsearch.script.mustache.LangMustacheClientYamlTestSuiteIT
-  method: test {yaml=lang_mustache/50_multi_search_template/Multi-search template with errors}
-  issue: https://github.com/elastic/elasticsearch/issues/112580
+- class: org.elasticsearch.xpack.security.authc.kerberos.SimpleKdcLdapServerTests
+  method: testClientServiceMutualAuthentication
+  issue: https://github.com/elastic/elasticsearch/issues/112529
+- class: org.elasticsearch.search.basic.SearchWhileRelocatingIT
+  method: testSearchAndRelocateConcurrentlyRandomReplicas
+  issue: https://github.com/elastic/elasticsearch/issues/112515
+- class: org.elasticsearch.xpack.test.rest.XPackRestIT
+  method: test {p0=terms_enum/10_basic/Test search after on unconfigured constant keyword field}
+  issue: https://github.com/elastic/elasticsearch/issues/112624
+- class: org.elasticsearch.xpack.esql.EsqlAsyncSecurityIT
+  method: testIndexPatternErrorMessageComparison_ESQL_SearchDSL
+  issue: https://github.com/elastic/elasticsearch/issues/112630
+- class: org.elasticsearch.xpack.ml.integration.MlJobIT
+  method: testPutJob_GivenFarequoteConfig
+  issue: https://github.com/elastic/elasticsearch/issues/112382
+- class: org.elasticsearch.xpack.security.authc.kerberos.KerberosTicketValidatorTests
+  method: testWhenKeyTabWithInvalidContentFailsValidation
+  issue: https://github.com/elastic/elasticsearch/issues/112631
+- class: org.elasticsearch.xpack.security.authc.kerberos.KerberosTicketValidatorTests
+  method: testValidKebrerosTicket
+  issue: https://github.com/elastic/elasticsearch/issues/112632
+- class: org.elasticsearch.xpack.security.authc.kerberos.KerberosTicketValidatorTests
+  method: testKerbTicketGeneratedForDifferentServerFailsValidation
+  issue: https://github.com/elastic/elasticsearch/issues/112639
+- class: org.elasticsearch.packaging.test.PackagesSecurityAutoConfigurationTests
+  method: test20SecurityNotAutoConfiguredOnReInstallation
+  issue: https://github.com/elastic/elasticsearch/issues/112635
+- class: org.elasticsearch.xpack.sql.qa.single_node.JdbcSqlSpecIT
+  method: test {case-functions.testSelectInsertWithLcaseAndLengthWithOrderBy}
+  issue: https://github.com/elastic/elasticsearch/issues/112642
+- class: org.elasticsearch.xpack.sql.qa.single_node.JdbcSqlSpecIT
+  method: test {case-functions.testUcaseInline1}
+  issue: https://github.com/elastic/elasticsearch/issues/112641
+- class: org.elasticsearch.xpack.sql.qa.single_node.JdbcSqlSpecIT
+  method: test {case-functions.testUpperCasingTheSecondLetterFromTheRightFromFirstName}
+  issue: https://github.com/elastic/elasticsearch/issues/112640
+- class: org.elasticsearch.xpack.sql.qa.single_node.JdbcSqlSpecIT
+  method: test {case-functions.testUcaseInline3}
+  issue: https://github.com/elastic/elasticsearch/issues/112643
+- class: org.elasticsearch.xpack.ml.integration.MlJobIT
+  method: testDelete_multipleRequest
+  issue: https://github.com/elastic/elasticsearch/issues/112701
+- class: org.elasticsearch.xpack.ml.integration.MlJobIT
+  method: testCreateJobInSharedIndexUpdatesMapping
+  issue: https://github.com/elastic/elasticsearch/issues/112729
+- class: org.elasticsearch.xpack.ml.integration.MlJobIT
+  method: testGetJob_GivenNoSuchJob
+  issue: https://github.com/elastic/elasticsearch/issues/112730
+- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
+  method: test {yaml=reference/cluster/stats/line_1450}
+  issue: https://github.com/elastic/elasticsearch/issues/112732
+- class: org.elasticsearch.script.StatsSummaryTests
+  method: testEqualsAndHashCode
+  issue: https://github.com/elastic/elasticsearch/issues/112439
+- class: org.elasticsearch.snapshots.ConcurrentSnapshotsIT
+  method: testMasterFailoverOnFinalizationLoop
+  issue: https://github.com/elastic/elasticsearch/issues/112811
 
 # Examples:
 #
diff --git a/plugins/analysis-icu/build.gradle b/plugins/analysis-icu/build.gradle
index 1c7db6d040be..eed88b3232a4 100644
--- a/plugins/analysis-icu/build.gradle
+++ b/plugins/analysis-icu/build.gradle
@@ -43,7 +43,3 @@ tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }
 
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-    task.skipTest("analysis_icu/10_basic/Normalization with deprecated unicodeSetFilter", "Cleanup versioned deprecations in analysis #41560")
-}
-
diff --git a/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapper.java b/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapper.java
index 2d27447b618e..7a0caf56d606 100644
--- a/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapper.java
+++ b/plugins/analysis-icu/src/main/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapper.java
@@ -336,15 +336,7 @@ public ICUCollationKeywordFieldMapper build(MapperBuilderContext context) {
                 ignoreAbove.getValue(),
                 meta.getValue()
             );
-            return new ICUCollationKeywordFieldMapper(
-                leafName(),
-                buildFieldType(),
-                ft,
-                multiFieldsBuilder.build(this, context),
-                copyTo,
-                collator,
-                this
-            );
+            return new ICUCollationKeywordFieldMapper(leafName(), buildFieldType(), ft, builderParams(this, context), collator, this);
         }
     }
 
@@ -474,12 +466,11 @@ protected ICUCollationKeywordFieldMapper(
         String simpleName,
         FieldType fieldType,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Collator collator,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, false, null);
+        super(simpleName, mappedFieldType, builderParams);
         assert collator.isFrozen();
         this.fieldType = freezeAndDeduplicateFieldType(fieldType);
         this.params = builder.collatorParams();
diff --git a/plugins/analysis-phonetic/src/test/java/org/elasticsearch/plugin/analysis/phonetic/AnalysisPhoneticFactoryTests.java b/plugins/analysis-phonetic/src/test/java/org/elasticsearch/plugin/analysis/phonetic/AnalysisPhoneticFactoryTests.java
index 348e9f5fae7c..c83d8b789611 100644
--- a/plugins/analysis-phonetic/src/test/java/org/elasticsearch/plugin/analysis/phonetic/AnalysisPhoneticFactoryTests.java
+++ b/plugins/analysis-phonetic/src/test/java/org/elasticsearch/plugin/analysis/phonetic/AnalysisPhoneticFactoryTests.java
@@ -43,7 +43,7 @@ public void testDisallowedWithSynonyms() throws IOException {
         Settings settings = Settings.builder()
             .put(
                 IndexMetadata.SETTING_VERSION_CREATED,
-                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersion.current())
+                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current())
             )
             .put("path.home", createTempDir().toString())
             .build();
diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java
index 9a55bfde38b3..a3e8a3a02f93 100644
--- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java
+++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java
@@ -30,7 +30,7 @@ public void testOneNodeShouldRunUsingPrivateIp() {
         assertNotNull(
             client().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .setMasterNodeTimeout(TimeValue.timeValueSeconds(1))
                 .get()
                 .getState()
@@ -52,7 +52,7 @@ public void testOneNodeShouldRunUsingPublicIp() {
         assertNotNull(
             client().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .setMasterNodeTimeout(TimeValue.timeValueSeconds(1))
                 .get()
                 .getState()
diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java
index b8d0a1ef7bdd..6c0767026627 100644
--- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java
+++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java
@@ -33,7 +33,7 @@ public void testTwoNodesShouldRunUsingPrivateOrPublicIp() {
         assertNotNull(
             client().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .setMasterNodeTimeout(TimeValue.timeValueSeconds(1))
                 .get()
                 .getState()
@@ -47,7 +47,7 @@ public void testTwoNodesShouldRunUsingPrivateOrPublicIp() {
         assertNotNull(
             client().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .setMasterNodeTimeout(TimeValue.timeValueSeconds(1))
                 .get()
                 .getState()
diff --git a/plugins/discovery-ec2/src/internalClusterTest/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java b/plugins/discovery-ec2/src/internalClusterTest/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java
index 033e0e382353..0ed530c9ee3d 100644
--- a/plugins/discovery-ec2/src/internalClusterTest/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java
+++ b/plugins/discovery-ec2/src/internalClusterTest/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java
@@ -31,7 +31,7 @@ public void testMinimumMasterNodesStart() {
         // We try to update a setting now
         final String expectedValue = UUIDs.randomBase64UUID(random());
         final String settingName = "cluster.routing.allocation.exclude.any_attribute";
-        final ClusterUpdateSettingsResponse response = clusterAdmin().prepareUpdateSettings()
+        final ClusterUpdateSettingsResponse response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().put(settingName, expectedValue))
             .get();
 
diff --git a/plugins/discovery-gce/src/internalClusterTest/java/org/elasticsearch/discovery/gce/GceDiscoverTests.java b/plugins/discovery-gce/src/internalClusterTest/java/org/elasticsearch/discovery/gce/GceDiscoverTests.java
index 32be38ac7f81..ca8a4449c4d6 100644
--- a/plugins/discovery-gce/src/internalClusterTest/java/org/elasticsearch/discovery/gce/GceDiscoverTests.java
+++ b/plugins/discovery-gce/src/internalClusterTest/java/org/elasticsearch/discovery/gce/GceDiscoverTests.java
@@ -67,7 +67,7 @@ public void testJoin() {
 
         ClusterStateResponse clusterStateResponse = client(masterNode).admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .setMasterNodeTimeout(TimeValue.timeValueSeconds(1))
             .clear()
             .setNodes(true)
@@ -79,7 +79,7 @@ public void testJoin() {
         registerGceNode(secondNode);
         clusterStateResponse = client(secondNode).admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .setMasterNodeTimeout(TimeValue.timeValueSeconds(1))
             .clear()
             .setNodes(true)
@@ -88,13 +88,13 @@ public void testJoin() {
         assertNotNull(clusterStateResponse.getState().nodes().getMasterNodeId());
 
         // wait for the cluster to form
-        assertNoTimeout(client().admin().cluster().prepareHealth().setWaitForNodes(Integer.toString(2)).get());
+        assertNoTimeout(client().admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes(Integer.toString(2)).get());
         assertNumberOfNodes(2);
 
         // add one more node and wait for it to join
         final String thirdNode = internalCluster().startDataOnlyNode();
         registerGceNode(thirdNode);
-        assertNoTimeout(client().admin().cluster().prepareHealth().setWaitForNodes(Integer.toString(3)).get());
+        assertNoTimeout(client().admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes(Integer.toString(3)).get());
         assertNumberOfNodes(3);
     }
 
diff --git a/plugins/examples/custom-processor/build.gradle b/plugins/examples/custom-processor/build.gradle
new file mode 100644
index 000000000000..69da64d8ebe8
--- /dev/null
+++ b/plugins/examples/custom-processor/build.gradle
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+apply plugin: 'elasticsearch.esplugin'
+apply plugin: 'elasticsearch.yaml-rest-test'
+
+esplugin {
+  name 'custom-processor'
+  description 'An example plugin showing how to register a custom ingest processor'
+  classname 'org.elasticsearch.example.customprocessor.ExampleProcessorPlugin'
+  licenseFile rootProject.file('SSPL-1.0+ELASTIC-LICENSE-2.0.txt')
+  noticeFile rootProject.file('NOTICE.txt')
+}
+
+dependencies {
+  yamlRestTestRuntimeOnly "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+}
diff --git a/plugins/examples/custom-processor/src/main/java/org/elasticsearch/example/customprocessor/ExampleProcessorPlugin.java b/plugins/examples/custom-processor/src/main/java/org/elasticsearch/example/customprocessor/ExampleProcessorPlugin.java
new file mode 100644
index 000000000000..1ba145a92ca7
--- /dev/null
+++ b/plugins/examples/custom-processor/src/main/java/org/elasticsearch/example/customprocessor/ExampleProcessorPlugin.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.example.customprocessor;
+
+import org.elasticsearch.ingest.Processor;
+import org.elasticsearch.plugins.IngestPlugin;
+import org.elasticsearch.plugins.Plugin;
+
+import java.util.Map;
+
+public class ExampleProcessorPlugin extends Plugin implements IngestPlugin {
+
+    @Override
+    public Map<String, Processor.Factory> getProcessors(Processor.Parameters parameters) {
+        return Map.of(ExampleRepeatProcessor.TYPE, new ExampleRepeatProcessor.Factory());
+    }
+}
diff --git a/plugins/examples/custom-processor/src/main/java/org/elasticsearch/example/customprocessor/ExampleRepeatProcessor.java b/plugins/examples/custom-processor/src/main/java/org/elasticsearch/example/customprocessor/ExampleRepeatProcessor.java
new file mode 100644
index 000000000000..f0f942459281
--- /dev/null
+++ b/plugins/examples/custom-processor/src/main/java/org/elasticsearch/example/customprocessor/ExampleRepeatProcessor.java
@@ -0,0 +1,53 @@
+package org.elasticsearch.example.customprocessor;
+
+import org.elasticsearch.ingest.AbstractProcessor;
+import org.elasticsearch.ingest.ConfigurationUtils;
+import org.elasticsearch.ingest.IngestDocument;
+import org.elasticsearch.ingest.Processor;
+
+import java.util.Map;
+
+/**
+ * Example of adding an ingest processor with a plugin.
+ */
+public class ExampleRepeatProcessor extends AbstractProcessor {
+    public static final String TYPE = "repeat";
+    public static final String FIELD_KEY_NAME = "field";
+
+    private final String field;
+
+    ExampleRepeatProcessor(String tag, String description, String field) {
+        super(tag, description);
+        this.field = field;
+    }
+
+    @Override
+    public IngestDocument execute(IngestDocument document) {
+        Object val = document.getFieldValue(field, Object.class, true);
+
+        if (val instanceof String string) {
+            String repeated = string.concat(string);
+            document.setFieldValue(field, repeated);
+        }
+        return document;
+    }
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    public static class Factory implements Processor.Factory {
+
+        @Override
+        public ExampleRepeatProcessor create(
+            Map<String, Processor.Factory> registry,
+            String tag,
+            String description,
+            Map<String, Object> config
+        ) {
+            String field = ConfigurationUtils.readStringProperty(TYPE, tag, config, FIELD_KEY_NAME);
+            return new ExampleRepeatProcessor(tag, description, field);
+        }
+    }
+}
diff --git a/plugins/examples/custom-processor/src/yamlRestTest/java/org/elasticsearch/example/customprocessor/ExampleProcessorClientYamlTestSuiteIT.java b/plugins/examples/custom-processor/src/yamlRestTest/java/org/elasticsearch/example/customprocessor/ExampleProcessorClientYamlTestSuiteIT.java
new file mode 100644
index 000000000000..ac08df358fe5
--- /dev/null
+++ b/plugins/examples/custom-processor/src/yamlRestTest/java/org/elasticsearch/example/customprocessor/ExampleProcessorClientYamlTestSuiteIT.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+package org.elasticsearch.example.customprocessor;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
+import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
+
+/**
+ * {@link ExampleProcessorClientYamlTestSuiteIT} executes the plugin's REST API integration tests.
+ * <p>
+ * The tests can be executed using the command: ./gradlew :custom-processor:yamlRestTest
+ * <p>
+ * This class extends {@link ESClientYamlSuiteTestCase}, which takes care of parsing the YAML files
+ * located in the src/yamlRestTest/resources/rest-api-spec/test/ directory and validates them against the
+ * custom REST API definition files located in src/yamlRestTest/resources/rest-api-spec/api/.
+ * <p>
+ * Once validated, {@link ESClientYamlSuiteTestCase} executes the REST tests against a single node
+ * integration cluster which has the plugin already installed by the Gradle build script.
+ * </p>
+ */
+public class ExampleProcessorClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
+
+    public ExampleProcessorClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
+        super(testCandidate);
+    }
+
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() throws Exception {
+        // The test executes all the test candidates by default
+        // see ESClientYamlSuiteTestCase.REST_TESTS_SUITE
+        return ESClientYamlSuiteTestCase.createParameters();
+    }
+}
diff --git a/plugins/examples/custom-processor/src/yamlRestTest/resources/rest-api-spec/test/customprocessor/10_basic.yml b/plugins/examples/custom-processor/src/yamlRestTest/resources/rest-api-spec/test/customprocessor/10_basic.yml
new file mode 100644
index 000000000000..40f5835fe976
--- /dev/null
+++ b/plugins/examples/custom-processor/src/yamlRestTest/resources/rest-api-spec/test/customprocessor/10_basic.yml
@@ -0,0 +1,15 @@
+"Custom processor is present":
+  - do:
+      ingest.put_pipeline:
+        id: pipeline1
+        body:  >
+          {
+            "processors": [
+              {
+                "repeat" : {
+                  "field": "test"
+                }
+              }
+            ]
+          }
+  - match: { acknowledged: true }
diff --git a/plugins/examples/custom-processor/src/yamlRestTest/resources/rest-api-spec/test/customprocessor/20_process_document.yml b/plugins/examples/custom-processor/src/yamlRestTest/resources/rest-api-spec/test/customprocessor/20_process_document.yml
new file mode 100644
index 000000000000..7e8bc2e0a2d7
--- /dev/null
+++ b/plugins/examples/custom-processor/src/yamlRestTest/resources/rest-api-spec/test/customprocessor/20_process_document.yml
@@ -0,0 +1,59 @@
+setup:
+  - do:
+      ingest.put_pipeline:
+        id: pipeline1
+        body:  >
+          {
+            "processors": [
+              {
+                "repeat" : {
+                  "field": "to_repeat"
+                }
+              }
+            ]
+          }
+---
+teardown:
+  - do:
+      ingest.delete_pipeline:
+        id: pipeline1
+        ignore: 404
+
+  - do:
+      indices.delete:
+        index: index1
+        ignore: 404
+---
+"Process document":
+  # index a document with field to be processed
+  - do:
+      index:
+        id: doc1
+        index: index1
+        pipeline: pipeline1
+        body: { to_repeat: "foo" }
+  - match: { result: "created" }
+
+  # validate document is processed
+  - do:
+      get:
+        index: index1
+        id: doc1
+  - match: { _source: { to_repeat: "foofoo" } }
+---
+"Does not process document without field":
+  # index a document without field to be processed
+  - do:
+      index:
+        id: doc1
+        index: index1
+        pipeline: pipeline1
+        body: { field1: "foo" }
+  - match: { result: "created" }
+
+  # validate document is not processed
+  - do:
+      get:
+        index: index1
+        id: doc1
+  - match: { _source: { field1: "foo" } }
diff --git a/plugins/examples/custom-settings/src/test/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsConfigTests.java b/plugins/examples/custom-settings/src/test/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsConfigTests.java
index f5e205500d23..23a134d58b8a 100644
--- a/plugins/examples/custom-settings/src/test/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsConfigTests.java
+++ b/plugins/examples/custom-settings/src/test/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsConfigTests.java
@@ -17,7 +17,7 @@
  * <p>
  * It's a JUnit test class that extends {@link ESTestCase} which provides useful methods for testing.
  * <p>
- * The tests can be executed in the IDE or using the command: ./gradlew :example-plugins:custom-settings:test
+ * The tests can be executed in the IDE or using the command: ./gradlew :custom-settings:test
  */
 public class ExampleCustomSettingsConfigTests extends ESTestCase {
 
diff --git a/plugins/examples/custom-settings/src/yamlRestTest/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsClientYamlTestSuiteIT.java b/plugins/examples/custom-settings/src/yamlRestTest/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsClientYamlTestSuiteIT.java
index 40a8af569b33..9377cc7afd47 100644
--- a/plugins/examples/custom-settings/src/yamlRestTest/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsClientYamlTestSuiteIT.java
+++ b/plugins/examples/custom-settings/src/yamlRestTest/java/org/elasticsearch/example/customsettings/ExampleCustomSettingsClientYamlTestSuiteIT.java
@@ -15,7 +15,7 @@
 /**
  * {@link ExampleCustomSettingsClientYamlTestSuiteIT} executes the plugin's REST API integration tests.
  * <p>
- * The tests can be executed using the command: ./gradlew :example-plugins:custom-settings:yamlRestTest
+ * The tests can be executed using the command: ./gradlew :custom-settings:yamlRestTest
  * <p>
  * This class extends {@link ESClientYamlSuiteTestCase}, which takes care of parsing the YAML files
  * located in the src/yamlRestTest/resources/rest-api-spec/test/ directory and validates them against the
diff --git a/plugins/examples/rest-handler/src/yamlRestTest/java/org/elasticsearch/example/resthandler/ExampleRestHandlerClientYamlTestSuiteIT.java b/plugins/examples/rest-handler/src/yamlRestTest/java/org/elasticsearch/example/resthandler/ExampleRestHandlerClientYamlTestSuiteIT.java
index e6d5ac688cce..9ebfc5ebfe9d 100644
--- a/plugins/examples/rest-handler/src/yamlRestTest/java/org/elasticsearch/example/resthandler/ExampleRestHandlerClientYamlTestSuiteIT.java
+++ b/plugins/examples/rest-handler/src/yamlRestTest/java/org/elasticsearch/example/resthandler/ExampleRestHandlerClientYamlTestSuiteIT.java
@@ -15,7 +15,7 @@
 /**
  * {@link ExampleRestHandlerClientYamlTestSuiteIT} executes the plugin's REST API integration tests.
  * <p>
- * The tests can be executed using the command: ./gradlew :example-plugins:rest-handler:yamlRestTest
+ * The tests can be executed using the command: ./gradlew :rest-handler:yamlRestTest
  * <p>
  * This class extends {@link ESClientYamlSuiteTestCase}, which takes care of parsing the YAML files
  * located in the src/yamlRestTest/resources/rest-api-spec/test/ directory and validates them against the
diff --git a/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java b/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java
index 8d50a9f7e29a..b66ce41d3259 100644
--- a/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java
+++ b/plugins/mapper-annotated-text/src/main/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapper.java
@@ -30,7 +30,6 @@
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.elasticsearch.index.mapper.KeywordFieldMapper;
 import org.elasticsearch.index.mapper.MapperBuilderContext;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.StringStoredFieldFieldLoader;
 import org.elasticsearch.index.mapper.TextFieldMapper;
 import org.elasticsearch.index.mapper.TextParams;
@@ -46,7 +45,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -150,7 +148,6 @@ private AnnotatedTextFieldType buildFieldType(FieldType fieldType, MapperBuilder
 
         @Override
         public AnnotatedTextFieldMapper build(MapperBuilderContext context) {
-            MultiFields multiFields = multiFieldsBuilder.build(this, context);
             FieldType fieldType = TextParams.buildFieldType(() -> true, store, indexOptions, norms, termVectors);
             if (fieldType.indexOptions() == IndexOptions.NONE) {
                 throw new IllegalArgumentException("[" + CONTENT_TYPE + "] fields must be indexed");
@@ -162,12 +159,12 @@ public AnnotatedTextFieldMapper build(MapperBuilderContext context) {
                     );
                 }
             }
+            BuilderParams builderParams = builderParams(this, context);
             return new AnnotatedTextFieldMapper(
                 leafName(),
                 fieldType,
-                buildFieldType(fieldType, context, multiFields),
-                multiFields,
-                copyTo,
+                buildFieldType(fieldType, context, builderParams.multiFields()),
+                builderParams,
                 this
             );
         }
@@ -523,11 +520,10 @@ protected AnnotatedTextFieldMapper(
         String simpleName,
         FieldType fieldType,
         AnnotatedTextFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+        super(simpleName, mappedFieldType, builderParams);
         assert fieldType.tokenized();
         this.fieldType = freezeAndDeduplicateFieldType(fieldType);
         this.builder = builder;
@@ -572,39 +568,23 @@ public FieldMapper.Builder getMergeBuilder() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
         if (fieldType.stored()) {
-            return new StringStoredFieldFieldLoader(fullPath(), leafName()) {
+            var loader = new StringStoredFieldFieldLoader(fullPath(), leafName()) {
                 @Override
                 protected void write(XContentBuilder b, Object value) throws IOException {
                     b.value((String) value);
                 }
             };
+
+            return new SyntheticSourceSupport.Native(loader);
         }
 
         var kwd = TextFieldMapper.SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
         if (kwd != null) {
-            return kwd.syntheticFieldLoader(leafName());
+            return new SyntheticSourceSupport.Native(kwd.syntheticFieldLoader(leafName()));
         }
 
-        throw new IllegalArgumentException(
-            String.format(
-                Locale.ROOT,
-                "field [%s] of type [%s] doesn't support synthetic source unless it is stored or has a sub-field of"
-                    + " type [keyword] with doc values or stored and without a normalizer",
-                fullPath(),
-                typeName()
-            )
-        );
+        return super.syntheticSourceSupport();
     }
 }
diff --git a/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/20_synthetic_source.yml b/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/20_synthetic_source.yml
index 54a51e60f56d..4aac881700e1 100644
--- a/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/20_synthetic_source.yml
+++ b/plugins/mapper-annotated-text/src/yamlRestTest/resources/rest-api-spec/test/mapper_annotatedtext/20_synthetic_source.yml
@@ -195,3 +195,34 @@ multiple values in stored annotated_text field with keyword multi-field:
   - match:
       hits.hits.0._source:
         annotated_text: ["world", "hello", "world"]
+
+---
+fallback synthetic source:
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              annotated_text:
+                type: annotated_text
+                store: false
+
+  - do:
+      index:
+        index: test
+        id: 1
+        refresh: true
+        body:
+          annotated_text: ["world", "hello", "world"]
+
+  - do:
+      search:
+        index: test
+
+  - match:
+      hits.hits.0._source:
+        annotated_text: ["world", "hello", "world"]
+
diff --git a/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java b/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java
index 0b29bc906291..979ca842ef34 100644
--- a/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java
+++ b/plugins/mapper-murmur3/src/main/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapper.java
@@ -57,8 +57,7 @@ public Murmur3FieldMapper build(MapperBuilderContext context) {
             return new Murmur3FieldMapper(
                 leafName(),
                 new Murmur3FieldType(context.buildFullName(leafName()), stored.getValue(), meta.getValue()),
-                multiFieldsBuilder.build(this, context),
-                copyTo
+                builderParams(this, context)
             );
         }
     }
@@ -94,8 +93,8 @@ public Query termQuery(Object value, SearchExecutionContext context) {
         }
     }
 
-    protected Murmur3FieldMapper(String simpleName, MappedFieldType mappedFieldType, MultiFields multiFields, CopyTo copyTo) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+    protected Murmur3FieldMapper(String simpleName, MappedFieldType mappedFieldType, BuilderParams builderParams) {
+        super(simpleName, mappedFieldType, builderParams);
     }
 
     @Override
diff --git a/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java b/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java
index b188f4b14859..6a4869b8c89b 100644
--- a/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java
+++ b/plugins/mapper-size/src/main/java/org/elasticsearch/index/mapper/size/SizeFieldMapper.java
@@ -16,7 +16,6 @@
 import org.elasticsearch.index.mapper.MetadataFieldMapper;
 import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType;
 import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.ValueFetcher;
 import org.elasticsearch.index.query.SearchExecutionContext;
 
@@ -97,9 +96,4 @@ public void postParse(DocumentParserContext context) {
     public FieldMapper.Builder getMergeBuilder() {
         return new Builder().init(this);
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java
index 081c6c26319a..39bc59012ed0 100644
--- a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java
+++ b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java
@@ -141,7 +141,7 @@ public void testSimpleWorkflow() {
         assertThat(restoreSnapshotResponse.getRestoreInfo().totalShards(), greaterThan(0));
         ensureGreen();
         assertThat(count(client, "test-idx-1"), equalTo(100L));
-        ClusterState clusterState = client.admin().cluster().prepareState().get().getState();
+        ClusterState clusterState = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.getMetadata().hasIndex("test-idx-1"), equalTo(true));
         assertThat(clusterState.getMetadata().hasIndex("test-idx-2"), equalTo(false));
         final BlobStoreRepository repo = (BlobStoreRepository) getInstanceFromNode(RepositoriesService.class).repository("test-repo");
diff --git a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java
index c57112d0455c..120b6bdf3288 100644
--- a/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java
+++ b/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/ParameterizedFullClusterRestartTestCase.java
@@ -36,7 +36,8 @@
 
 @TestCaseOrdering(FullClusterRestartTestOrdering.class)
 public abstract class ParameterizedFullClusterRestartTestCase extends ESRestTestCase {
-    private static final Version MINIMUM_WIRE_COMPATIBLE_VERSION = Version.fromString("7.17.0");
+
+    private static final Version MINIMUM_WIRE_COMPATIBLE_VERSION = Version.fromString(System.getProperty("tests.minimum.wire.compatible"));
     private static final String OLD_CLUSTER_VERSION = System.getProperty("tests.old_cluster_version");
     private static IndexVersion oldIndexVersion;
     private static boolean upgradeFailed = false;
diff --git a/qa/restricted-loggers/src/test/java/org/elasticsearch/common/logging/LoggersTests.java b/qa/restricted-loggers/src/test/java/org/elasticsearch/common/logging/LoggersTests.java
index bd7e086d01f0..5af036a9a039 100644
--- a/qa/restricted-loggers/src/test/java/org/elasticsearch/common/logging/LoggersTests.java
+++ b/qa/restricted-loggers/src/test/java/org/elasticsearch/common/logging/LoggersTests.java
@@ -29,7 +29,7 @@ public class LoggersTests extends ESTestCase {
     public void testClusterUpdateSettingsRequestValidationForLoggers() {
         assertThat(Loggers.RESTRICTED_LOGGERS, hasSize(greaterThan(0)));
 
-        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
+        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         for (String logger : Loggers.RESTRICTED_LOGGERS) {
             var validation = request.persistentSettings(Map.of("logger." + logger, org.elasticsearch.logging.Level.DEBUG)).validate();
             assertNotNull(validation);
diff --git a/qa/rolling-upgrade-legacy/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java b/qa/rolling-upgrade-legacy/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java
index fe2236adc490..b0025302701a 100644
--- a/qa/rolling-upgrade-legacy/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java
+++ b/qa/rolling-upgrade-legacy/src/test/java/org/elasticsearch/upgrades/RecoveryIT.java
@@ -419,7 +419,7 @@ public void testRecoveryClosedIndex() throws Exception {
         }
 
         final IndexVersion indexVersionCreated = indexVersionCreated(indexName);
-        if (indexVersionCreated.onOrAfter(IndexVersions.V_7_2_0)) {
+        if (indexVersionCreated.onOrAfter(IndexVersions.V_8_0_0)) {
             // index was created on a version that supports the replication of closed indices,
             // so we expect the index to be closed and replicated
             ensureGreen(indexName);
@@ -448,7 +448,7 @@ public void testCloseIndexDuringRollingUpgrade() throws Exception {
             closeIndex(indexName);
         }
 
-        if (minimumIndexVersion().onOrAfter(IndexVersions.V_7_2_0)) {
+        if (minimumIndexVersion().onOrAfter(IndexVersions.V_8_0_0)) {
             // index is created on a version that supports the replication of closed indices,
             // so we expect the index to be closed and replicated
             ensureGreen(indexName);
@@ -483,9 +483,9 @@ public void testClosedIndexNoopRecovery() throws Exception {
             closeIndex(indexName);
         }
 
-        if (indexVersionCreated(indexName).onOrAfter(IndexVersions.V_7_2_0)) {
+        if (indexVersionCreated(indexName).onOrAfter(IndexVersions.V_8_0_0)) {
             // index was created on a version that supports the replication of closed indices, so we expect it to be closed and replicated
-            assertTrue(minimumIndexVersion().onOrAfter(IndexVersions.V_7_2_0));
+            assertTrue(minimumIndexVersion().onOrAfter(IndexVersions.V_8_0_0));
             ensureGreen(indexName);
             assertClosedIndex(indexName, true);
             if (CLUSTER_TYPE != ClusterType.OLD) {
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/yamlRestTest/resources/rest-api-spec/test/ingest/80_ingest_simulate.yml b/qa/smoke-test-ingest-with-all-dependencies/src/yamlRestTest/resources/rest-api-spec/test/ingest/80_ingest_simulate.yml
index 1a7701991428..35ec9979c325 100644
--- a/qa/smoke-test-ingest-with-all-dependencies/src/yamlRestTest/resources/rest-api-spec/test/ingest/80_ingest_simulate.yml
+++ b/qa/smoke-test-ingest-with-all-dependencies/src/yamlRestTest/resources/rest-api-spec/test/ingest/80_ingest_simulate.yml
@@ -217,7 +217,9 @@ setup:
 "Test ingest simulate with reroute and mapping validation from templates":
 
   - skip:
-      features: headers
+      features:
+        - headers
+        - allowed_warnings
 
   - requires:
       cluster_features: ["simulate.mapping.validation.templates"]
@@ -241,6 +243,8 @@ setup:
   - match: { acknowledged: true }
 
   - do:
+      allowed_warnings:
+        - "index template [first-index-template] has index patterns [first-index*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [first-index-template] will take precedence during new index creation"
       indices.put_index_template:
         name: first-index-template
         body:
@@ -255,6 +259,8 @@ setup:
                   type: text
 
   - do:
+      allowed_warnings:
+        - "index template [second-index-template] has index patterns [second-index*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [second-index-template] will take precedence during new index creation"
       indices.put_index_template:
         name: second-index-template
         body:
diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle
index 089b7470e9a9..015c9c4b812c 100644
--- a/rest-api-spec/build.gradle
+++ b/rest-api-spec/build.gradle
@@ -41,194 +41,6 @@ dependencies {
   clusterModules project(':modules:data-streams')
 }
 
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-
-  task.skipTestsByFilePattern("**/cat*/*.yml", "Cat API are meant to be consumed by humans, so will not be supported by Compatible REST API")
-  task.skipTestsByFilePattern("**/indices.upgrade/*.yml", "upgrade api will only get a dummy endpoint returning an exception suggesting to use _reindex")
-  task.skipTestsByFilePattern("**/indices.stats/60_field_usage/*/*.yml", "field usage results will be different between lucene versions")
-  task.skipTestsByFilePattern("**/search.aggregation/*.yml", "run by the aggregation module")
-
-  task.skipTest("bulk/11_dynamic_templates/Dynamic templates", "Error message has changed")
-  task.skipTest("index/80_date_nanos/date_nanos requires dates after 1970 and before 2262", "Error message has changed")
-  task.skipTest("indices.create/20_mix_typeless_typeful/Implicitly create a typed index while there is a typeless template", "Type information about the type is removed and not passed down. The logic to check for this is also removed.")
-  task.skipTest("indices.create/20_mix_typeless_typeful/Implicitly create a typeless index while there is a typed template", "Type information about the type is removed and not passed down. The logic to check for this is also removed.")
-  task.skipTest("delete/70_mix_typeless_typeful/DELETE with typeless API on an index that has types", "Type information about the type is removed and not passed down. The logic to check for this is also removed.");
-  task.skipTest("get/100_mix_typeless_typeful/GET with typeless API on an index that has types", "Failing due to not recognising missing type (the type path param is ignored, will no be fixed");
-  task.skipTest("indices.get_field_mapping/21_missing_field_with_types/Return empty object if field doesn't exist, but type and index do", "This test returns test_index.mappings:{} when {} was expected. difference between 20_missing_field and 21_missing_field_with_types?")
-  task.skipTest("indices.get_field_mapping/30_missing_type/Raise 404 when type doesn't exist", "The information about the type is not present in the index. hence it cannot know if the type exist or not.")
-  task.skipTest("indices.get_mapping/20_missing_type/Existent and non-existent type returns 404 and the existing type", " The information about the type is not present in the index. hence it cannot know if the type exist or not")
-  task.skipTest("indices.get_mapping/20_missing_type/Existent and non-existent types returns 404 and the existing type", "The information about the type is not present in the index. hence it cannot know if the type exist or not.")
-  task.skipTest("indices.get_mapping/20_missing_type/No type matching pattern returns 404", "The information about the type is not present in the index. hence it cannot know if the type exist or not.")
-  task.skipTest("indices.get_mapping/20_missing_type/Non-existent type returns 404", "The information about the type is not present in the index. hence it cannot know if the type exist or not.")
-  task.skipTest("indices.get_mapping/20_missing_type/Type missing when no types exist", "The information about the type is not present in the index. hence it cannot know if the type exist or not.")
-  task.skipTest("indices.put_mapping/20_mix_typeless_typeful/PUT mapping with _doc on an index that has types", "The information about the type is not present in the index. hence it cannot know if the type was already used or not")
-  task.skipTest("indices.put_mapping/20_mix_typeless_typeful/PUT mapping with typeless API on an index that has types", "The information about the type is not present in the index. hence it cannot know if the type was already used or not")
-  task.skipTest("search/160_exists_query/Test exists query on _type field", "There is a small distinction between empty mappings and no mappings at all. The code to implement this test was refactored #54003; field search on _type field- not implementing. The data for _type is considered incorrect in this search")
-  task.skipTest("termvectors/50_mix_typeless_typeful/Term vectors with typeless API on an index that has types", "type information is not stored, hence the the index will be found")
-  task.skipTest("mget/11_default_index_type/Default index/type", "mget - these use cases are no longer valid because we always default to _doc.;  This mean test cases where there is assertion on not finding by type won't work")
-  task.skipTest("mget/16_basic_with_types/Basic multi-get", "mget - these use cases are no longer valid, because we always default to _doc.;  This mean test cases where there is assertion on not finding by type won't work")
-  task.skipTest("explain/40_mix_typeless_typeful/Explain with typeless API on an index that has types", "asserting about type not found won't work as we ignore the type information")
-  task.skipTest("indices.stats/20_translog/Translog retention settings are deprecated", "translog settings removal is not supported under compatible api")
-  task.skipTest("indices.stats/20_translog/Translog retention without soft_deletes", "translog settings removal is not supported under compatible api")
-  task.skipTest("indices.stats/20_translog/Translog stats on closed indices without soft-deletes", "translog settings removal is not supported under compatible api")
-  task.skipTest("indices.create/10_basic/Create index without soft deletes", "Make soft-deletes mandatory in 8.0 #51122 - settings changes are note supported in Rest Api compatibility")
-  task.skipTest("field_caps/30_filter/Field caps with index filter", "behaviour change after #63692 4digits dates are parsed as epoch and in quotes as year")
-  task.skipTest("indices.forcemerge/10_basic/Check deprecation warning when incompatible only_expunge_deletes and max_num_segments values are both set", "#44761 bug fix")
-  task.skipTest("search/340_type_query/type query", "#47207 type query throws exception in compatible mode")
-  task.skipTest("search/310_match_bool_prefix/multi_match multiple fields with cutoff_frequency throws exception", "#42654 cutoff_frequency, common terms are not supported. Throwing an exception")
-  task.skipTest("search_shards/10_basic/Search shards aliases with and without filters", "Filter representation no longer outputs default boosts")
-  task.skipTest("migration/10_get_feature_upgrade_status/Get feature upgrade status", "Awaits backport")
-  task.skipTest("search/330_fetch_fields/Test disable source", "Error no longer thrown")
-  task.skipTest("search/370_profile/fetch fields", "profile output has changed")
-  task.skipTest("search/370_profile/fetch source", "profile output has changed")
-  task.skipTest("search/370_profile/fetch nested source", "profile output has changed")
-  task.skipTest("search/240_date_nanos/doc value fields are working as expected across date and date_nanos fields", "Fetching docvalues field multiple times is no longer allowed")
-  task.skipTest("search/110_field_collapsing/field collapsing and rescore", "#107779 Field collapsing is compatible with rescore in 8.15")
-
-  task.replaceValueInMatch("_type", "_doc")
-  task.addAllowedWarningRegex("\\[types removal\\].*")
-  task.replaceValueInMatch("nodes.\$node_id.roles.8", "ml", "node_info role test")
-  task.replaceValueInMatch("nodes.\$node_id.roles.9", "remote_cluster_client", "node_info role test")
-  task.removeMatch("nodes.\$node_id.roles.10", "node_info role test")
-  task.replaceIsTrue("test_index.mappings.type_1", "test_index.mappings._doc")
-  //override for indices.get and indices.create
-  //task.replaceIsFalse("test_index.mappings.type_1", "test_index.mappings._doc")
-  //overrides for indices.create/20_mix_typeless_typeful
-  task.replaceIsFalse("test-1.mappings._doc","false",  "Create a typed index while there is a typeless template")
-  task.replaceIsFalse("test-1.mappings._doc","false", "Create a typeless index while there is a typed template")
-
-  task.replaceIsTrue("test-1.mappings.my_type", "test-1.mappings._doc")
-  task.replaceIsTrue("test-1.mappings.my_type.properties.foo", "test-1.mappings._doc.properties.foo")
-  task.replaceIsTrue("test-1.mappings.my_type.properties.bar", "test-1.mappings._doc.properties.bar")
-
-  // overrides for indices.get_field_mapping
-  task.replaceKeyInLength("test_index.mappings.test_type.text.mapping.text.type",
-    "test_index.mappings._doc.text.mapping.text.type"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.text.mapping.text.analyzer",
-    "test_index.mappings._doc.text.mapping.text.analyzer"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.t1.full_name",
-    "test_index.mappings._doc.t1.full_name"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.t2.full_name",
-    "test_index.mappings._doc.t2.full_name"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.obj\\.t1.full_name",
-    "test_index.mappings._doc.obj\\.t1.full_name"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.obj\\.i_t1.full_name",
-    "test_index.mappings._doc.obj\\.i_t1.full_name"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.obj\\.i_t3.full_name",
-    "test_index.mappings._doc.obj\\.i_t3.full_name"
-  )
-  task.replaceKeyInLength("test_index.mappings.test_type",
-    "test_index.mappings._doc"
-  )
-  task.replaceKeyInMatch("test_index_2.mappings.test_type_2.t1.full_name",
-    "test_index.mappings._doc.t1.full_name"
-  )
-  task.replaceKeyInMatch("test_index_2.mappings.test_type_2.t2.full_name",
-    "test_index.mappings._doc.t2.full_name"
-  )
-  task.replaceKeyInLength("test_index_2.mappings.test_type_2",
-    "test_index.mappings._doc"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.text.mapping.text.type",
-    "test_index.mappings._doc.text.mapping.text.type"
-  )
-  // overrides for indices.put_mapping/11_basic_with_types
-  task.replaceKeyInMatch("test_index.mappings.test_type.properties.text1.type",
-    "test_index.mappings._doc.properties.text1.type"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.properties.text1.analyzer",
-    "test_index.mappings._doc.properties.text1.analyzer"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.properties.text2.type",
-    "test_index.mappings._doc.properties.text2.type"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.properties.text2.analyzer",
-    "test_index.mappings._doc.properties.text2.analyzer"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.properties.subfield.properties.text3.type",
-    "test_index.mappings._doc.properties.subfield.properties.text3.type"
-  )
-  task.replaceKeyInMatch("test_index.mappings.test_type.properties.text1.fields.text_raw.type",
-    "test_index.mappings._doc.properties.text1.fields.text_raw.type"
-  )
-  // overrides for indices.put_mapping/all_path_options_with_types
-  task.replaceKeyInMatch("test_index1.mappings.test_type.properties.text.type",
-    "test_index1.mappings._doc.properties.text.type"
-  )
-  task.replaceKeyInMatch("test_index1.mappings.test_type.properties.text.analyzer",
-    "test_index1.mappings._doc.properties.text.analyzer"
-  )
-  task.replaceKeyInMatch("test_index2.mappings.test_type.properties.text.type",
-    "test_index2.mappings._doc.properties.text.type"
-  )
-  task.replaceKeyInMatch("test_index2.mappings.test_type.properties.text.analyzer",
-    "test_index2.mappings._doc.properties.text.analyzer"
-  )
-  task.replaceKeyInMatch("foo.mappings.test_type.properties.text.type",
-    "foo.mappings._doc.properties.text.type"
-  )
-  task.replaceKeyInMatch("foo.mappings.test_type.properties.text.analyzer",
-    "foo.mappings._doc.properties.text.analyzer"
-  )
-  // overrides for indices.get_mapping
-  task.replaceIsTrue("test_1.mappings.doc", "test_1.mappings._doc")
-  task.replaceIsTrue("test_2.mappings.doc", "test_2.mappings._doc")
-  // overrides for mget
-  task.replaceValueInMatch("docs.0._type", "_doc" , "Basic multi-get") // index found, but no doc
-  task.replaceValueInMatch("docs.0._type", "_doc", "Default index/type")
-  task.replaceValueInMatch("docs.0._type", "_doc", "Non-existent index")
-  task.replaceValueInMatch("docs.0._type", "_doc", "Missing metadata")
-  task.replaceValueInMatch("docs.0._type", "_doc", "Multi Get with alias that resolves to multiple indices")
-  task.replaceValueInMatch("docs.1._type", "_doc", "Multi Get with alias that resolves to multiple indices")
-  task.replaceValueInMatch("docs.2._type", "_doc", "Multi Get with alias that resolves to multiple indices")
-  task.replaceValueInMatch("docs.0._type", "_doc", "IDs")
-  task.replaceValueInMatch("docs.1._type", "_doc", "IDs")
-  task.replaceValueInMatch("docs.2._type", "_doc", "Routing")
-
-  //overrides for indices.stats
-  //TODO fix to remove the below match
-  task.replaceKeyInMatch("_all.primaries.indexing.types.baz.index_total",
-    "_all.primaries.indexing.types._doc.index_total"
-  )
-  task.replaceKeyInMatch("_all.primaries.indexing.types.bar.index_total",
-    "_all.primaries.indexing.types._doc.index_total"
-  )
-  task.replaceValueInMatch("_all.primaries.indexing.types._doc.index_total", 2)
-  // points get touched by sorting in ES 8
-  task.replaceValueInMatch("testindex.shards.0.stats.fields.price.points", 1)
-
-  //override for "indices.open/10_basic/?wait_for_active_shards default is deprecated" and "indices.open/10_basic/?wait_for_active_shards=index-setting"
-  task.addAllowedWarningRegexForTest("\\?wait_for_active_shards=index-setting is now the default behaviour.*", "?wait_for_active_shards=index-setting")
-  task.removeWarningForTest("the default value for the ?wait_for_active_shards parameter will change from '0' to 'index-setting' in version 8; " +
-    "specify '?wait_for_active_shards=index-setting' to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour"
-    , "?wait_for_active_shards default is deprecated")
-
-  // override for exception message change in #55291 tests cluster.voting_config_exclusions/10_basic/
-  // 'Throw exception when adding voting config exclusion and specifying both node_ids and node_names',
-  // 'Throw exception when adding voting config exclusion without specifying nodes',
-  task.replaceValueTextByKeyValue("catch",
-    '/Please set node identifiers correctly. One and only one of \\[node_name\\], \\[node_names\\] and \\[node_ids\\] has to be set/',
-    '/You must set \\[node_names\\] or \\[node_ids\\] but not both/')
-
-  // sync_id is no longer available in SegmentInfos.userData // "indices.flush/10_basic/Index synced flush rest test"
-  task.replaceIsTrue("indices.testing.shards.0.0.commit.user_data.sync_id", "indices.testing.shards.0.0.commit.user_data")
-
-  // we can now search using doc values only
-  task.replaceValueInMatch("fields.object\\.nested1.long.searchable", true)
-
-  //client.type no longer exists #101214
-  task.replaceKeyInMatch("nodes.\$node_id.settings.client.type", "nodes.\$node_id.settings.node.attr.testattr")
-  task.replaceValueInMatch("nodes.\$node_id.settings.node.attr.testattr", "test")
-  task.replaceKeyInMatch("nodes.\$node_id.settings.client\\.type", "nodes.\$node_id.settings.node\\.attr\\.testattr")
-  task.replaceValueInMatch("nodes.\$node_id.settings.node\\.attr\\.testattr", "test")
-}
-
 tasks.register('enforceYamlTestConvention').configure {
   def tree = fileTree('src/main/resources/rest-api-spec/test')
   doLast {
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_geoip_database.json b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_geoip_database.json
index 07f9e3774027..5447ea1e5a4e 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_geoip_database.json
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/ingest.put_geoip_database.json
@@ -7,7 +7,8 @@
     "stability":"stable",
     "visibility":"public",
     "headers":{
-      "accept": [ "application/json"]
+      "accept": [ "application/json"],
+      "content_type": ["application/json"]
     },
     "url":{
       "paths":[
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_verify_integrity.json b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_verify_integrity.json
new file mode 100644
index 000000000000..bab8101b7455
--- /dev/null
+++ b/rest-api-spec/src/main/resources/rest-api-spec/api/snapshot.repository_verify_integrity.json
@@ -0,0 +1,65 @@
+{
+  "snapshot.repository_verify_integrity":{
+    "documentation":{
+      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html",
+      "description":"Verifies the integrity of the contents of a snapshot repository"
+    },
+    "stability":"experimental",
+    "visibility":"private",
+    "headers": {
+      "accept": [
+        "application/json"
+      ]
+    },
+    "url":{
+      "paths":[
+        {
+          "path":"/_snapshot/{repository}/_verify_integrity",
+          "methods":[
+            "POST"
+          ],
+          "parts":{
+            "repository":{
+              "type":"string",
+              "description":"A repository name"
+            }
+          }
+        }
+      ]
+    },
+    "params":{
+      "meta_thread_pool_concurrency":{
+        "type":"number",
+        "description":"Number of threads to use for reading metadata"
+      },
+      "blob_thread_pool_concurrency":{
+        "type":"number",
+        "description":"Number of threads to use for reading blob contents"
+      },
+      "snapshot_verification_concurrency":{
+        "type":"number",
+        "description":"Number of snapshots to verify concurrently"
+      },
+      "index_verification_concurrency":{
+        "type":"number",
+        "description":"Number of indices to verify concurrently"
+      },
+      "index_snapshot_verification_concurrency":{
+        "type":"number",
+        "description":"Number of snapshots to verify concurrently within each index"
+      },
+      "max_failed_shard_snapshots":{
+        "type":"number",
+        "description":"Maximum permitted number of failed shard snapshots"
+      },
+      "verify_blob_contents":{
+        "type":"boolean",
+        "description":"Whether to verify the contents of individual blobs"
+      },
+      "max_bytes_per_sec":{
+        "type":"string",
+        "description":"Rate limit for individual blob verification"
+      }
+    }
+  }
+}
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml
index cf43797a451e..06139542c5e5 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml
@@ -258,8 +258,8 @@
 ---
 "Dense vector stats":
   - requires:
-      cluster_features: [ "gte_v8.15.0" ]
-      reason: "dense vector stats reports from primary indices in 8.15"
+      cluster_features: [ "gte_v8.16.0" ]
+      reason: "dense vector stats reports from primary indices in 8.15 and fixed in 8.16"
   - do:
       indices.create:
         index: test1
@@ -329,9 +329,17 @@
   - do:
       indices.refresh: { }
 
+  - do:
+      index:
+        index: test2
+        id: "3"
+        refresh: true
+        body:
+          not_vector_field: "not vector"
+
   - do: { cluster.stats: { } }
 
-  - match: { indices.docs.count: 4 }
+  - match: { indices.docs.count: 5 }
   - match: { indices.docs.deleted: 0 }
   - match: { indices.dense_vector.value_count: 8 }
 
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml
index 55605849de69..f1e296ed8e30 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/get/100_synthetic_source.yml
@@ -129,50 +129,6 @@ force_synthetic_source_ok:
           kwd: foo
   - is_false: fields
 
----
-force_synthetic_source_bad_mapping:
-  - requires:
-      cluster_features: ["gte_v8.4.0"]
-      reason: introduced in 8.4.0
-
-  - do:
-      indices.create:
-        index: test
-        body:
-          settings:
-            number_of_shards: 1 # Use a single shard to get consistent error messages
-          mappings:
-            _source:
-              mode: stored
-            properties:
-              text:
-                type: text
-
-  - do:
-      index:
-        index:   test
-        id:      1
-        refresh: true
-        body:
-          text: foo
-
-  # When _source is used in the fetch the original _source is perfect
-  - do:
-      get:
-        index: test
-        id: 1
-  - match:
-      _source:
-        text: foo
-
-  # Forcing synthetic source fails because the mapping is invalid
-  - do:
-      catch: bad_request
-      get:
-        index: test
-        id: 1
-        force_synthetic_source: true
-
 ---
 stored text:
   - requires:
@@ -1040,25 +996,6 @@ flattened field:
 
   - is_false: fields
 
----
-flattened field no doc values:
-  - requires:
-      cluster_features: ["gte_v8.8.0"]
-      reason: support for synthetic source on flattened fields added in 8.8.0
-
-  - do:
-      catch: /field \[flattened\] of type \[flattened\] doesn't support synthetic source because it doesn't have doc values/
-      indices.create:
-        index: test
-        body:
-          mappings:
-            _source:
-              mode: synthetic
-            properties:
-              flattened:
-                type: flattened
-                doc_values: false
-
 ---
 flattened field with ignore_above:
   - requires:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml
index 265aec75dc9c..9dd6cec6e657 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.create/20_synthetic_source.yml
@@ -1,23 +1,3 @@
-invalid:
-  - requires:
-      cluster_features: ["gte_v8.3.0"]
-      reason: introduced in 8.3.0
-
-  - do:
-      catch: bad_request
-      indices.create:
-        index: test
-        body:
-          mappings:
-            _source:
-              mode: synthetic
-            properties:
-              kwd:
-                type: boolean
-                doc_values: false
-
-
----
 object with unmapped fields:
   - requires:
       cluster_features: ["mapper.track_ignored_source"]
@@ -990,3 +970,247 @@ subobjects auto:
   - match: { hits.hits.3._source.id: 4  }
   - match: { hits.hits.3._source.auto_obj.foo: 40 }
   - match: { hits.hits.3._source.auto_obj.foo\.bar: 400 }
+
+---
+synthetic_source with copy_to:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires copy_to support in synthetic source
+
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              number:
+                type: integer
+                copy_to: number_copy
+              number_copy:
+                type: keyword
+              boolean:
+                type: boolean
+                copy_to: boolean_copy
+              boolean_copy:
+                type: keyword
+              keyword:
+                type: keyword
+                copy_to: keyword_copy
+              keyword_copy:
+                type: keyword
+              date:
+                type: date
+                copy_to: date_copy
+              date_copy:
+                type: keyword
+              text:
+                type: text
+                copy_to: text_copy
+              text_copy:
+                type: keyword
+              ip:
+                type: ip
+                copy_to: ip_copy
+              ip_copy:
+                type: keyword
+              ip_range:
+                type: ip_range
+                copy_to: ip_range_copy
+              ip_range_copy:
+                type: keyword
+              geo_point:
+                type: geo_point
+                copy_to: geo_point_copy
+              geo_point_copy:
+                type: keyword
+              binary:
+                type: binary
+                copy_to: binary_copy
+              binary_copy:
+                type: keyword
+              scaled_float:
+                type: scaled_float
+                scaling_factor: 10
+                copy_to: scaled_float_copy
+              scaled_float_copy:
+                type: keyword
+
+
+  - do:
+      bulk:
+        index: test
+        refresh: true
+        body:
+          - '{ "create": { } }'
+          - >-
+            {
+              "number": 100,
+              "boolean": false,
+              "keyword": "hello_keyword",
+              "date": "2015-01-01T12:10:30Z",
+              "text": "hello_text",
+              "match_only_text": "hello_match_only_text",
+              "ip": "192.168.1.1",
+              "ip_range": "10.0.0.0/24",
+              "geo_point": "POINT (-71.34 41.12)",
+              "binary": "aGVsbG8gY3VyaW91cyBwZXJzb24=",
+              "scaled_float": 1.5
+            }
+
+  - match: { errors: false }
+
+  - do:
+      search:
+        index: test
+        body:
+          fields: ["number_copy", "boolean_copy", "keyword_copy", "date_copy", "text_copy", "ip_copy", "ip_range_copy", "geo_point_copy", "binary_copy", "scaled_float_copy"]
+
+  - match: { hits.hits.0._source.number: 100 }
+  - match: { hits.hits.0.fields.number_copy.0: "100" }
+
+  - match: { hits.hits.0._source.boolean: false }
+  - match: { hits.hits.0.fields.boolean_copy.0: "false" }
+
+  - match: { hits.hits.0._source.keyword: "hello_keyword" }
+  - match: { hits.hits.0.fields.keyword_copy.0: "hello_keyword" }
+
+  - match: { hits.hits.0._source.date: "2015-01-01T12:10:30Z" }
+  - match: { hits.hits.0.fields.date_copy.0: "2015-01-01T12:10:30Z" }
+
+  - match: { hits.hits.0._source.text: "hello_text" }
+  - match: { hits.hits.0.fields.text_copy.0: "hello_text" }
+
+  - match: { hits.hits.0._source.ip: "192.168.1.1" }
+  - match: { hits.hits.0.fields.ip_copy.0: "192.168.1.1" }
+
+  - match: { hits.hits.0._source.ip_range: "10.0.0.0/24" }
+  - match: { hits.hits.0.fields.ip_range_copy.0: "10.0.0.0/24" }
+
+  - match: { hits.hits.0._source.geo_point: "POINT (-71.34 41.12)" }
+  - match: { hits.hits.0.fields.geo_point_copy.0: "POINT (-71.34 41.12)" }
+
+  - match: { hits.hits.0._source.binary: "aGVsbG8gY3VyaW91cyBwZXJzb24=" }
+  - match: { hits.hits.0.fields.binary_copy.0: "aGVsbG8gY3VyaW91cyBwZXJzb24=" }
+
+  - match: { hits.hits.0._source.scaled_float: 1.5 }
+  - match: { hits.hits.0.fields.scaled_float_copy.0: "1.5" }
+
+---
+synthetic_source with disabled doc_values:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires disabled doc_values support in synthetic source
+
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              number:
+                type: integer
+                doc_values: false
+              boolean:
+                type: boolean
+                doc_values: false
+              keyword:
+                type: keyword
+                doc_values: false
+              date:
+                type: date
+                doc_values: false
+              ip:
+                type: ip
+                doc_values: false
+              ip_range:
+                type: ip_range
+                doc_values: false
+              flattened:
+                type: flattened
+                doc_values: false
+              geo_point:
+                type: geo_point
+                doc_values: false
+              binary:
+                type: binary
+                doc_values: false
+              scaled_float:
+                type: scaled_float
+                scaling_factor: 10
+                doc_values: false
+
+  - do:
+      bulk:
+        index: test
+        refresh: true
+        body:
+          - '{ "create": { } }'
+          - >-
+            {
+              "number": 100,
+              "boolean": false,
+              "keyword": "hello_keyword",
+              "date": "2015-01-01T12:10:30Z",
+              "ip": "192.168.1.1",
+              "ip_range": "10.0.0.0/24",
+              "flattened": { "f": "hey" },
+              "geo_point": "POINT (-71.34 41.12)",
+              "binary": "aGVsbG8gY3VyaW91cyBwZXJzb24=",
+              "scaled_float": 1.5
+            }
+
+  - match: { errors: false }
+
+  - do:
+      search:
+        index: test
+
+  - match: { hits.hits.0._source.number: 100 }
+  - match: { hits.hits.0._source.boolean: false }
+  - match: { hits.hits.0._source.keyword: "hello_keyword" }
+  - match: { hits.hits.0._source.date: "2015-01-01T12:10:30Z" }
+  - match: { hits.hits.0._source.ip: "192.168.1.1" }
+  - match: { hits.hits.0._source.ip_range: "10.0.0.0/24" }
+  - match: { hits.hits.0._source.flattened.f: "hey" }
+  - match: { hits.hits.0._source.geo_point: "POINT (-71.34 41.12)" }
+  - match: { hits.hits.0._source.binary: "aGVsbG8gY3VyaW91cyBwZXJzb24=" }
+  - match: { hits.hits.0._source.scaled_float: 1.5 }
+
+---
+fallback synthetic_source for text field:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires disabled doc_values support in synthetic source
+
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              text:
+                type: text
+                store: false
+
+  - do:
+      index:
+        index: test
+        id: 1
+        refresh: true
+        body:
+          text: [ "world", "hello", "world" ]
+
+  - do:
+      search:
+        index: test
+
+  - match:
+      hits.hits.0._source:
+        text: [ "world", "hello", "world" ]
+
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml
index e46f67326a8d..371a9961122a 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml
@@ -1,85 +1,85 @@
 ---
 setup:
   - do:
-        indices.create:
-          index: test_1
-          body:
-            mappings: {}
+      indices.create:
+        index: test_1
+        body:
+          mappings: {}
   - do:
-        indices.create:
-          index: test_2
-          body:
-            mappings: {}
+      indices.create:
+        index: test_2
+        body:
+          mappings: {}
 ---
 "Get /{index}/_mapping with empty mappings":
 
- - do:
-     indices.create:
-       index: t
+  - do:
+      indices.create:
+        index: t
 
- - do:
-     indices.get_mapping:
-       index: t
+  - do:
+      indices.get_mapping:
+        index: t
 
- - match: { t.mappings: {}}
+  - match: { t.mappings: {}}
 
 ---
 "Get /_mapping":
 
- - do:
-    indices.get_mapping: {}
+  - do:
+      indices.get_mapping: {}
 
- - is_true: test_1.mappings
- - is_true: test_2.mappings
+  - is_true: test_1.mappings
+  - is_true: test_2.mappings
 
 ---
 "Get /{index}/_mapping":
 
- - do:
-    indices.get_mapping:
-      index: test_1
+  - do:
+      indices.get_mapping:
+        index: test_1
 
- - is_true: test_1.mappings
- - is_false: test_2
+  - is_true: test_1.mappings
+  - is_false: test_2
 
 
 
 ---
 "Get /_all/_mapping":
 
- - do:
-    indices.get_mapping:
-      index: _all
+  - do:
+      indices.get_mapping:
+        index: _all
 
- - is_true: test_1.mappings
- - is_true: test_2.mappings
+  - is_true: test_1.mappings
+  - is_true: test_2.mappings
 
 ---
 "Get /*/_mapping":
 
- - do:
-    indices.get_mapping:
-      index: '*'
+  - do:
+      indices.get_mapping:
+        index: '*'
 
- - is_true: test_1.mappings
- - is_true: test_2.mappings
+  - is_true: test_1.mappings
+  - is_true: test_2.mappings
 
 ---
 "Get /index,index/_mapping":
 
- - do:
-    indices.get_mapping:
-      index: test_1,test_2
+  - do:
+      indices.get_mapping:
+        index: test_1,test_2
 
- - is_true: test_1.mappings
- - is_true: test_2.mappings
+  - is_true: test_1.mappings
+  - is_true: test_2.mappings
 
 ---
 "Get /index*/_mapping/":
 
- - do:
-    indices.get_mapping:
-      index: '*2'
+  - do:
+      indices.get_mapping:
+        index: '*2'
 
- - is_true: test_2.mappings
- - is_false: test_1
+  - is_true: test_2.mappings
+  - is_false: test_1
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml
index ff17a92ed0fc..2f3d2fa2f974 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/mget/90_synthetic_source.yml
@@ -247,58 +247,3 @@ force_synthetic_source_ok:
         obj:
           kwd: bar
 
----
-force_synthetic_source_bad_mapping:
-  - requires:
-      cluster_features: ["gte_v8.5.0"]
-      reason: message changed in 8.5
-
-  - do:
-      indices.create:
-        index: test
-        body:
-          settings:
-            number_of_shards: 1 # Use a single shard to get consistent error messages
-          mappings:
-            _source:
-              mode: stored
-            properties:
-              text:
-                type: text
-
-  - do:
-      index:
-        index:   test
-        id:      1
-        body:
-          text: foo
-
-  - do:
-      index:
-        index:   test
-        id:      2
-        body:
-          text: bar
-
-  # When _source is used in the fetch the original _source is perfect
-  - do:
-      mget:
-        index: test
-        body:
-          ids: [ 1, 2 ]
-  - match:
-      docs.0._source:
-        text: foo
-  - match:
-      docs.1._source:
-        text: bar
-
-  # Forcing synthetic source fails because the mapping is invalid
-  - do:
-      mget:
-        index: test
-        force_synthetic_source: true
-        body:
-          ids: [ 1, 2 ]
-  - match: {docs.0.error.reason: "field [text] of type [text] doesn't support synthetic source unless it is stored or has a sub-field of type [keyword] with doc values or stored and without a normalizer"}
-  - match: {docs.1.error.reason: "field [text] of type [text] doesn't support synthetic source unless it is stored or has a sub-field of type [keyword] with doc values or stored and without a normalizer"}
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml
index 75d488427a90..0cc1796bb47d 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/400_synthetic_source.yml
@@ -208,56 +208,6 @@ force_synthetic_source_ok:
         obj:
           kwd: foo
 
----
-force_synthetic_source_bad_mapping:
-  - requires:
-      cluster_features: ["gte_v8.4.0"]
-      reason: introduced in 8.4.0
-
-  - do:
-      indices.create:
-        index: test
-        body:
-          settings:
-            number_of_shards: 1 # Use a single shard to get consistent error messages
-          mappings:
-            _source:
-              mode: stored
-            properties:
-              text:
-                type: text
-
-  - do:
-      index:
-        index:   test
-        id:      1
-        refresh: true
-        body:
-          text: foo
-
-  # When _source is used in the fetch the original _source is perfect
-  - do:
-      search:
-        index: test
-        body:
-          query:
-            ids:
-              values: [1]
-  - match:
-      hits.hits.0._source:
-        text: foo
-
-  # Forcing synthetic source fails because the mapping is invalid
-  - do:
-      catch: bad_request
-      search:
-        index: test
-        force_synthetic_source: true
-        body:
-          query:
-            ids:
-              values: [1]
-
 ---
 doc values keyword with ignore_above:
   - requires:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/simulate.ingest/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/simulate.ingest/10_basic.yml
index a32969b0b69b..da0f00d96053 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/simulate.ingest/10_basic.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/simulate.ingest/10_basic.yml
@@ -261,7 +261,9 @@ setup:
 "Test mapping validation from templates":
 
   - skip:
-      features: headers
+      features:
+        - headers
+        - allowed_warnings
 
   - requires:
       cluster_features: ["simulate.mapping.validation.templates"]
@@ -279,6 +281,8 @@ setup:
                 type: text
 
   - do:
+      allowed_warnings:
+        - "index template [v2_template] has index patterns [v2_strict_nonexistent*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [v2_template] will take precedence during new index creation"
       indices.put_index_template:
         name: v2_template
         body:
@@ -291,6 +295,8 @@ setup:
                   type: text
 
   - do:
+      allowed_warnings:
+        - "index template [v2_hidden_template] has index patterns [v2_strict_hidden_nonexistent*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [v2_hidden_template] will take precedence during new index creation"
       indices.put_index_template:
         name: v2_hidden_template
         body:
diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml
index 976ac8f08f79..db718959919d 100644
--- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml
+++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/90_unsupported_operations.yml
@@ -238,52 +238,3 @@ aggregate on _id:
             id:
               terms:
                 field: _id
-
----
-synthetic source text field:
-  - requires:
-      cluster_features: ["gte_v8.7.0"]
-      reason: "synthetic source introduced in 8.7.0"
-
-  - do:
-      catch: /field \[k8s.pod.agent.name\] of type \[text\] doesn't support synthetic source unless it is stored or has a sub-field of type \[keyword\] with doc values or stored and without a normalizer/
-      indices.create:
-        index: test-text-field
-        body:
-          settings:
-            number_of_shards: 1
-            number_of_replicas: 0
-            index:
-              mode: time_series
-              routing_path: [ metricset, k8s.pod.uid ]
-              time_series:
-                start_time: 2021-04-28T00:00:00Z
-                end_time: 2021-04-29T00:00:00Z
-          mappings:
-            properties:
-              "@timestamp":
-                type: date
-              metricset:
-                type: keyword
-                time_series_dimension: true
-              k8s:
-                properties:
-                  pod:
-                    properties:
-                      uid:
-                        type: keyword
-                        time_series_dimension: true
-                      agent:
-                        type: object
-                        properties:
-                          id:
-                            type: text
-                            fields:
-                              raw:
-                                type: keyword
-                          name:
-                            type: text
-                            store: false
-                      value:
-                        type: long
-                        time_series_metric: gauge
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/api/cluster.post_voting_config_exclusions_with_node_name_part.json b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/api/cluster.post_voting_config_exclusions_with_node_name_part.json
deleted file mode 100644
index 2cdc2f3bc9ae..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/api/cluster.post_voting_config_exclusions_with_node_name_part.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "cluster.post_voting_config_exclusions_with_node_name_part":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/voting-config-exclusions.html",
-      "description":"Updates the cluster voting config exclusions by node_name (not node ids or node names)."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_cluster/voting_config_exclusions/{node_name}",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "node_name":{
-              "type":"string",
-              "description":"A comma-separated list of node descriptors of the nodes to exclude from the voting configuration."
-            }
-          },
-          "deprecated":{
-            "version":"7.8.0",
-            "description":"node_name is deprecated, use node_names or node_ids instead"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/api/indices.put_template_with_param.json b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/api/indices.put_template_with_param.json
deleted file mode 100644
index 7ee6cbd39ebf..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/api/indices.put_template_with_param.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "indices.put_template_with_param":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-templates.html",
-      "description":"Creates or updates an index template."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_template/{name}",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "name":{
-              "type":"string",
-              "description":"The name of the template"
-            }
-          }
-        }
-      ]
-    },
-    "params":{
-      "template":{
-        "type":"string",
-        "description":"The indices that this template should apply to, replaced by index_patterns within the template definition."
-      },
-      "order":{
-        "type":"number",
-        "description":"The order for this template when merging multiple matching ones (higher numbers are merged later, overriding the lower numbers)"
-      },
-      "create":{
-        "type":"boolean",
-        "description":"Whether the index template should only be added if new or can also replace an existing one",
-        "default":false
-      },
-      "master_timeout":{
-        "type":"time",
-        "description":"Specify timeout for connection to master"
-      }
-    },
-    "body":{
-      "description":"The template definition",
-      "required":true
-    }
-  }
-}
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml
deleted file mode 100644
index 8806918703ab..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/cluster.voting_config_exclusions/10_basic_compat.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "warnings_regex"
-
----
-"Throw exception when adding voting config exclusion by specifying a 'node_name'":
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      cluster.post_voting_config_exclusions_with_node_name_part:
-        node_name: someNodeName
-      warnings_regex:
-        - ".* /_cluster/voting_config_exclusions/\\{node_name\\} has been removed. .*"
-      catch: /\[node_name\] has been removed, you must set \[node_names\] or \[node_ids\]/
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml
deleted file mode 100644
index b368975fa5e5..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.deprecated.upgrade/10_basic_upgrade.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "allowed_warnings_regex"
-
----
-Basic test for upgrade indices:
-  - requires:
-      cluster_features: ["gte_v7.11.0"]
-      reason: "_upgrade api is deprecated since 7.11.0"
-      test_runner_features:
-        - "warnings"
-  - do:
-      indices.create:
-        index: "test_index"
-        body:
-          settings:
-            index:
-              number_of_replicas: 0
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
-  - do:
-      catch: "bad_request"
-      indices.upgrade:
-        index: "test_index"
-      warnings:
-        - "The _upgrade API is no longer useful and will be removed. Instead, see _reindex\
-      \ API."
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
-  - match:
-      status: 400
-  - match:
-      error.reason: "/Upgrade.action.(GET|POST).(_upgrade|/test_index/_upgrade).was.removed,.use._reindex.API.instead/"
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml
deleted file mode 100644
index 043e525a8e9b..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/indices.put_template/10_basic_compat.yml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "warnings"
-
----
-"Put template":
-
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      warnings:
-        - "Deprecated field [template] used, replaced by [index_patterns]"
-      indices.put_template:
-        name: test
-        body:
-          template: test-*
-          settings:
-            number_of_shards:   1
-            number_of_replicas: 0
-          mappings:
-            properties:
-              field:
-                type: keyword
-
-  - do:
-      indices.get_template:
-        name: test
-        flat_settings: true
-
-  - match: {test.index_patterns: ["test-*"]}
-  - match: {test.settings: {index.number_of_shards: '1', index.number_of_replicas: '0'}}
-  - match: {test.mappings: {properties: {field: {type: keyword}}}}
-
----
-"Put template (with template parameter)":
-
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      warnings:
-        - "Deprecated parameter [template] used, replaced by [index_patterns]"
-      indices.put_template_with_param:
-        name: test
-        template: "test-*"
-        body:
-          settings:
-            number_of_shards:   1
-            number_of_replicas: 0
-          mappings:
-            properties:
-              field:
-                type: keyword
-
-  - do:
-      indices.get_template:
-        name: test
-        flat_settings: true
-
-  - match: {test.index_patterns: ["test-*"]}
-  - match: {test.settings: {index.number_of_shards: '1', index.number_of_replicas: '0'}}
-  - match: {test.mappings: {properties: {field: {type: keyword}}}}
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml
deleted file mode 100644
index c64e80d0f6a0..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/nodes.hot_threads/10_basic_compat.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "allowed_warnings_regex"
-
----
-"Get hot threads":
-
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      nodes.hot_threads: {}
-      allowed_warnings_regex:
-        - ".*hot_?threads.* is a deprecated endpoint.*"
-  - match:
-      $body: /:::/
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml
deleted file mode 100644
index c3b3c4320be9..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.aggregation/10_moving_avg.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-
----
-moving_avg agg throws exception:
-  - do:
-      catch: "/Moving Average aggregation usage is not supported. Use the \\[moving_fn\\] aggregation instead./"
-      search:
-        rest_total_hits_as_int: true
-        body:
-          aggs:
-            the_histo:
-              date_histogram:
-                field: "date"
-                calendar_interval: "1d"
-              aggs:
-                the_avg:
-                  avg:
-                    field: "value_field"
-                the_movavg:
-                  moving_avg:
-                    buckets_path: "the_avg"
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.sort/10_nested_path_filter.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.sort/10_nested_path_filter.yml
deleted file mode 100644
index 323a5b9abbf1..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search.sort/10_nested_path_filter.yml
+++ /dev/null
@@ -1,149 +0,0 @@
----
-setup:
-- skip:
-    features:
-      - "headers"
-      - "allowed_warnings_regex"
-- do:
-    indices.create:
-      index: "my-index"
-      body:
-        settings:
-          number_of_shards: 1
-          number_of_replicas: 0
-        mappings:
-          properties:
-            offer:
-              type: "nested"
-- do:
-    index:
-      index: "my-index"
-      id: "1"
-      refresh: true
-      body:
-        offer:
-          price: 10
-          color: blue
-
-    headers:
-      Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-      Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-
-- do:
-    indices.create:
-      index: "my-locations"
-      body:
-        settings:
-          number_of_shards: 1
-          number_of_replicas: 0
-        mappings:
-          properties:
-            pin:
-              properties:
-                location:
-                  type: geo_point
-            offer:
-                type: "nested"
-    headers:
-      Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-      Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-
-- do:
-    index:
-      index: "my-locations"
-      id: "1"
-      refresh: true
-      body:
-        offer:
-          price: 10
-          color: blue
-        pin:
-          location:
-            lat: 40.12
-            lon: -71.34
-    headers:
-      Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-      Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-
-
-
-
-
----
-"Sort with nested_path throws exception":
-- do:
-    catch: /\[nested_path\] has been removed in favour of the \[nested\] parameter/
-    search:
-      rest_total_hits_as_int: true
-      index: "my-index"
-      body:
-        sort:
-          - offer.price:
-              mode: avg
-              order: asc
-              nested_path: offer
-    headers:
-      Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-      Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-
----
-"Sort with nested_filter throws exception":
-  - do:
-      catch: /\[nested_filter\] has been removed in favour of the \[nested\] parameter/
-      search:
-        rest_total_hits_as_int: true
-        index: "my-index"
-        body:
-          sort:
-            - offer.price:
-                mode: avg
-                order: asc
-                nested_filter:
-                  term:
-                    offer.color: blue
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-
-
----
-"Geo search with nested_filter throws exception":
-  - do:
-      catch: /\[nested_filter\] has been removed in favour of the \[nested\] parameter/
-      search:
-        rest_total_hits_as_int: true
-        index: "my-locations"
-        body:
-          query:
-            match_all: {}
-          sort:
-            _geo_distance:
-              pin.location:
-                - -70
-                - 40
-              nested_filter:
-                term:
-                  offer.color: blue
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-
----
-"Geo search with nested_path throws exception":
-  - do:
-      catch: /\[nested_path\] has been removed in favour of the \[nested\] parameter/
-      search:
-        rest_total_hits_as_int: true
-        index: "my-locations"
-        body:
-          query:
-            match_all: {}
-          sort:
-            _geo_distance:
-              pin.location:
-                - -70
-                - 40
-              nested_path: "offer"
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml
deleted file mode 100644
index b7df872ff0a8..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_cutoff_frequency.yml
+++ /dev/null
@@ -1,103 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "allowed_warnings_regex"
-  - do:
-      indices.create:
-        index: "test"
-        body:
-          mappings:
-            properties:
-              my_field1:
-                type: "text"
-              my_field2:
-                type: "text"
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-      - "\\[types removal\\].*"
-  - do:
-      index:
-        index: "test"
-        id: "1"
-        body:
-          my_field1: "brown fox jump"
-          my_field2: "xylophone"
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-      - "\\[types removal\\].*"
-  - do:
-      indices.refresh: {}
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-      - "\\[types removal\\].*"
-
----
-multi_match multiple fields with cutoff_frequency throws exception:
-- do:
-    catch: "/cutoff_freqency is not supported. The \\[multi_match\\] query can skip block of documents efficiently if the total number of hits is not tracked/"
-    search:
-      rest_total_hits_as_int: true
-      index: "test"
-      body:
-        query:
-          multi_match:
-            query: "brown"
-            type: "bool_prefix"
-            fields:
-            - "my_field1"
-            - "my_field2"
-            cutoff_frequency: 0.001
-    headers:
-      Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-      Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-    allowed_warnings_regex:
-    - "\\[types removal\\].*"
-
----
-match with cutoff_frequency throws exception:
-  - do:
-      catch: "/cutoff_freqency is not supported. The \\[match\\] query can skip block of documents efficiently if the total number of hits is not tracked/"
-      search:
-        rest_total_hits_as_int: true
-        index: "test"
-        body:
-          query:
-            match:
-              my_field1:
-                query: "brown"
-                type: "bool_prefix"
-                cutoff_frequency: 0.001
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
-
----
-common querythrows exception:
-  - do:
-      catch: "/Common Terms Query usage is not supported. Use \\[match\\] query which can efficiently skip blocks of documents if the total number of hits is not tracked./"
-      search:
-        rest_total_hits_as_int: true
-        index: "test"
-        body:
-          query:
-            common:
-              my_field1:
-                query: "brown"
-                type: "bool_prefix"
-                cutoff_frequency: 0.001
-                low_freq_operator: or
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml
deleted file mode 100644
index 3f3eac1e59e1..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_geo_bounding_box.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "warnings"
-  - do:
-      indices.create:
-        index: locations
-        body:
-          settings:
-            number_of_shards: 1
-            number_of_replicas: 0
-          mappings:
-
-            properties:
-              location:
-                type: geo_point
-  - do:
-      bulk:
-        index: locations
-        refresh: true
-        body: |
-          {"index":{}}
-          {"location" : {"lat": 13.5, "lon" : 34.89}}
-          {"index":{}}
-          {"location" : {"lat": -7.9, "lon" : 120.78}}
-          {"index":{}}
-          {"location" : {"lat": 45.78, "lon" : -173.45}}
-          {"index":{}}
-          {"location" : {"lat": 32.45, "lon" : 45.6}}
-          {"index":{}}
-          {"location" : {"lat": -63.24, "lon" : 31.0}}
-          {"index":{}}
-          {"location" : {"lat": 0.0, "lon" : 0.0}}
-
-
----
-"geo bounding box query not compatible":
-  - do:
-      catch: /failed to parse \[geo_bounding_box\] query. unexpected field \[type\]/
-      search:
-        index: locations
-        body:
-          query:
-            geo_bounding_box:
-              type : indexed
-              location:
-                top_left:
-                  lat: 10
-                  lon: -10
-                bottom_right:
-                  lat: -10
-                  lon: 10
-
----
-"geo bounding box query compatible":
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      warnings:
-        - "Deprecated parameter [type] used, it should no longer be specified."
-      search:
-        index: locations
-        body:
-          query:
-            geo_bounding_box:
-              type : indexed
-              location:
-                top_left:
-                  lat: 10
-                  lon: -10
-                bottom_right:
-                  lat: -10
-                  lon: 10
-  - match: {hits.total.value: 1}
-
diff --git a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_type_query.yml b/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_type_query.yml
deleted file mode 100644
index fdaebbb2b81e..000000000000
--- a/rest-api-spec/src/yamlRestTestV7Compat/resources/rest-api-spec/test/search/10_type_query.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-setup:
-  - skip:
-      features:
-        - "headers"
-        - "allowed_warnings_regex"
----
-type query throws exception when used:
-  - do:
-      index:
-        index: "test1"
-        id: "1"
-        type: "cat"
-        refresh: true
-        body:
-          foo: "bar"
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
-
-  - do:
-      catch: /\[types removal\] Type queries are deprecated, prefer to filter on a field instead./
-      search:
-        rest_total_hits_as_int: true
-        index: "test1"
-        body:
-          query:
-            type:
-              value: "cat"
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
-
-  - do:
-      catch: /\[types removal\] Type queries are deprecated, prefer to filter on a field instead./
-      search:
-        rest_total_hits_as_int: true
-        index: "test1"
-        body:
-          query:
-            type:
-              value: "_doc"
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
-
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java
index 920677e8c4b4..27f8fc915cdd 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java
@@ -395,7 +395,7 @@ public void testFlush() {
 
         clearInterceptedActions();
         String[] concreteIndexNames = TestIndexNameExpressionResolver.newInstance()
-            .concreteIndexNames(clusterAdmin().prepareState().get().getState(), flushRequest);
+            .concreteIndexNames(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(), flushRequest);
         assertIndicesSubset(Arrays.asList(concreteIndexNames), indexShardActions);
     }
 
@@ -422,7 +422,7 @@ public void testRefresh() {
 
         clearInterceptedActions();
         String[] concreteIndexNames = TestIndexNameExpressionResolver.newInstance()
-            .concreteIndexNames(clusterAdmin().prepareState().get().getState(), refreshRequest);
+            .concreteIndexNames(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(), refreshRequest);
         assertIndicesSubset(Arrays.asList(concreteIndexNames), indexShardActions);
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java
index 897f10b031dc..245e7cede4cf 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java
@@ -1053,7 +1053,7 @@ public void testCannotAllocateStaleReplicaExplanation() throws Exception {
             logger.info("--> close the index, now the replica is stale");
             assertAcked(indicesAdmin().prepareClose("idx"));
 
-            final ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth("idx")
+            final ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "idx")
                 .setTimeout(TimeValue.timeValueSeconds(30))
                 .setWaitForActiveShards(ActiveShardCount.ONE)
                 .setWaitForNoInitializingShards(true)
@@ -1254,7 +1254,7 @@ private void prepareIndex(
         if (state == IndexMetadata.State.CLOSE) {
             assertAcked(indicesAdmin().prepareClose("idx"));
 
-            final ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth("idx")
+            final ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "idx")
                 .setTimeout(TimeValue.timeValueSeconds(30))
                 .setWaitForActiveShards(activeShardCount)
                 .setWaitForEvents(Priority.LANGUID)
@@ -1275,13 +1275,13 @@ private void indexData() {
     }
 
     private String primaryNodeName() {
-        ClusterState clusterState = admin().cluster().prepareState().get().getState();
+        ClusterState clusterState = admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         String nodeId = clusterState.getRoutingTable().index("idx").shard(0).primaryShard().currentNodeId();
         return clusterState.getRoutingNodes().node(nodeId).node().getName();
     }
 
     private DiscoveryNode replicaNode() {
-        ClusterState clusterState = admin().cluster().prepareState().get().getState();
+        ClusterState clusterState = admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         String nodeId = clusterState.getRoutingTable().index("idx").shard(0).replicaShards().get(0).currentNodeId();
         return clusterState.getRoutingNodes().node(nodeId).node();
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetDesiredBalanceActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetDesiredBalanceActionIT.java
index d0e0543bcca0..54b1b08806a9 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetDesiredBalanceActionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/TransportGetDesiredBalanceActionIT.java
@@ -37,7 +37,9 @@ public void testDesiredBalanceOnMultiNodeCluster() throws Exception {
 
         indexData(index);
 
-        var clusterHealthResponse = clusterAdmin().health(new ClusterHealthRequest().waitForStatus(ClusterHealthStatus.GREEN)).get();
+        var clusterHealthResponse = clusterAdmin().health(
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT).waitForStatus(ClusterHealthStatus.GREEN)
+        ).get();
         assertEquals(RestStatus.OK, clusterHealthResponse.status());
 
         final var desiredBalanceResponse = safeGet(
@@ -50,7 +52,7 @@ public void testDesiredBalanceOnMultiNodeCluster() throws Exception {
         for (var entry : shardsMap.entrySet()) {
             Integer shardId = entry.getKey();
             DesiredBalanceResponse.DesiredShards desiredShards = entry.getValue();
-            IndexShardRoutingTable shardRoutingTable = clusterAdmin().prepareState()
+            IndexShardRoutingTable shardRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .get()
                 .getState()
                 .routingTable()
@@ -73,7 +75,9 @@ public void testDesiredBalanceWithUnassignedShards() throws Exception {
         int numberOfReplicas = 1;
         createIndex(index, numberOfShards, numberOfReplicas);
         indexData(index);
-        var clusterHealthResponse = clusterAdmin().health(new ClusterHealthRequest(index).waitForStatus(ClusterHealthStatus.YELLOW)).get();
+        var clusterHealthResponse = clusterAdmin().health(
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, index).waitForStatus(ClusterHealthStatus.YELLOW)
+        ).get();
         assertEquals(RestStatus.OK, clusterHealthResponse.status());
 
         final var desiredBalanceResponse = safeGet(
@@ -86,7 +90,7 @@ public void testDesiredBalanceWithUnassignedShards() throws Exception {
         for (var entry : shardsMap.entrySet()) {
             Integer shardId = entry.getKey();
             DesiredBalanceResponse.DesiredShards desiredShards = entry.getValue();
-            IndexShardRoutingTable shardRoutingTable = clusterAdmin().prepareState()
+            IndexShardRoutingTable shardRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .get()
                 .getState()
                 .routingTable()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDesiredNodesActionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDesiredNodesActionsIT.java
index 63801f8c1e51..0fb8b450ffaf 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDesiredNodesActionsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDesiredNodesActionsIT.java
@@ -87,6 +87,8 @@ public void testUpdateDesiredNodesIsIdempotent() {
         }
 
         final var equivalentUpdateRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             updateDesiredNodesRequest.getHistoryID(),
             updateDesiredNodesRequest.getVersion(),
             desiredNodesList,
@@ -105,6 +107,8 @@ public void testGoingBackwardsWithinTheSameHistoryIsForbidden() {
         updateDesiredNodes(updateDesiredNodesRequest);
 
         final var backwardsUpdateDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             updateDesiredNodesRequest.getHistoryID(),
             updateDesiredNodesRequest.getVersion() - 1,
             updateDesiredNodesRequest.getNodes(),
@@ -123,6 +127,8 @@ public void testSameVersionWithDifferentContentIsForbidden() {
         updateDesiredNodes(updateDesiredNodesRequest);
 
         final var updateDesiredNodesRequestWithSameHistoryIdAndVersionAndDifferentSpecs = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             updateDesiredNodesRequest.getHistoryID(),
             updateDesiredNodesRequest.getVersion(),
             randomList(1, 10, DesiredNodesTestCase::randomDesiredNode),
@@ -192,6 +198,8 @@ public void testNodeProcessorsGetValidatedWithDesiredNodeProcessors() {
         // This test verifies that the validation doesn't throw on desired nodes
         // with a higher number of available processors than the node running the tests.
         final var updateDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             UUIDs.randomBase64UUID(),
             randomIntBetween(1, 20),
             randomList(
@@ -267,7 +275,7 @@ public void testDeleteDesiredNodesTasksAreBatchedCorrectly() throws Exception {
             future.actionGet();
         }
 
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final DesiredNodes latestDesiredNodes = DesiredNodes.latestFromClusterState(state);
         assertThat(latestDesiredNodes, is(nullValue()));
     }
@@ -309,6 +317,8 @@ private UpdateDesiredNodesRequest randomUpdateDesiredNodesRequest() {
 
     private UpdateDesiredNodesRequest randomUpdateDesiredNodesRequest(Settings settings) {
         return new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             UUIDs.randomBase64UUID(),
             randomIntBetween(2, 20),
             randomList(2, 10, () -> randomDesiredNode(settings)),
@@ -318,6 +328,8 @@ private UpdateDesiredNodesRequest randomUpdateDesiredNodesRequest(Settings setti
 
     private UpdateDesiredNodesRequest randomDryRunUpdateDesiredNodesRequest(Settings settings) {
         return new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             UUIDs.randomBase64UUID(),
             randomIntBetween(2, 20),
             randomList(2, 10, () -> randomDesiredNode(settings)),
@@ -331,7 +343,7 @@ private void deleteDesiredNodes() {
     }
 
     private DesiredNodes getLatestDesiredNodes() {
-        final GetDesiredNodesAction.Request request = new GetDesiredNodesAction.Request();
+        final GetDesiredNodesAction.Request request = new GetDesiredNodesAction.Request(TEST_REQUEST_TIMEOUT);
         final GetDesiredNodesAction.Response response = client().execute(GetDesiredNodesAction.INSTANCE, request).actionGet();
         return response.getDesiredNodes();
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java
index 32d8be475dbb..180bef7ea409 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java
@@ -141,7 +141,7 @@ public void testMasterNodeOperationTasks() throws Exception {
         registerTaskManagerListeners(TransportClusterHealthAction.NAME);
 
         // First run the health on the master node - should produce only one task on the master node
-        internalCluster().masterClient().admin().cluster().prepareHealth().get();
+        internalCluster().masterClient().admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
         assertEquals(1, numberOfEvents(TransportClusterHealthAction.NAME, Tuple::v1)); // counting only registration events
         // counting only unregistration events
         // When checking unregistration events there might be some delay since receiving the response from the cluster doesn't
@@ -151,7 +151,7 @@ public void testMasterNodeOperationTasks() throws Exception {
         resetTaskManagerListeners(TransportClusterHealthAction.NAME);
 
         // Now run the health on a non-master node - should produce one task on master and one task on another node
-        internalCluster().nonMasterClient().admin().cluster().prepareHealth().get();
+        internalCluster().nonMasterClient().admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
         assertEquals(2, numberOfEvents(TransportClusterHealthAction.NAME, Tuple::v1)); // counting only registration events
         // counting only unregistration events
         assertBusy(() -> assertEquals(2, numberOfEvents(TransportClusterHealthAction.NAME, event -> event.v1() == false)));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateActionDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateActionDisruptionIT.java
index bb2c97ec9aa6..85dd1337204b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateActionDisruptionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateActionDisruptionIT.java
@@ -49,7 +49,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
 
     public void testNonLocalRequestAlwaysFindsMaster() throws Exception {
         runRepeatedlyWhileChangingMaster(() -> {
-            final ClusterStateRequestBuilder clusterStateRequestBuilder = clusterAdmin().prepareState()
+            final ClusterStateRequestBuilder clusterStateRequestBuilder = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setNodes(true)
                 .setBlocks(true)
@@ -69,7 +69,7 @@ public void testLocalRequestAlwaysSucceeds() throws Exception {
             final String node = randomFrom(internalCluster().getNodeNames());
             final DiscoveryNodes discoveryNodes = client(node).admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setLocal(true)
                 .setNodes(true)
@@ -98,7 +98,7 @@ public void testNonLocalRequestAlwaysFindsMasterAndWaitsForMetadata() throws Exc
             final long waitForMetadataVersion = randomLongBetween(Math.max(1, metadataVersion - 3), metadataVersion + 5);
             final ClusterStateRequestBuilder clusterStateRequestBuilder = client(node).admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setNodes(true)
                 .setMetadata(true)
@@ -131,7 +131,7 @@ public void testLocalRequestWaitsForMetadata() throws Exception {
             final long waitForMetadataVersion = randomLongBetween(Math.max(1, metadataVersion - 3), metadataVersion + 5);
             final ClusterStateResponse clusterStateResponse = client(node).admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setLocal(true)
                 .setMetadata(true)
@@ -156,7 +156,7 @@ public void runRepeatedlyWhileChangingMaster(Runnable runnable) throws Exception
 
         assertBusy(
             () -> assertThat(
-                clusterAdmin().prepareState()
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                     .clear()
                     .setMetadata(true)
                     .setBlocks(true)
@@ -188,7 +188,7 @@ public void runRepeatedlyWhileChangingMaster(Runnable runnable) throws Exception
                 assertAcked(
                     client(nonMasterNode).admin()
                         .cluster()
-                        .prepareUpdateSettings()
+                        .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                         .setPersistentSettings(Settings.builder().put(CLUSTER_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), value))
                 );
             }
@@ -225,17 +225,22 @@ public void runRepeatedlyWhileChangingMaster(Runnable runnable) throws Exception
 
     public void testFailsWithBlockExceptionIfBlockedAndBlocksNotRequested() {
         internalCluster().startMasterOnlyNode(Settings.builder().put(GatewayService.RECOVER_AFTER_DATA_NODES_SETTING.getKey(), 1).build());
-        final var state = safeGet(clusterAdmin().prepareState().clear().setBlocks(true).execute()).getState();
+        final var state = safeGet(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setBlocks(true).execute()).getState();
         assertTrue(state.blocks().hasGlobalBlock(GatewayService.STATE_NOT_RECOVERED_BLOCK));
 
         assertThat(
-            safeAwaitFailure(SubscribableListener.<ClusterStateResponse>newForked(l -> clusterAdmin().prepareState().clear().execute(l))),
+            safeAwaitFailure(
+                SubscribableListener.<ClusterStateResponse>newForked(
+                    l -> clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().execute(l)
+                )
+            ),
             instanceOf(ClusterBlockException.class)
         );
 
         internalCluster().startDataOnlyNode();
 
-        final var recoveredState = safeGet(clusterAdmin().prepareState().clear().setBlocks(randomBoolean()).execute()).getState();
+        final var recoveredState = safeGet(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setBlocks(randomBoolean()).execute())
+            .getState();
         assertFalse(recoveredState.blocks().hasGlobalBlock(GatewayService.STATE_NOT_RECOVERED_BLOCK));
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java
index 0c3dac0f99b6..2385c42526d4 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java
@@ -64,7 +64,8 @@ private void assertCounts(ClusterStatsNodes.Counts counts, int total, Map<String
 
     private void waitForNodes(int numNodes) {
         ClusterHealthResponse actionGet = clusterAdmin().health(
-            new ClusterHealthRequest(new String[] {}).waitForEvents(Priority.LANGUID).waitForNodes(Integer.toString(numNodes))
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForEvents(Priority.LANGUID)
+                .waitForNodes(Integer.toString(numNodes))
         ).actionGet();
         assertThat(actionGet.isTimedOut(), is(false));
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java
index 27f0cd408e7f..a835276451b1 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java
@@ -16,6 +16,8 @@
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
 import org.elasticsearch.action.admin.indices.alias.Alias;
 import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
+import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
 import org.elasticsearch.action.support.ActionTestUtils;
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -90,7 +92,7 @@ public void testCreationDateGenerated() {
         long timeBeforeRequest = System.currentTimeMillis();
         prepareCreate("test").get();
         long timeAfterRequest = System.currentTimeMillis();
-        ClusterStateResponse response = clusterAdmin().prepareState().get();
+        ClusterStateResponse response = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         ClusterState state = response.getState();
         assertThat(state, notNullValue());
         Metadata metadata = state.getMetadata();
@@ -154,6 +156,20 @@ public void testEmptyMappings() throws Exception {
         assertTrue(mappings.sourceAsMap().isEmpty());
     }
 
+    public void testTwoEmptyEqualMappings() throws Exception {
+        assertAcked(prepareCreate("test1"));
+        assertAcked(prepareCreate("test2").setMapping(XContentFactory.jsonBuilder().startObject().endObject()));
+        FieldCapabilitiesRequest fieldCapsReq1 = new FieldCapabilitiesRequest();
+        fieldCapsReq1.indices("test1");
+        fieldCapsReq1.fields("*");
+        FieldCapabilitiesResponse fieldCapsResp1 = internalCluster().coordOnlyNodeClient().fieldCaps(fieldCapsReq1).actionGet();
+        FieldCapabilitiesRequest fieldCapsReq2 = new FieldCapabilitiesRequest();
+        fieldCapsReq2.indices("test2");
+        fieldCapsReq2.fields("*");
+        FieldCapabilitiesResponse fieldCapsResp2 = internalCluster().coordOnlyNodeClient().fieldCaps(fieldCapsReq2).actionGet();
+        assertEquals(fieldCapsResp1.get(), fieldCapsResp2.get());
+    }
+
     public void testInvalidShardCountSettings() throws Exception {
         int value = randomIntBetween(-10, 0);
         try {
@@ -296,7 +312,7 @@ public void onFailure(Exception e) {
     }
 
     public void testRestartIndexCreationAfterFullClusterRestart() throws Exception {
-        clusterAdmin().prepareUpdateSettings()
+        clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(Settings.builder().put("cluster.routing.allocation.enable", "none"))
             .get();
         indicesAdmin().prepareCreate("test").setWaitForActiveShards(ActiveShardCount.NONE).setSettings(indexSettings()).get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java
index 3712ad8c35f6..9c794efe3a41 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java
@@ -84,7 +84,7 @@ public void testCreateShrinkIndexToN() {
         for (int i = 0; i < 20; i++) {
             prepareIndex("source").setId(Integer.toString(i)).setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get();
         }
-        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes();
+        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getDataNodes();
         assertTrue("at least 2 nodes but was: " + dataNodes.size(), dataNodes.size() >= 2);
         DiscoveryNode[] discoveryNodes = dataNodes.values().toArray(DiscoveryNode[]::new);
         String mergeNode = discoveryNodes[0].getName();
@@ -158,7 +158,11 @@ public void testShrinkIndexPrimaryTerm() throws Exception {
         internalCluster().ensureAtLeastNumDataNodes(2);
         prepareCreate("source").setSettings(Settings.builder().put(indexSettings()).put("number_of_shards", numberOfShards)).get();
 
-        final Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes();
+        final Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .nodes()
+            .getDataNodes();
         assertThat(dataNodes.size(), greaterThanOrEqualTo(2));
         final DiscoveryNode[] discoveryNodes = dataNodes.values().toArray(DiscoveryNode[]::new);
         final String mergeNode = discoveryNodes[0].getName();
@@ -222,7 +226,10 @@ public void testShrinkIndexPrimaryTerm() throws Exception {
     }
 
     private static IndexMetadata indexMetadata(final Client client, final String index) {
-        final ClusterStateResponse clusterStateResponse = client.admin().cluster().state(new ClusterStateRequest()).actionGet();
+        final ClusterStateResponse clusterStateResponse = client.admin()
+            .cluster()
+            .state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT))
+            .actionGet();
         return clusterStateResponse.getState().metadata().index(index);
     }
 
@@ -236,7 +243,7 @@ public void testCreateShrinkIndex() {
         for (int i = 0; i < docs; i++) {
             prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get();
         }
-        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes();
+        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getDataNodes();
         assertTrue("at least 2 nodes but was: " + dataNodes.size(), dataNodes.size() >= 2);
         DiscoveryNode[] discoveryNodes = dataNodes.values().toArray(DiscoveryNode[]::new);
         // ensure all shards are allocated otherwise the ensure green below might not succeed since we require the merge node
@@ -272,7 +279,7 @@ public void testCreateShrinkIndex() {
         assertNoResizeSourceIndexSettings("target");
 
         // resolve true merge node - this is not always the node we required as all shards may be on another node
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         DiscoveryNode mergeNode = state.nodes().get(state.getRoutingTable().index("target").shard(0).primaryShard().currentNodeId());
         logger.info("merge node {}", mergeNode);
 
@@ -342,7 +349,7 @@ public void testCreateShrinkIndexFails() throws Exception {
         for (int i = 0; i < 20; i++) {
             prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get();
         }
-        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes();
+        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getDataNodes();
         assertTrue("at least 2 nodes but was: " + dataNodes.size(), dataNodes.size() >= 2);
         DiscoveryNode[] discoveryNodes = dataNodes.values().toArray(DiscoveryNode[]::new);
         String spareNode = discoveryNodes[0].getName();
@@ -369,7 +376,7 @@ public void testCreateShrinkIndexFails() throws Exception {
                     .build()
             )
             .get();
-        clusterAdmin().prepareHealth("target").setWaitForEvents(Priority.LANGUID).get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "target").setWaitForEvents(Priority.LANGUID).get();
 
         // now we move all shards away from the merge node
         updateIndexSettings(
@@ -382,7 +389,7 @@ public void testCreateShrinkIndexFails() throws Exception {
         updateIndexSettings(Settings.builder().putNull("index.routing.allocation.exclude._name"), "target");
         // wait until it fails
         assertBusy(() -> {
-            ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().get();
+            ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
             RoutingTable routingTables = clusterStateResponse.getState().routingTable();
             assertTrue(routingTables.index("target").shard(0).shard(0).unassigned());
             assertEquals(
@@ -427,7 +434,7 @@ public void testCreateShrinkWithIndexSort() throws Exception {
         for (int i = 0; i < 20; i++) {
             prepareIndex("source").setId(Integer.toString(i)).setSource("{\"foo\" : \"bar\", \"id\" : " + i + "}", XContentType.JSON).get();
         }
-        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes();
+        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getDataNodes();
         assertTrue("at least 2 nodes but was: " + dataNodes.size(), dataNodes.size() >= 2);
         DiscoveryNode[] discoveryNodes = dataNodes.values().toArray(DiscoveryNode[]::new);
         String mergeNode = discoveryNodes[0].getName();
@@ -482,7 +489,7 @@ public void testShrinkCommitsMergeOnIdle() throws Exception {
             prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get();
         }
         indicesAdmin().prepareFlush("source").get();
-        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes();
+        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getDataNodes();
         DiscoveryNode[] discoveryNodes = dataNodes.values().toArray(DiscoveryNode[]::new);
         // ensure all shards are allocated otherwise the ensure green below might not succeed since we require the merge node
         // if we change the setting too quickly we will end up with one replica unassigned which can't be assigned anymore due
@@ -508,7 +515,7 @@ public void testShrinkCommitsMergeOnIdle() throws Exception {
             ensureGreen();
             assertNoResizeSourceIndexSettings("target");
 
-            ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().get();
+            ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
             IndexMetadata target = clusterStateResponse.getState().getMetadata().index("target");
             indicesAdmin().prepareForceMerge("target").setMaxNumSegments(1).setFlush(false).get();
             IndicesSegmentResponse targetSegStats = indicesAdmin().prepareSegments("target").get();
@@ -601,7 +608,7 @@ public void testShrinkThenSplitWithFailedNode() throws Exception {
     }
 
     static void assertNoResizeSourceIndexSettings(final String index) {
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState()
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .clear()
             .setMetadata(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java
index 22549a1562dc..41646496c59c 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java
@@ -333,7 +333,10 @@ public void testSplitIndexPrimaryTerm() throws Exception {
     }
 
     private static IndexMetadata indexMetadata(final Client client, final String index) {
-        final ClusterStateResponse clusterStateResponse = client.admin().cluster().state(new ClusterStateRequest()).actionGet();
+        final ClusterStateResponse clusterStateResponse = client.admin()
+            .cluster()
+            .state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT))
+            .actionGet();
         return clusterStateResponse.getState().metadata().index(index);
     }
 
@@ -371,7 +374,7 @@ public void testCreateSplitIndex() throws Exception {
             ensureGreen();
             assertNoResizeSourceIndexSettings("target");
 
-            final ClusterState state = clusterAdmin().prepareState().get().getState();
+            final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             DiscoveryNode mergeNode = state.nodes().get(state.getRoutingTable().index("target").shard(0).primaryShard().currentNodeId());
             logger.info("split node {}", mergeNode);
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java
index 16f8f51cb8aa..becea454b7d5 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java
@@ -83,7 +83,7 @@ public void testRolloverOnEmptyIndex() throws Exception {
         assertThat(response.isDryRun(), equalTo(false));
         assertThat(response.isRolledOver(), equalTo(true));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index("test_index-1");
         if (explicitWriteIndex) {
             assertTrue(oldIndex.getAliases().containsKey("test_alias"));
@@ -106,7 +106,7 @@ public void testRollover() throws Exception {
         assertThat(response.isDryRun(), equalTo(false));
         assertThat(response.isRolledOver(), equalTo(true));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index("test_index-2");
         assertFalse(oldIndex.getAliases().containsKey("test_alias"));
         final IndexMetadata newIndex = state.metadata().index("test_index-000003");
@@ -139,7 +139,7 @@ public void testRolloverWithExplicitWriteIndex() throws Exception {
         assertThat(response.isDryRun(), equalTo(false));
         assertThat(response.isRolledOver(), equalTo(true));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index("test_index-2");
         assertTrue(oldIndex.getAliases().containsKey("test_alias"));
         assertFalse(oldIndex.getAliases().get("test_alias").writeIndex());
@@ -187,7 +187,7 @@ public void testRolloverWithIndexSettings() throws Exception {
         assertThat(response.isDryRun(), equalTo(false));
         assertThat(response.isRolledOver(), equalTo(true));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index("test_index-2");
         final IndexMetadata newIndex = state.metadata().index("test_index-000003");
         assertThat(newIndex.getNumberOfShards(), equalTo(1));
@@ -220,7 +220,7 @@ public void testRolloverWithIndexSettingsWithoutPrefix() throws Exception {
         assertThat(response.isDryRun(), equalTo(false));
         assertThat(response.isRolledOver(), equalTo(true));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index("test_index-2");
         final IndexMetadata newIndex = state.metadata().index("test_index-000003");
         assertThat(newIndex.getNumberOfShards(), equalTo(1));
@@ -268,7 +268,7 @@ public void testRolloverDryRun() throws Exception {
         assertThat(response.isDryRun(), equalTo(true));
         assertThat(response.isRolledOver(), equalTo(false));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index("test_index-1");
         assertTrue(oldIndex.getAliases().containsKey("test_alias"));
         final IndexMetadata newIndex = state.metadata().index("test_index-000002");
@@ -334,7 +334,7 @@ public void testRolloverConditionsNotMet() throws Exception {
             )
         );
 
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index("test_index-0");
         assertTrue(oldIndex.getAliases().containsKey("test_alias"));
         if (explicitWriteIndex) {
@@ -361,7 +361,7 @@ public void testRolloverWithNewIndexName() throws Exception {
         assertThat(response.isDryRun(), equalTo(false));
         assertThat(response.isRolledOver(), equalTo(true));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index("test_index");
         final IndexMetadata newIndex = state.metadata().index("test_new_index");
         assertTrue(newIndex.getAliases().containsKey("test_alias"));
@@ -452,7 +452,7 @@ public void testRolloverMaxSize() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-1"));
             assertThat(response.getNewIndex(), equalTo("test-000002"));
             assertThat("No rollover with a large max_size condition", response.isRolledOver(), equalTo(false));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-1");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test-1");
             assertThat(oldIndex.getRolloverInfos().size(), equalTo(0));
         }
 
@@ -466,7 +466,7 @@ public void testRolloverMaxSize() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-1"));
             assertThat(response.getNewIndex(), equalTo("test-000002"));
             assertThat("Should rollover with a small max_size condition", response.isRolledOver(), equalTo(true));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-1");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test-1");
             List<Condition<?>> metConditions = oldIndex.getRolloverInfos().get("test_alias").getMetConditions();
             assertThat(metConditions.size(), equalTo(1));
             assertThat(metConditions.get(0).toString(), equalTo(new MaxSizeCondition(maxSizeValue).toString()));
@@ -488,7 +488,11 @@ public void testRolloverMaxSize() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-000002"));
             assertThat(response.getNewIndex(), equalTo("test-000003"));
             assertThat("No rollover with an empty index", response.isRolledOver(), equalTo(false));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-000002");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test-000002");
             assertThat(oldIndex.getRolloverInfos().size(), equalTo(0));
         }
     }
@@ -513,7 +517,7 @@ public void testRolloverMaxPrimaryShardSize() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-1"));
             assertThat(response.getNewIndex(), equalTo("test-000002"));
             assertThat("No rollover with a large max_primary_shard_size condition", response.isRolledOver(), equalTo(false));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-1");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test-1");
             assertThat(oldIndex.getRolloverInfos().size(), equalTo(0));
         }
 
@@ -527,7 +531,7 @@ public void testRolloverMaxPrimaryShardSize() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-1"));
             assertThat(response.getNewIndex(), equalTo("test-000002"));
             assertThat("Should rollover with a small max_primary_shard_size condition", response.isRolledOver(), equalTo(true));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-1");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test-1");
             List<Condition<?>> metConditions = oldIndex.getRolloverInfos().get("test_alias").getMetConditions();
             assertThat(metConditions.size(), equalTo(1));
             assertThat(metConditions.get(0).toString(), equalTo(new MaxPrimaryShardSizeCondition(maxPrimaryShardSizeCondition).toString()));
@@ -549,7 +553,11 @@ public void testRolloverMaxPrimaryShardSize() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-000002"));
             assertThat(response.getNewIndex(), equalTo("test-000003"));
             assertThat("No rollover with an empty index", response.isRolledOver(), equalTo(false));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-000002");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test-000002");
             assertThat(oldIndex.getRolloverInfos().size(), equalTo(0));
         }
     }
@@ -573,7 +581,7 @@ public void testRolloverMaxPrimaryShardDocs() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-1"));
             assertThat(response.getNewIndex(), equalTo("test-000002"));
             assertThat("No rollover with a large max_primary_shard_docs condition", response.isRolledOver(), equalTo(false));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-1");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test-1");
             assertThat(oldIndex.getRolloverInfos().size(), equalTo(0));
         }
 
@@ -587,7 +595,7 @@ public void testRolloverMaxPrimaryShardDocs() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-1"));
             assertThat(response.getNewIndex(), equalTo("test-000002"));
             assertThat("Should rollover with a small max_primary_shard_docs condition", response.isRolledOver(), equalTo(true));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-1");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test-1");
             List<Condition<?>> metConditions = oldIndex.getRolloverInfos().get("test_alias").getMetConditions();
             assertThat(metConditions.size(), equalTo(1));
             assertThat(
@@ -610,7 +618,11 @@ public void testRolloverMaxPrimaryShardDocs() throws Exception {
             assertThat(response.getOldIndex(), equalTo("test-000002"));
             assertThat(response.getNewIndex(), equalTo("test-000003"));
             assertThat("No rollover with an empty index", response.isRolledOver(), equalTo(false));
-            final IndexMetadata oldIndex = clusterAdmin().prepareState().get().getState().metadata().index("test-000002");
+            final IndexMetadata oldIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test-000002");
             assertThat(oldIndex.getRolloverInfos().size(), equalTo(0));
         }
     }
@@ -698,7 +710,7 @@ public void testRolloverWithHiddenAliasesAndExplicitWriteIndex() {
         assertThat(response.isDryRun(), equalTo(false));
         assertThat(response.isRolledOver(), equalTo(true));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index(firstIndexName);
         assertTrue(oldIndex.getAliases().containsKey(aliasName));
         assertTrue(oldIndex.getAliases().get(aliasName).isHidden());
@@ -732,7 +744,7 @@ public void testRolloverWithHiddenAliasesAndImplicitWriteIndex() {
         assertThat(response.isDryRun(), equalTo(false));
         assertThat(response.isRolledOver(), equalTo(true));
         assertThat(response.getConditionStatus().size(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexMetadata oldIndex = state.metadata().index(firstIndexName);
         assertFalse(oldIndex.getAliases().containsKey(aliasName));
         final IndexMetadata newIndex = state.metadata().index(secondIndexName);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java
index 1a070c8bd0de..e6b042c059f4 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java
@@ -88,10 +88,10 @@ public void testBasic() throws Exception {
         logger.info("--> disable allocation");
         disableAllocation(index);
         logger.info("--> stop random node");
-        int num = clusterAdmin().prepareState().get().getState().nodes().getSize();
+        int num = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getSize();
         internalCluster().stopNode(internalCluster().getNodeNameThat(new IndexNodePredicate(index)));
-        assertNoTimeout(clusterAdmin().prepareHealth().setWaitForNodes("" + (num - 1)));
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        assertNoTimeout(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("" + (num - 1)));
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<ShardRouting> unassignedShards = clusterState.routingTable().index(index).shardsWithState(ShardRoutingState.UNASSIGNED);
         response = execute(new IndicesShardStoresRequest(index));
         assertThat(response.getStoreStatuses().containsKey(index), equalTo(true));
@@ -227,7 +227,7 @@ public boolean test(Settings settings) {
         }
 
         private Set<String> findNodesWithShard(String index) {
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             IndexRoutingTable indexRoutingTable = state.routingTable().index(index);
             List<ShardRouting> startedShards = indexRoutingTable.shardsWithState(ShardRoutingState.STARTED);
             Set<String> nodesNamesWithShard = new HashSet<>();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java
index 38d571928729..300ef1691a07 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java
@@ -14,15 +14,12 @@
 import org.elasticsearch.action.admin.indices.alias.Alias;
 import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.support.replication.ReplicationRequest;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.ingest.IngestTestPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
@@ -31,7 +28,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -39,7 +35,6 @@
 import static org.elasticsearch.action.DocWriteResponse.Result.UPDATED;
 import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -134,17 +129,11 @@ public void testBulkWithGlobalDefaults() throws Exception {
         }
     }
 
-    private void createSamplePipeline(String pipelineId) throws IOException, ExecutionException, InterruptedException {
-        XContentBuilder pipeline = jsonBuilder().startObject()
-            .startArray("processors")
-            .startObject()
-            .startObject("test")
-            .endObject()
-            .endObject()
-            .endArray()
-            .endObject();
-
-        assertAcked(clusterAdmin().putPipeline(new PutPipelineRequest(pipelineId, BytesReference.bytes(pipeline), XContentType.JSON)));
+    private void createSamplePipeline(String pipelineId) throws IOException {
+        putJsonPipeline(
+            pipelineId,
+            (builder, params) -> builder.startArray("processors").startObject().startObject("test").endObject().endObject().endArray()
+        );
     }
 
     /** This test ensures that index deletion makes indexing fail quickly, not wait on the index that has disappeared */
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java
index 85b720a03478..d8797f3c6457 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java
@@ -28,7 +28,7 @@ public void testBulkProcessorAutoCreateRestrictions() {
         internalCluster().startNode(settings);
 
         createIndex("willwork");
-        clusterAdmin().prepareHealth("willwork").setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "willwork").setWaitForGreenStatus().get();
 
         BulkRequestBuilder bulkRequestBuilder = client().prepareBulk();
         bulkRequestBuilder.add(prepareIndex("willwork").setId("1").setSource("{\"foo\":1}", XContentType.JSON));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/TransportSimulateBulkActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/TransportSimulateBulkActionIT.java
index 4a56a6ce8ddb..573d929ee30a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/TransportSimulateBulkActionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/TransportSimulateBulkActionIT.java
@@ -80,7 +80,7 @@ public void testMappingValidationIndexExists() {
         SearchResponse searchResponse = client().search(new SearchRequest(indexName)).actionGet();
         assertThat(searchResponse.getHits().getTotalHits().value, equalTo(0L));
         searchResponse.decRef();
-        ClusterStateResponse clusterStateResponse = admin().cluster().state(new ClusterStateRequest()).actionGet();
+        ClusterStateResponse clusterStateResponse = admin().cluster().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).actionGet();
         Map<String, Object> indexMapping = clusterStateResponse.getState().metadata().index(indexName).mapping().sourceAsMap();
         Map<String, Object> fields = (Map<String, Object>) indexMapping.get("properties");
         assertThat(fields.size(), equalTo(1));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java
index 39273e9d1712..023fa54fef9e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java
@@ -134,7 +134,7 @@ public void testCreateIndexStopsWaitingWhenIndexDeleted() throws Exception {
             .execute();
 
         logger.info("--> wait until the cluster state contains the new index");
-        assertBusy(() -> assertTrue(clusterAdmin().prepareState().get().getState().metadata().hasIndex(indexName)));
+        assertBusy(() -> assertTrue(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().hasIndex(indexName)));
 
         logger.info("--> delete the index");
         assertAcked(indicesAdmin().prepareDelete(indexName));
@@ -148,7 +148,7 @@ public void testCreateIndexStopsWaitingWhenIndexDeleted() throws Exception {
     // only after the test cleanup does the index creation manifest in the cluster state. To take care of this problem
     // and its potential ramifications, we wait here for the index creation cluster state update task to finish
     private void waitForIndexCreationToComplete(final String indexName) {
-        clusterAdmin().prepareHealth(indexName).setWaitForEvents(Priority.URGENT).get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).setWaitForEvents(Priority.URGENT).get();
     }
 
 }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java
index 6737d02434c0..bb970f69ead1 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java
@@ -53,7 +53,7 @@ public void testReplicationWaitsForActiveShardCount() throws Exception {
 
         allowNodes("test", 2);
 
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForActiveShards(2)
             .setWaitForYellowStatus()
@@ -90,7 +90,7 @@ public void testReplicationWaitsForActiveShardCount() throws Exception {
         }
 
         allowNodes("test", 3);
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForActiveShards(3)
             .setWaitForGreenStatus()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java
index e568b51e43b2..321c1c84d5cb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/TransportMasterNodeActionIT.java
@@ -79,7 +79,13 @@ public void testRoutingLoopProtection() {
 
         try {
             final var newMaster = ensureSufficientMasterEligibleNodes();
-            final long originalTerm = internalCluster().masterClient().admin().cluster().prepareState().get().getState().term();
+            final long originalTerm = internalCluster().masterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .term();
             final var previousMasterKnowsNewMasterIsElectedLatch = configureElectionLatch(newMaster, cleanupTasks);
 
             final var newMasterReceivedReroutedMessageFuture = new PlainActionFuture<>();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java
index 2f10711db737..91903fd70003 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java
@@ -202,7 +202,7 @@ public void testFilteringAliases() throws Exception {
 
         // For now just making sure that filter was stored with the alias
         logger.info("--> making sure that filter was stored with alias [alias1] and filter [user:kimchy]");
-        ClusterState clusterState = admin().cluster().prepareState().get().getState();
+        ClusterState clusterState = admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         IndexMetadata indexMd = clusterState.metadata().index("test");
         assertThat(indexMd.getAliases().get("alias1").filter().string(), equalTo("""
             {"term":{"user":{"value":"kimchy"}}}"""));
@@ -1416,21 +1416,33 @@ private void assertAliasesVersionIncreases(final String index, final Runnable ru
 
     private void assertAliasesVersionIncreases(final String[] indices, final Runnable runnable) {
         final var beforeAliasesVersions = new HashMap<String, Long>(indices.length);
-        final var beforeMetadata = admin().cluster().prepareState().get().getState().metadata();
+        final var beforeMetadata = admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         for (final var index : indices) {
             beforeAliasesVersions.put(index, beforeMetadata.index(index).getAliasesVersion());
         }
         runnable.run();
-        final var afterMetadata = admin().cluster().prepareState().get().getState().metadata();
+        final var afterMetadata = admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         for (final String index : indices) {
             assertThat(afterMetadata.index(index).getAliasesVersion(), equalTo(1 + beforeAliasesVersions.get(index)));
         }
     }
 
     private void assertAliasesVersionUnchanged(final String index, final Runnable runnable) {
-        final long beforeAliasesVersion = admin().cluster().prepareState().get().getState().metadata().index(index).getAliasesVersion();
+        final long beforeAliasesVersion = admin().cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index(index)
+            .getAliasesVersion();
         runnable.run();
-        final long afterAliasesVersion = admin().cluster().prepareState().get().getState().metadata().index(index).getAliasesVersion();
+        final long afterAliasesVersion = admin().cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index(index)
+            .getAliasesVersion();
         assertThat(afterAliasesVersion, equalTo(beforeAliasesVersion));
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java
index c5c3e441363d..517357782715 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java
@@ -298,7 +298,7 @@ public void testAddBlockToUnassignedIndex() throws Exception {
                 .setSettings(Settings.builder().put("index.routing.allocation.include._name", "nothing").build())
         );
 
-        final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().indices().get(indexName).getState(), is(IndexMetadata.State.OPEN));
         assertThat(clusterState.routingTable().allShards().allMatch(ShardRouting::unassigned), is(true));
 
@@ -393,7 +393,7 @@ public void testAddBlockWhileDeletingIndices() throws Exception {
             }
             indices[i] = indexName;
         }
-        assertThat(clusterAdmin().prepareState().get().getState().metadata().indices().size(), equalTo(indices.length));
+        assertThat(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().indices().size(), equalTo(indices.length));
 
         final List<Thread> threads = new ArrayList<>();
         final CountDownLatch latch = new CountDownLatch(1);
@@ -434,7 +434,7 @@ public void testAddBlockWhileDeletingIndices() throws Exception {
     }
 
     static void assertIndexHasBlock(APIBlock block, final String... indices) {
-        final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (String index : indices) {
             final IndexMetadata indexMetadata = clusterState.metadata().indices().get(index);
             final Settings indexSettings = indexMetadata.getSettings();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterHealthIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterHealthIT.java
index 65c0aa654818..a190ac61bbe1 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterHealthIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterHealthIT.java
@@ -43,7 +43,7 @@ public void testSimpleLocalHealth() {
             logger.info("--> getting cluster health on [{}]", node);
             final ClusterHealthResponse health = client(node).admin()
                 .cluster()
-                .prepareHealth()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setLocal(true)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(TimeValue.timeValueSeconds(30))
@@ -56,7 +56,7 @@ public void testSimpleLocalHealth() {
 
     public void testHealth() {
         logger.info("--> running cluster health on an index that does not exists");
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth("test1")
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test1")
             .setWaitForYellowStatus()
             .setTimeout(TimeValue.timeValueSeconds(1))
             .get();
@@ -65,7 +65,10 @@ public void testHealth() {
         assertThat(healthResponse.getIndices().isEmpty(), equalTo(true));
 
         logger.info("--> running cluster wide health");
-        healthResponse = clusterAdmin().prepareHealth().setWaitForGreenStatus().setTimeout(TimeValue.timeValueSeconds(10)).get();
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForGreenStatus()
+            .setTimeout(TimeValue.timeValueSeconds(10))
+            .get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
         assertThat(healthResponse.getStatus(), equalTo(ClusterHealthStatus.GREEN));
         assertThat(healthResponse.getIndices().isEmpty(), equalTo(true));
@@ -74,13 +77,16 @@ public void testHealth() {
         createIndex("test1");
 
         logger.info("--> running cluster health on an index that does exists");
-        healthResponse = clusterAdmin().prepareHealth("test1").setWaitForGreenStatus().setTimeout(TimeValue.timeValueSeconds(10)).get();
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test1")
+            .setWaitForGreenStatus()
+            .setTimeout(TimeValue.timeValueSeconds(10))
+            .get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
         assertThat(healthResponse.getStatus(), equalTo(ClusterHealthStatus.GREEN));
         assertThat(healthResponse.getIndices().get("test1").getStatus(), equalTo(ClusterHealthStatus.GREEN));
 
         logger.info("--> running cluster health on an index that does exists and an index that doesn't exists");
-        healthResponse = clusterAdmin().prepareHealth("test1", "test2")
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test1", "test2")
             .setWaitForYellowStatus()
             .setTimeout(TimeValue.timeValueSeconds(1))
             .get();
@@ -93,7 +99,7 @@ public void testHealth() {
     public void testHealthWithClosedIndices() {
         createIndex("index-1");
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth().setWaitForGreenStatus().get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().get("index-1").getStatus(), equalTo(ClusterHealthStatus.GREEN));
@@ -103,7 +109,7 @@ public void testHealthWithClosedIndices() {
         assertAcked(indicesAdmin().prepareClose("index-2"));
 
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth().setWaitForGreenStatus().get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(2));
@@ -111,21 +117,21 @@ public void testHealthWithClosedIndices() {
             assertThat(response.getIndices().get("index-2").getStatus(), equalTo(ClusterHealthStatus.GREEN));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-1").get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-1").get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(1));
             assertThat(response.getIndices().get("index-1").getStatus(), equalTo(ClusterHealthStatus.GREEN));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-2").get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-2").get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(1));
             assertThat(response.getIndices().get("index-2").getStatus(), equalTo(ClusterHealthStatus.GREEN));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-*").get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-*").get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(2));
@@ -133,7 +139,7 @@ public void testHealthWithClosedIndices() {
             assertThat(response.getIndices().get("index-2").getStatus(), equalTo(ClusterHealthStatus.GREEN));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-*")
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-*")
                 .setIndicesOptions(IndicesOptions.lenientExpandOpen())
                 .get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
@@ -143,7 +149,7 @@ public void testHealthWithClosedIndices() {
             assertThat(response.getIndices().get("index-2"), nullValue());
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-*")
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-*")
                 .setIndicesOptions(IndicesOptions.fromOptions(true, true, false, true))
                 .get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
@@ -157,7 +163,7 @@ public void testHealthWithClosedIndices() {
         assertAcked(indicesAdmin().prepareClose("index-3"));
 
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth()
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForNoRelocatingShards(true)
                 .setWaitForNoInitializingShards(true)
                 .setWaitForYellowStatus()
@@ -170,28 +176,28 @@ public void testHealthWithClosedIndices() {
             assertThat(response.getIndices().get("index-3").getStatus(), equalTo(ClusterHealthStatus.YELLOW));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-1").get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-1").get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(1));
             assertThat(response.getIndices().get("index-1").getStatus(), equalTo(ClusterHealthStatus.GREEN));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-2").get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-2").get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(1));
             assertThat(response.getIndices().get("index-2").getStatus(), equalTo(ClusterHealthStatus.GREEN));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-3").get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-3").get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.YELLOW));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(1));
             assertThat(response.getIndices().get("index-3").getStatus(), equalTo(ClusterHealthStatus.YELLOW));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-*").get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-*").get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.YELLOW));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(3));
@@ -200,7 +206,7 @@ public void testHealthWithClosedIndices() {
             assertThat(response.getIndices().get("index-3").getStatus(), equalTo(ClusterHealthStatus.YELLOW));
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-*")
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-*")
                 .setIndicesOptions(IndicesOptions.lenientExpandOpen())
                 .get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
@@ -211,7 +217,7 @@ public void testHealthWithClosedIndices() {
             assertThat(response.getIndices().get("index-3"), nullValue());
         }
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth("index-*")
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index-*")
                 .setIndicesOptions(IndicesOptions.fromOptions(true, true, false, true))
                 .get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.YELLOW));
@@ -224,7 +230,7 @@ public void testHealthWithClosedIndices() {
 
         setReplicaCount(numberOfReplicas(), "index-3");
         {
-            ClusterHealthResponse response = clusterAdmin().prepareHealth().setWaitForGreenStatus().get();
+            ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
             assertThat(response.getStatus(), equalTo(ClusterHealthStatus.GREEN));
             assertThat(response.isTimedOut(), equalTo(false));
             assertThat(response.getIndices().size(), equalTo(3));
@@ -240,7 +246,7 @@ public void testHealthOnIndexCreation() throws Exception {
             @Override
             public void run() {
                 while (finished.get() == false) {
-                    ClusterHealthResponse health = clusterAdmin().prepareHealth().get();
+                    ClusterHealthResponse health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get();
                     assertThat(health.getStatus(), not(equalTo(ClusterHealthStatus.RED)));
                 }
             }
@@ -254,7 +260,7 @@ public void run() {
     }
 
     public void testWaitForEventsRetriesIfOtherConditionsNotMet() {
-        final ActionFuture<ClusterHealthResponse> healthResponseFuture = clusterAdmin().prepareHealth("index")
+        final ActionFuture<ClusterHealthResponse> healthResponseFuture = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .execute();
@@ -286,7 +292,7 @@ public void clusterStateProcessed(ClusterState oldState, ClusterState newState)
 
         try {
             createIndex("index");
-            assertFalse(clusterAdmin().prepareHealth("index").setWaitForGreenStatus().get().isTimedOut());
+            assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index").setWaitForGreenStatus().get().isTimedOut());
 
             // at this point the original health response should not have returned: there was never a point where the index was green AND
             // the master had processed all pending tasks above LANGUID priority.
@@ -326,7 +332,7 @@ public void testHealthOnMasterFailover() throws Exception {
             responseFutures.add(
                 client(node).admin()
                     .cluster()
-                    .prepareHealth()
+                    .prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setWaitForGreenStatus()
                     .setMasterNodeTimeout(TimeValue.timeValueMinutes(timeoutMinutes))
@@ -369,7 +375,7 @@ public void clusterStateProcessed(ClusterState oldState, ClusterState newState)
         });
 
         try {
-            final ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+            final ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(TimeValue.timeValueSeconds(1))
                 .get(TimeValue.timeValueSeconds(30));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java
index cc930cdad595..f0801d01a70d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java
@@ -206,7 +206,7 @@ public void testClusterInfoServiceInformationClearOnError() {
         prepareCreate("test").setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1)).get();
         ensureGreen("test");
 
-        final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState()
+        final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setRoutingTable(true)
             .get()
@@ -320,7 +320,12 @@ public void testClusterInfoServiceInformationClearOnError() {
             assertThat("size for shard " + shardRouting + " found", originalInfo.getShardSize(shardRouting), notNullValue());
         }
 
-        RoutingTable routingTable = clusterAdmin().prepareState().clear().setRoutingTable(true).get().getState().routingTable();
+        RoutingTable routingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setRoutingTable(true)
+            .get()
+            .getState()
+            .routingTable();
         for (ShardRouting shard : routingTable.allShardsIterator()) {
             assertTrue(
                 infoAfterRecovery.getReservedSpace(shard.currentNodeId(), infoAfterRecovery.getDataPath(shard))
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
index ffa2cd29778a..8fa63c15c7aa 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
@@ -152,7 +152,6 @@ public void testClusterStateDiffSerialization() throws Exception {
                 }
 
                 // Check routing table
-                assertThat(clusterStateFromDiffs.routingTable().version(), equalTo(clusterState.routingTable().version()));
                 assertThat(clusterStateFromDiffs.routingTable().indicesRouting(), equalTo(clusterState.routingTable().indicesRouting()));
 
                 // Check cluster blocks
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/DesiredNodesSnapshotsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/DesiredNodesSnapshotsIT.java
index aaf663c8c5b2..382d7aa8eb64 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/DesiredNodesSnapshotsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/DesiredNodesSnapshotsIT.java
@@ -55,11 +55,15 @@ private UpdateDesiredNodesResponse updateDesiredNodes(UpdateDesiredNodesRequest
     }
 
     private DesiredNodes getLatestDesiredNodes() {
-        return client().execute(GetDesiredNodesAction.INSTANCE, new GetDesiredNodesAction.Request()).actionGet().getDesiredNodes();
+        return client().execute(GetDesiredNodesAction.INSTANCE, new GetDesiredNodesAction.Request(TEST_REQUEST_TIMEOUT))
+            .actionGet()
+            .getDesiredNodes();
     }
 
     private UpdateDesiredNodesRequest randomUpdateDesiredNodesRequest() {
         return new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             randomAlphaOfLength(10),
             randomIntBetween(1, 10),
             randomList(
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/DesiredNodesStatusIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/DesiredNodesStatusIT.java
index 77fcdb446baa..08dbd800ede5 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/DesiredNodesStatusIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/DesiredNodesStatusIT.java
@@ -35,6 +35,8 @@ public void testDesiredNodesStatusIsTracked() {
         final var pendingDesiredNodes = randomList(0, 5, DesiredNodesTestCase::randomDesiredNode);
 
         final var updateDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             randomAlphaOfLength(10),
             1,
             concatLists(actualizedDesiredNodes, pendingDesiredNodes),
@@ -43,11 +45,13 @@ public void testDesiredNodesStatusIsTracked() {
         updateDesiredNodes(updateDesiredNodesRequest);
 
         {
-            final var clusterState = clusterAdmin().prepareState().get().getState();
+            final var clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertDesiredNodesStatusIsCorrect(clusterState, actualizedDesiredNodes, pendingDesiredNodes);
         }
 
         final var newVersionUpdateDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             updateDesiredNodesRequest.getHistoryID(),
             updateDesiredNodesRequest.getVersion() + 1,
             updateDesiredNodesRequest.getNodes(),
@@ -56,7 +60,7 @@ public void testDesiredNodesStatusIsTracked() {
         updateDesiredNodes(newVersionUpdateDesiredNodesRequest);
 
         {
-            final var clusterState = clusterAdmin().prepareState().get().getState();
+            final var clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertDesiredNodesStatusIsCorrect(clusterState, actualizedDesiredNodes, pendingDesiredNodes);
         }
     }
@@ -70,6 +74,8 @@ public void testIdempotentUpdateWithUpdatedStatus() {
         final var pendingDesiredNodes = randomList(0, 5, DesiredNodesTestCase::randomDesiredNode);
 
         final var updateDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             randomAlphaOfLength(10),
             1,
             concatLists(actualizedDesiredNodes, pendingDesiredNodes),
@@ -78,14 +84,14 @@ public void testIdempotentUpdateWithUpdatedStatus() {
         updateDesiredNodes(updateDesiredNodesRequest);
 
         {
-            final var clusterState = clusterAdmin().prepareState().get().getState();
+            final var clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             DesiredNodesTestCase.assertDesiredNodesStatusIsCorrect(clusterState, actualizedDesiredNodes, pendingDesiredNodes);
         }
 
         updateDesiredNodes(updateDesiredNodesRequest);
 
         {
-            final var clusterState = clusterAdmin().prepareState().get().getState();
+            final var clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             DesiredNodesTestCase.assertDesiredNodesStatusIsCorrect(clusterState, actualizedDesiredNodes, pendingDesiredNodes);
         }
     }
@@ -99,6 +105,8 @@ public void testActualizedDesiredNodesAreKeptAsActualizedEvenIfNodesLeavesTempor
         final var pendingDesiredNodes = randomList(0, 5, DesiredNodesTestCase::randomDesiredNode);
 
         final var updateDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             randomAlphaOfLength(10),
             1,
             concatLists(actualizedDesiredNodes, pendingDesiredNodes),
@@ -106,7 +114,7 @@ public void testActualizedDesiredNodesAreKeptAsActualizedEvenIfNodesLeavesTempor
         );
         updateDesiredNodes(updateDesiredNodesRequest);
 
-        final var clusterState = clusterAdmin().prepareState().get().getState();
+        final var clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         DesiredNodesTestCase.assertDesiredNodesStatusIsCorrect(clusterState, actualizedDesiredNodes, pendingDesiredNodes);
 
         final var leavingNodeNames = randomSubsetOf(nodeNames);
@@ -114,7 +122,7 @@ public void testActualizedDesiredNodesAreKeptAsActualizedEvenIfNodesLeavesTempor
             internalCluster().stopNode(leavingNodeName);
         }
 
-        final var newClusterState = clusterAdmin().prepareState().get().getState();
+        final var newClusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final var latestDesiredNodes = DesiredNodes.latestFromClusterState(newClusterState);
 
         for (String leavingNodeName : leavingNodeNames) {
@@ -132,6 +140,8 @@ public void testStatusInformationIsClearedAfterHistoryIdChanges() throws Excepti
         final var pendingDesiredNodes = randomList(0, 5, DesiredNodesTestCase::randomDesiredNode);
 
         final var updateDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             randomAlphaOfLength(10),
             1,
             concatLists(actualizedDesiredNodes, pendingDesiredNodes),
@@ -139,7 +149,7 @@ public void testStatusInformationIsClearedAfterHistoryIdChanges() throws Excepti
         );
         updateDesiredNodes(updateDesiredNodesRequest);
 
-        final var clusterState = clusterAdmin().prepareState().get().getState();
+        final var clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         DesiredNodesTestCase.assertDesiredNodesStatusIsCorrect(clusterState, actualizedDesiredNodes, pendingDesiredNodes);
 
         // Stop some nodes, these shouldn't be actualized within the new desired node's history until they join back
@@ -149,6 +159,8 @@ public void testStatusInformationIsClearedAfterHistoryIdChanges() throws Excepti
         }
 
         final var updateDesiredNodesWithNewHistoryRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             randomAlphaOfLength(10),
             1,
             updateDesiredNodesRequest.getNodes(),
@@ -157,7 +169,7 @@ public void testStatusInformationIsClearedAfterHistoryIdChanges() throws Excepti
         final var response = updateDesiredNodes(updateDesiredNodesWithNewHistoryRequest);
         assertThat(response.hasReplacedExistingHistoryId(), is(equalTo(true)));
 
-        final var updatedClusterState = clusterAdmin().prepareState().get().getState();
+        final var updatedClusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final var latestDesiredNodes = DesiredNodes.latestFromClusterState(updatedClusterState);
 
         for (String clusterNodeName : clusterNodeNames) {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
index d3cbab276074..a3c7f8b77a44 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
@@ -67,25 +67,25 @@ public void testTwoNodesNoMasterBlock() throws Exception {
         String node1Name = internalCluster().startNode(settings);
 
         logger.info("--> should be blocked, no master...");
-        ClusterState state = clusterAdmin().prepareState().setLocal(true).get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
         assertThat(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(true));
         assertThat(state.nodes().getSize(), equalTo(1)); // verify that we still see the local node in the cluster state
 
         logger.info("--> start second node, cluster should be formed");
         String node2Name = internalCluster().startNode(settings);
 
-        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes("2")
             .get();
         assertThat(clusterHealthResponse.isTimedOut(), equalTo(false));
 
-        state = clusterAdmin().prepareState().setLocal(true).get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
         assertThat(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(false));
-        state = clusterAdmin().prepareState().setLocal(true).get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
         assertThat(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(false));
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.nodes().getSize(), equalTo(2));
         assertThat(state.metadata().indices().containsKey("test"), equalTo(false));
 
@@ -97,7 +97,10 @@ public void testTwoNodesNoMasterBlock() throws Exception {
         }
         // make sure that all shards recovered before trying to flush
         assertThat(
-            clusterAdmin().prepareHealth("test").setWaitForActiveShards(numShards.totalNumShards).get().getActiveShards(),
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test")
+                .setWaitForActiveShards(numShards.totalNumShards)
+                .get()
+                .getActiveShards(),
             equalTo(numShards.totalNumShards)
         );
         // flush for simpler debugging
@@ -111,17 +114,20 @@ public void testTwoNodesNoMasterBlock() throws Exception {
         String masterNode = internalCluster().getMasterName();
         String otherNode = node1Name.equals(masterNode) ? node2Name : node1Name;
         logger.info("--> add voting config exclusion for non-master node, to be sure it's not elected");
-        client().execute(TransportAddVotingConfigExclusionsAction.TYPE, new AddVotingConfigExclusionsRequest(otherNode)).get();
+        client().execute(
+            TransportAddVotingConfigExclusionsAction.TYPE,
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, otherNode)
+        ).get();
         logger.info("--> stop master node, no master block should appear");
         Settings masterDataPathSettings = internalCluster().dataPathSettings(masterNode);
         internalCluster().stopNode(masterNode);
 
         assertBusy(() -> {
-            ClusterState clusterState = clusterAdmin().prepareState().setLocal(true).get().getState();
+            ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
             assertTrue(clusterState.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
         });
 
-        state = clusterAdmin().prepareState().setLocal(true).get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
         assertThat(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(true));
         // verify that both nodes are still in the cluster state but there is no master
         assertThat(state.nodes().getSize(), equalTo(2));
@@ -130,19 +136,19 @@ public void testTwoNodesNoMasterBlock() throws Exception {
         logger.info("--> starting the previous master node again...");
         node2Name = internalCluster().startNode(Settings.builder().put(settings).put(masterDataPathSettings).build());
 
-        clusterHealthResponse = clusterAdmin().prepareHealth()
+        clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForYellowStatus()
             .setWaitForNodes("2")
             .get();
         assertThat(clusterHealthResponse.isTimedOut(), equalTo(false));
 
-        state = clusterAdmin().prepareState().setLocal(true).get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
         assertThat(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(false));
-        state = clusterAdmin().prepareState().setLocal(true).get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
         assertThat(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(false));
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.nodes().getSize(), equalTo(2));
         assertThat(state.metadata().indices().containsKey("test"), equalTo(true));
 
@@ -154,20 +160,23 @@ public void testTwoNodesNoMasterBlock() throws Exception {
         }
 
         logger.info("--> clearing voting config exclusions");
-        ClearVotingConfigExclusionsRequest clearRequest = new ClearVotingConfigExclusionsRequest();
+        ClearVotingConfigExclusionsRequest clearRequest = new ClearVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT);
         clearRequest.setWaitForRemoval(false);
         client().execute(TransportClearVotingConfigExclusionsAction.TYPE, clearRequest).get();
 
         masterNode = internalCluster().getMasterName();
         otherNode = node1Name.equals(masterNode) ? node2Name : node1Name;
         logger.info("--> add voting config exclusion for master node, to be sure it's not elected");
-        client().execute(TransportAddVotingConfigExclusionsAction.TYPE, new AddVotingConfigExclusionsRequest(masterNode)).get();
+        client().execute(
+            TransportAddVotingConfigExclusionsAction.TYPE,
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, masterNode)
+        ).get();
         logger.info("--> stop non-master node, no master block should appear");
         Settings otherNodeDataPathSettings = internalCluster().dataPathSettings(otherNode);
         internalCluster().stopNode(otherNode);
 
         assertBusy(() -> {
-            ClusterState state1 = clusterAdmin().prepareState().setLocal(true).get().getState();
+            ClusterState state1 = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
             assertThat(state1.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(true));
         });
 
@@ -175,19 +184,19 @@ public void testTwoNodesNoMasterBlock() throws Exception {
         internalCluster().startNode(Settings.builder().put(settings).put(otherNodeDataPathSettings).build());
 
         ensureGreen();
-        clusterHealthResponse = clusterAdmin().prepareHealth()
+        clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes("2")
             .setWaitForGreenStatus()
             .get();
         assertThat(clusterHealthResponse.isTimedOut(), equalTo(false));
 
-        state = clusterAdmin().prepareState().setLocal(true).get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
         assertThat(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(false));
-        state = clusterAdmin().prepareState().setLocal(true).get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
         assertThat(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(false));
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.nodes().getSize(), equalTo(2));
         assertThat(state.metadata().indices().containsKey("test"), equalTo(true));
 
@@ -212,7 +221,7 @@ public void testThreeNodesNoMasterBlock() throws Exception {
 
         assertBusy(() -> {
             for (Client client : clients()) {
-                ClusterState state1 = client.admin().cluster().prepareState().setLocal(true).get().getState();
+                ClusterState state1 = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
                 assertThat(state1.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(true));
             }
         });
@@ -221,13 +230,13 @@ public void testThreeNodesNoMasterBlock() throws Exception {
         internalCluster().startNode(settings);
 
         ensureGreen();
-        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes("3")
             .get();
         assertThat(clusterHealthResponse.isTimedOut(), equalTo(false));
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.nodes().getSize(), equalTo(3));
 
         createIndex("test");
@@ -239,7 +248,7 @@ public void testThreeNodesNoMasterBlock() throws Exception {
         ensureGreen();
         // make sure that all shards recovered before trying to flush
         assertThat(
-            clusterAdmin().prepareHealth("test").setWaitForActiveShards(numShards.totalNumShards).get().isTimedOut(),
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test").setWaitForActiveShards(numShards.totalNumShards).get().isTimedOut(),
             equalTo(false)
         );
         // flush for simpler debugging
@@ -262,7 +271,7 @@ public void testThreeNodesNoMasterBlock() throws Exception {
         logger.info("--> verify that there is no master anymore on remaining node");
         // spin here to wait till the state is set
         assertBusy(() -> {
-            ClusterState st = clusterAdmin().prepareState().setLocal(true).get().getState();
+            ClusterState st = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
             assertThat(st.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID), equalTo(true));
         });
 
@@ -272,7 +281,7 @@ public void testThreeNodesNoMasterBlock() throws Exception {
         internalCluster().validateClusterFormed();
         ensureGreen();
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.nodes().getSize(), equalTo(3));
 
         logger.info("--> verify we the data back");
@@ -338,7 +347,7 @@ public void onFailure(Exception e) {
             DiscoveryNode masterNode = internalCluster().client(randomFrom(otherNodes))
                 .admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .get()
                 .getState()
                 .nodes()
@@ -350,7 +359,7 @@ public void onFailure(Exception e) {
         partition.stopDisrupting();
 
         logger.debug("--> waiting for cluster to heal");
-        assertNoTimeout(clusterAdmin().prepareHealth().setWaitForNodes("3").setWaitForEvents(Priority.LANGUID));
+        assertNoTimeout(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("3").setWaitForEvents(Priority.LANGUID));
 
         for (String node : internalCluster().getNodeNames()) {
             Settings nodeSetting = internalCluster().clusterService(node).state().metadata().settings();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java
index d8c91d770437..6b104291693e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java
@@ -72,7 +72,7 @@ public void testNoMasterActions() throws Exception {
         final List<String> nodes = internalCluster().startNodes(3, settings);
 
         createIndex("test");
-        clusterAdmin().prepareHealth("test").setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test").setWaitForGreenStatus().get();
 
         final NetworkDisruption disruptionScheme = new NetworkDisruption(
             new IsolateAllNodes(new HashSet<>(nodes)),
@@ -84,7 +84,12 @@ public void testNoMasterActions() throws Exception {
         final Client clientToMasterlessNode = client();
 
         assertBusy(() -> {
-            ClusterState state = clientToMasterlessNode.admin().cluster().prepareState().setLocal(true).get().getState();
+            ClusterState state = clientToMasterlessNode.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState();
             assertTrue(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
         });
 
@@ -223,14 +228,14 @@ public void testNoMasterActionsWriteMasterBlock() throws Exception {
 
         prepareCreate("test1").setSettings(indexSettings(1, 2)).get();
         prepareCreate("test2").setSettings(indexSettings(3, 0)).get();
-        clusterAdmin().prepareHealth("_all").setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "_all").setWaitForGreenStatus().get();
         prepareIndex("test1").setId("1").setSource("field", "value1").get();
         prepareIndex("test2").setId("1").setSource("field", "value1").get();
         refresh();
 
         ensureSearchable("test1", "test2");
 
-        ClusterStateResponse clusterState = clusterAdmin().prepareState().get();
+        ClusterStateResponse clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         logger.info("Cluster state:\n{}", clusterState.getState());
 
         final NetworkDisruption disruptionScheme = new NetworkDisruption(
@@ -243,7 +248,12 @@ public void testNoMasterActionsWriteMasterBlock() throws Exception {
         final Client clientToMasterlessNode = client();
 
         assertBusy(() -> {
-            ClusterState state = clientToMasterlessNode.admin().cluster().prepareState().setLocal(true).get().getState();
+            ClusterState state = clientToMasterlessNode.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState();
             assertTrue(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
         });
 
@@ -299,13 +309,13 @@ public void testNoMasterActionsMetadataWriteMasterBlock() throws Exception {
         final List<String> nodes = internalCluster().startNodes(3, settings);
 
         prepareCreate("test1").setSettings(indexSettings(1, 1)).get();
-        clusterAdmin().prepareHealth("_all").setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "_all").setWaitForGreenStatus().get();
         prepareIndex("test1").setId("1").setSource("field", "value1").get();
         refresh();
 
         ensureGreen("test1");
 
-        ClusterStateResponse clusterState = clusterAdmin().prepareState().get();
+        ClusterStateResponse clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         logger.info("Cluster state:\n{}", clusterState.getState());
 
         final List<String> nodesWithShards = clusterState.getState()
@@ -321,7 +331,7 @@ public void testNoMasterActionsMetadataWriteMasterBlock() throws Exception {
 
         client().execute(
             TransportAddVotingConfigExclusionsAction.TYPE,
-            new AddVotingConfigExclusionsRequest(nodesWithShards.toArray(new String[0]))
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, nodesWithShards.toArray(new String[0]))
         ).get();
         ensureGreen("test1");
 
@@ -336,7 +346,7 @@ public void testNoMasterActionsMetadataWriteMasterBlock() throws Exception {
 
         assertBusy(() -> {
             for (String node : nodesWithShards) {
-                ClusterState state = client(node).admin().cluster().prepareState().setLocal(true).get().getState();
+                ClusterState state = client(node).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
                 assertTrue(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
             }
         });
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/PrevalidateNodeRemovalIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/PrevalidateNodeRemovalIT.java
index 3135647adc9a..6b5bb08f0f24 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/PrevalidateNodeRemovalIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/PrevalidateNodeRemovalIT.java
@@ -62,7 +62,8 @@ public void testNodeRemovalFromNonRedCluster() throws Exception {
             case 2 -> req.setExternalIds(internalCluster().clusterService(nodeName).localNode().getExternalId());
             default -> throw new IllegalStateException("Unexpected value");
         }
-        PrevalidateNodeRemovalResponse resp = client().execute(PrevalidateNodeRemovalAction.INSTANCE, req.build()).get();
+        PrevalidateNodeRemovalResponse resp = client().execute(PrevalidateNodeRemovalAction.INSTANCE, req.build(TEST_REQUEST_TIMEOUT))
+            .get();
         assertTrue(resp.getPrevalidation().isSafe());
         assertThat(resp.getPrevalidation().message(), equalTo("cluster status is not RED"));
         assertThat(resp.getPrevalidation().nodes().size(), equalTo(1));
@@ -75,7 +76,7 @@ public void testNodeRemovalFromNonRedCluster() throws Exception {
         // Enforce a replica to get unassigned
         updateIndexSettings(Settings.builder().put("index.routing.allocation.require._name", node1), indexName);
         ensureYellow();
-        PrevalidateNodeRemovalRequest req2 = PrevalidateNodeRemovalRequest.builder().setNames(node2).build();
+        PrevalidateNodeRemovalRequest req2 = PrevalidateNodeRemovalRequest.builder().setNames(node2).build(TEST_REQUEST_TIMEOUT);
         PrevalidateNodeRemovalResponse resp2 = client().execute(PrevalidateNodeRemovalAction.INSTANCE, req2).get();
         assertTrue(resp2.getPrevalidation().isSafe());
         assertThat(resp2.getPrevalidation().message(), equalTo("cluster status is not RED"));
@@ -107,7 +108,7 @@ public void testNodeRemovalFromRedClusterWithNoLocalShardCopy() throws Exception
         internalCluster().stopNode(nodeWithIndex);
         ensureRed(indexName);
         String[] otherNodeNames = otherNodes.toArray(new String[otherNodes.size()]);
-        PrevalidateNodeRemovalRequest req = PrevalidateNodeRemovalRequest.builder().setNames(otherNodeNames).build();
+        PrevalidateNodeRemovalRequest req = PrevalidateNodeRemovalRequest.builder().setNames(otherNodeNames).build(TEST_REQUEST_TIMEOUT);
         PrevalidateNodeRemovalResponse resp = client().execute(PrevalidateNodeRemovalAction.INSTANCE, req).get();
         assertTrue(resp.getPrevalidation().isSafe());
         assertThat(resp.getPrevalidation().message(), equalTo(""));
@@ -154,7 +155,7 @@ public void testNodeRemovalFromRedClusterWithLocalShardCopy() throws Exception {
         ShardPath shardPath = ShardPath.loadShardPath(logger, nodeEnv, new ShardId(index, 0), "");
         assertNotNull("local index shards not found", shardPath);
         // Prevalidate removal of node1
-        PrevalidateNodeRemovalRequest req = PrevalidateNodeRemovalRequest.builder().setNames(node1).build();
+        PrevalidateNodeRemovalRequest req = PrevalidateNodeRemovalRequest.builder().setNames(node1).build(TEST_REQUEST_TIMEOUT);
         PrevalidateNodeRemovalResponse resp = client().execute(PrevalidateNodeRemovalAction.INSTANCE, req).get();
         String node1Id = getNodeId(node1);
         assertFalse(resp.getPrevalidation().isSafe());
@@ -183,7 +184,7 @@ public void testNodeRemovalFromRedClusterWithTimeout() throws Exception {
             });
         PrevalidateNodeRemovalRequest req = PrevalidateNodeRemovalRequest.builder()
             .setNames(node2)
-            .build()
+            .build(TEST_REQUEST_TIMEOUT)
             .masterNodeTimeout(TimeValue.timeValueSeconds(1))
             .timeout(TimeValue.timeValueSeconds(1));
         PrevalidateNodeRemovalResponse resp = client().execute(PrevalidateNodeRemovalAction.INSTANCE, req).get();
@@ -203,7 +204,7 @@ public void testNodeRemovalFromRedClusterWithTimeout() throws Exception {
 
     private void ensureRed(String indexName) throws Exception {
         assertBusy(() -> {
-            ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(indexName)
+            ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName)
                 .setWaitForStatus(ClusterHealthStatus.RED)
                 .setWaitForEvents(Priority.LANGUID)
                 .get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleClusterStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
index 3dba41adec08..1259650d3779 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
@@ -76,13 +76,16 @@ public void indexData() throws Exception {
     }
 
     public void testRoutingTable() throws Exception {
-        ClusterStateResponse clusterStateResponseUnfiltered = clusterAdmin().prepareState().clear().setRoutingTable(true).get();
+        ClusterStateResponse clusterStateResponseUnfiltered = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setRoutingTable(true)
+            .get();
         assertThat(clusterStateResponseUnfiltered.getState().routingTable().hasIndex("foo"), is(true));
         assertThat(clusterStateResponseUnfiltered.getState().routingTable().hasIndex("fuu"), is(true));
         assertThat(clusterStateResponseUnfiltered.getState().routingTable().hasIndex("baz"), is(true));
         assertThat(clusterStateResponseUnfiltered.getState().routingTable().hasIndex("non-existent"), is(false));
 
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().clear().get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().get();
         assertThat(clusterStateResponse.getState().routingTable().hasIndex("foo"), is(false));
         assertThat(clusterStateResponse.getState().routingTable().hasIndex("fuu"), is(false));
         assertThat(clusterStateResponse.getState().routingTable().hasIndex("baz"), is(false));
@@ -90,43 +93,49 @@ public void testRoutingTable() throws Exception {
     }
 
     public void testNodes() throws Exception {
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().clear().setNodes(true).get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setNodes(true).get();
         assertThat(clusterStateResponse.getState().nodes().getNodes().size(), is(cluster().size()));
 
-        ClusterStateResponse clusterStateResponseFiltered = clusterAdmin().prepareState().clear().get();
+        ClusterStateResponse clusterStateResponseFiltered = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().get();
         assertThat(clusterStateResponseFiltered.getState().nodes().getNodes().size(), is(0));
     }
 
     public void testMetadata() throws Exception {
-        ClusterStateResponse clusterStateResponseUnfiltered = clusterAdmin().prepareState().clear().setMetadata(true).get();
+        ClusterStateResponse clusterStateResponseUnfiltered = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setMetadata(true)
+            .get();
         assertThat(clusterStateResponseUnfiltered.getState().metadata().indices().size(), is(3));
 
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().clear().get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().get();
         assertThat(clusterStateResponse.getState().metadata().indices().size(), is(0));
     }
 
     public void testMetadataVersion() {
         createIndex("index-1");
         createIndex("index-2");
-        long baselineVersion = clusterAdmin().prepareState().get().getState().metadata().version();
+        long baselineVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().version();
         assertThat(baselineVersion, greaterThan(0L));
         assertThat(
-            clusterAdmin().prepareState().setIndices("index-1").get().getState().metadata().version(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setIndices("index-1").get().getState().metadata().version(),
             greaterThanOrEqualTo(baselineVersion)
         );
         assertThat(
-            clusterAdmin().prepareState().setIndices("index-2").get().getState().metadata().version(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setIndices("index-2").get().getState().metadata().version(),
             greaterThanOrEqualTo(baselineVersion)
         );
         assertThat(
-            clusterAdmin().prepareState().setIndices("*").get().getState().metadata().version(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setIndices("*").get().getState().metadata().version(),
             greaterThanOrEqualTo(baselineVersion)
         );
         assertThat(
-            clusterAdmin().prepareState().setIndices("not-found").get().getState().metadata().version(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setIndices("not-found").get().getState().metadata().version(),
             greaterThanOrEqualTo(baselineVersion)
         );
-        assertThat(clusterAdmin().prepareState().clear().setMetadata(false).get().getState().metadata().version(), equalTo(0L));
+        assertThat(
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setMetadata(false).get().getState().metadata().version(),
+            equalTo(0L)
+        );
     }
 
     public void testIndexTemplates() throws Exception {
@@ -170,7 +179,7 @@ public void testIndexTemplates() throws Exception {
             )
             .get();
 
-        ClusterStateResponse clusterStateResponseUnfiltered = clusterAdmin().prepareState().get();
+        ClusterStateResponse clusterStateResponseUnfiltered = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(clusterStateResponseUnfiltered.getState().metadata().templates().size(), is(greaterThanOrEqualTo(2)));
 
         GetIndexTemplatesResponse getIndexTemplatesResponse = indicesAdmin().prepareGetTemplates("foo_template").get();
@@ -198,7 +207,7 @@ public void testThatFilteringByIndexWorksForMetadataAndRoutingTable() throws Exc
      * that the cluster state returns coherent data for both routing table and metadata.
      */
     private void testFilteringByIndexWorks(String[] indices, String[] expected) {
-        ClusterStateResponse clusterState = clusterAdmin().prepareState()
+        ClusterStateResponse clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setRoutingTable(true)
@@ -262,19 +271,23 @@ public void testLargeClusterStatePublishing() throws Exception {
     }
 
     public void testIndicesOptions() throws Exception {
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().clear().setMetadata(true).setIndices("f*").get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setMetadata(true)
+            .setIndices("f*")
+            .get();
         assertThat(clusterStateResponse.getState().metadata().indices().size(), is(2));
         ensureGreen("fuu");
 
         // close one index
         assertAcked(indicesAdmin().close(new CloseIndexRequest("fuu")).get());
-        clusterStateResponse = clusterAdmin().prepareState().clear().setMetadata(true).setIndices("f*").get();
+        clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setMetadata(true).setIndices("f*").get();
         assertThat(clusterStateResponse.getState().metadata().indices().size(), is(1));
         assertThat(clusterStateResponse.getState().metadata().index("foo").getState(), equalTo(IndexMetadata.State.OPEN));
 
         // expand_wildcards_closed should toggle return only closed index fuu
         IndicesOptions expandCloseOptions = IndicesOptions.fromOptions(false, true, false, true);
-        clusterStateResponse = clusterAdmin().prepareState()
+        clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices("f*")
@@ -285,7 +298,7 @@ public void testIndicesOptions() throws Exception {
 
         // ignore_unavailable set to true should not raise exception on fzzbzz
         IndicesOptions ignoreUnavailabe = IndicesOptions.fromOptions(true, true, true, false);
-        clusterStateResponse = clusterAdmin().prepareState()
+        clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices("fzzbzz")
@@ -296,7 +309,7 @@ public void testIndicesOptions() throws Exception {
         // empty wildcard expansion result should work when allowNoIndices is
         // turned on
         IndicesOptions allowNoIndices = IndicesOptions.fromOptions(false, true, true, false);
-        clusterStateResponse = clusterAdmin().prepareState()
+        clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices("a*")
@@ -309,7 +322,12 @@ public void testIndicesOptionsOnAllowNoIndicesFalse() throws Exception {
         // empty wildcard expansion throws exception when allowNoIndices is turned off
         IndicesOptions allowNoIndices = IndicesOptions.fromOptions(false, false, true, false);
         try {
-            clusterAdmin().prepareState().clear().setMetadata(true).setIndices("a*").setIndicesOptions(allowNoIndices).get();
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .clear()
+                .setMetadata(true)
+                .setIndices("a*")
+                .setIndicesOptions(allowNoIndices)
+                .get();
             fail("Expected IndexNotFoundException");
         } catch (IndexNotFoundException e) {
             assertThat(e.getMessage(), is("no such index [a*]"));
@@ -320,7 +338,12 @@ public void testIndicesIgnoreUnavailableFalse() throws Exception {
         // ignore_unavailable set to false throws exception when allowNoIndices is turned off
         IndicesOptions allowNoIndices = IndicesOptions.fromOptions(false, true, true, false);
         try {
-            clusterAdmin().prepareState().clear().setMetadata(true).setIndices("fzzbzz").setIndicesOptions(allowNoIndices).get();
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .clear()
+                .setMetadata(true)
+                .setIndices("fzzbzz")
+                .setIndicesOptions(allowNoIndices)
+                .get();
             fail("Expected IndexNotFoundException");
         } catch (IndexNotFoundException e) {
             assertThat(e.getMessage(), is("no such index [fzzbzz]"));
@@ -330,7 +353,7 @@ public void testIndicesIgnoreUnavailableFalse() throws Exception {
     public void testPrivateCustomsAreExcluded() throws Exception {
         // ensure that the custom is injected into the cluster state
         assertBusy(() -> assertTrue(clusterService().state().customs().containsKey("test")));
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().setCustoms(true).get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setCustoms(true).get();
         assertFalse(clusterStateResponse.getState().customs().containsKey("test"));
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleDataNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleDataNodesIT.java
index 8a239f7293e2..58daca22303c 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleDataNodesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleDataNodesIT.java
@@ -47,7 +47,12 @@ public void testIndexingBeforeAndAfterDataNodesStart() {
 
         internalCluster().startNode(nonDataNode());
         assertThat(
-            clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("2").setLocal(true).get().isTimedOut(),
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+                .setWaitForEvents(Priority.LANGUID)
+                .setWaitForNodes("2")
+                .setLocal(true)
+                .get()
+                .isTimedOut(),
             equalTo(false)
         );
 
@@ -62,7 +67,12 @@ public void testIndexingBeforeAndAfterDataNodesStart() {
         // now, start a node data, and see that it gets with shards
         internalCluster().startNode(dataNode());
         assertThat(
-            clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes("3").setLocal(true).get().isTimedOut(),
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+                .setWaitForEvents(Priority.LANGUID)
+                .setWaitForNodes("3")
+                .setLocal(true)
+                .get()
+                .isTimedOut(),
             equalTo(false)
         );
 
@@ -76,7 +86,9 @@ public void testShardsAllocatedAfterDataNodesStart() {
             new CreateIndexRequest("test").settings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0))
                 .waitForActiveShards(ActiveShardCount.NONE)
         ).actionGet();
-        final ClusterHealthResponse healthResponse1 = clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get();
+        final ClusterHealthResponse healthResponse1 = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForEvents(Priority.LANGUID)
+            .get();
         assertThat(healthResponse1.isTimedOut(), equalTo(false));
         assertThat(healthResponse1.getStatus(), equalTo(ClusterHealthStatus.RED));
         assertThat(healthResponse1.getActiveShards(), equalTo(0));
@@ -84,7 +96,7 @@ public void testShardsAllocatedAfterDataNodesStart() {
         internalCluster().startNode(dataNode());
 
         assertThat(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setWaitForNodes("2")
                 .setWaitForGreenStatus()
@@ -100,7 +112,9 @@ public void testAutoExpandReplicasAdjustedWhenDataNodeJoins() {
             new CreateIndexRequest("test").settings(Settings.builder().put(IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS, "0-all"))
                 .waitForActiveShards(ActiveShardCount.NONE)
         ).actionGet();
-        final ClusterHealthResponse healthResponse1 = clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get();
+        final ClusterHealthResponse healthResponse1 = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForEvents(Priority.LANGUID)
+            .get();
         assertThat(healthResponse1.isTimedOut(), equalTo(false));
         assertThat(healthResponse1.getStatus(), equalTo(ClusterHealthStatus.RED));
         assertThat(healthResponse1.getActiveShards(), equalTo(0));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java
index 538f5e7a1640..8cdc49d3b12d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java
@@ -37,7 +37,7 @@ public void testSimpleOnlyMasterNodeElection() throws IOException {
         internalCluster().startNode(Settings.builder().put(dataOnlyNode()).put("discovery.initial_state_timeout", "1s"));
         try {
             assertThat(
-                clusterAdmin().prepareState()
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                     .setMasterNodeTimeout(TimeValue.timeValueMillis(100))
                     .get()
                     .getState()
@@ -52,11 +52,27 @@ public void testSimpleOnlyMasterNodeElection() throws IOException {
         logger.info("--> start master node");
         final String masterNodeName = internalCluster().startMasterOnlyNode();
         assertThat(
-            internalCluster().nonMasterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().nonMasterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(masterNodeName)
         );
         assertThat(
-            internalCluster().masterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().masterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(masterNodeName)
         );
 
@@ -66,7 +82,7 @@ public void testSimpleOnlyMasterNodeElection() throws IOException {
 
         try {
             assertThat(
-                clusterAdmin().prepareState()
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                     .setMasterNodeTimeout(TimeValue.timeValueMillis(100))
                     .get()
                     .getState()
@@ -84,11 +100,27 @@ public void testSimpleOnlyMasterNodeElection() throws IOException {
             Settings.builder().put(nonDataNode(masterNode())).put(masterDataPathSettings)
         );
         assertThat(
-            internalCluster().nonMasterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().nonMasterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(nextMasterEligibleNodeName)
         );
         assertThat(
-            internalCluster().masterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().masterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(nextMasterEligibleNodeName)
         );
     }
@@ -99,7 +131,7 @@ public void testElectOnlyBetweenMasterNodes() throws Exception {
         internalCluster().startNode(Settings.builder().put(dataOnlyNode()).put("discovery.initial_state_timeout", "1s"));
         try {
             assertThat(
-                clusterAdmin().prepareState()
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                     .setMasterNodeTimeout(TimeValue.timeValueMillis(100))
                     .get()
                     .getState()
@@ -114,45 +146,112 @@ public void testElectOnlyBetweenMasterNodes() throws Exception {
         logger.info("--> start master node (1)");
         final String masterNodeName = internalCluster().startMasterOnlyNode();
         assertThat(
-            internalCluster().nonMasterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().nonMasterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(masterNodeName)
         );
         assertThat(
-            internalCluster().masterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().masterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(masterNodeName)
         );
 
         logger.info("--> start master node (2)");
         final String nextMasterEligableNodeName = internalCluster().startMasterOnlyNode();
         assertThat(
-            internalCluster().nonMasterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().nonMasterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(masterNodeName)
         );
         assertThat(
-            internalCluster().masterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().masterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(masterNodeName)
         );
 
         logger.info("--> closing master node (1)");
-        client().execute(TransportAddVotingConfigExclusionsAction.TYPE, new AddVotingConfigExclusionsRequest(masterNodeName)).get();
+        client().execute(
+            TransportAddVotingConfigExclusionsAction.TYPE,
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, masterNodeName)
+        ).get();
         // removing the master from the voting configuration immediately triggers the master to step down
         assertBusy(() -> {
             assertThat(
-                internalCluster().nonMasterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+                internalCluster().nonMasterClient()
+                    .admin()
+                    .cluster()
+                    .prepareState(TEST_REQUEST_TIMEOUT)
+                    .get()
+                    .getState()
+                    .nodes()
+                    .getMasterNode()
+                    .getName(),
                 equalTo(nextMasterEligableNodeName)
             );
             assertThat(
-                internalCluster().masterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+                internalCluster().masterClient()
+                    .admin()
+                    .cluster()
+                    .prepareState(TEST_REQUEST_TIMEOUT)
+                    .get()
+                    .getState()
+                    .nodes()
+                    .getMasterNode()
+                    .getName(),
                 equalTo(nextMasterEligableNodeName)
             );
         });
         internalCluster().stopNode(masterNodeName);
         assertThat(
-            internalCluster().nonMasterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().nonMasterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(nextMasterEligableNodeName)
         );
         assertThat(
-            internalCluster().masterClient().admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(),
+            internalCluster().masterClient()
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .nodes()
+                .getMasterNode()
+                .getName(),
             equalTo(nextMasterEligableNodeName)
         );
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java
index 64ac8318dce2..05b58ea2f880 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java
@@ -27,7 +27,7 @@ public void testUpdateSettingsValidation() throws Exception {
         createIndex("test");
         NumShards test = getNumShards("test");
 
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth("test")
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes("3")
             .setWaitForGreenStatus()
@@ -36,7 +36,10 @@ public void testUpdateSettingsValidation() throws Exception {
         assertThat(healthResponse.getIndices().get("test").getActiveShards(), equalTo(test.totalNumShards));
 
         setReplicaCount(0, "test");
-        healthResponse = clusterAdmin().prepareHealth("test").setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test")
+            .setWaitForEvents(Priority.LANGUID)
+            .setWaitForGreenStatus()
+            .get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
         assertThat(healthResponse.getIndices().get("test").getActiveShards(), equalTo(test.numPrimaries));
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java
index 71418cb83deb..36d903205f05 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java
@@ -71,7 +71,7 @@ public void testSimpleAwareness() throws Exception {
         // On slow machines the initial relocation might be delayed
         assertBusy(() -> {
             logger.info("--> waiting for no relocation");
-            ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth()
+            ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setIndices("test1", "test2")
                 .setWaitForEvents(Priority.LANGUID)
                 .setWaitForGreenStatus()
@@ -82,7 +82,7 @@ public void testSimpleAwareness() throws Exception {
             assertThat("Cluster health request timed out", clusterHealth.isTimedOut(), equalTo(false));
 
             logger.info("--> checking current state");
-            ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+            ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
             // check that closed indices are effectively closed
             final List<String> notClosedIndices = indicesToClose.stream()
@@ -115,7 +115,7 @@ public void testAwarenessZones() {
         String A_1 = nodes.get(3);
 
         logger.info("--> waiting for nodes to form a cluster");
-        ClusterHealthResponse health = clusterAdmin().prepareHealth().setWaitForNodes("4").get();
+        ClusterHealthResponse health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("4").get();
         assertThat(health.isTimedOut(), equalTo(false));
 
         createIndex("test", 5, 1);
@@ -125,7 +125,7 @@ public void testAwarenessZones() {
         }
 
         logger.info("--> waiting for shards to be allocated");
-        health = clusterAdmin().prepareHealth()
+        health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
@@ -133,7 +133,7 @@ public void testAwarenessZones() {
             .get();
         assertThat(health.isTimedOut(), equalTo(false));
 
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         Map<String, Integer> counts = computeShardCounts(clusterState);
 
         assertThat(counts.get(A_1), anyOf(equalTo(2), equalTo(3)));
@@ -162,7 +162,7 @@ public void testAwarenessZonesIncrementalNodes() {
             assertAcked(indicesAdmin().prepareClose("test"));
         }
 
-        ClusterHealthResponse health = clusterAdmin().prepareHealth()
+        ClusterHealthResponse health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
@@ -170,7 +170,7 @@ public void testAwarenessZonesIncrementalNodes() {
             .setWaitForNoRelocatingShards(true)
             .get();
         assertThat(health.isTimedOut(), equalTo(false));
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         Map<String, Integer> counts = computeShardCounts(clusterState);
 
         assertThat(counts.get(A_0), equalTo(5));
@@ -178,7 +178,7 @@ public void testAwarenessZonesIncrementalNodes() {
         logger.info("--> starting another node in zone 'b'");
 
         String B_1 = internalCluster().startNode(Settings.builder().put(commonSettings).put("node.attr.zone", "b").build());
-        health = clusterAdmin().prepareHealth()
+        health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
@@ -186,7 +186,7 @@ public void testAwarenessZonesIncrementalNodes() {
             .get();
         assertThat(health.isTimedOut(), equalTo(false));
         ClusterRerouteUtils.reroute(client());
-        health = clusterAdmin().prepareHealth()
+        health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
@@ -196,7 +196,7 @@ public void testAwarenessZonesIncrementalNodes() {
             .get();
 
         assertThat(health.isTimedOut(), equalTo(false));
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         counts = computeShardCounts(clusterState);
 
         assertThat(counts.get(A_0), equalTo(5));
@@ -204,7 +204,7 @@ public void testAwarenessZonesIncrementalNodes() {
         assertThat(counts.get(B_1), equalTo(2));
 
         String noZoneNode = internalCluster().startNode();
-        health = clusterAdmin().prepareHealth()
+        health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
@@ -212,7 +212,7 @@ public void testAwarenessZonesIncrementalNodes() {
             .get();
         assertThat(health.isTimedOut(), equalTo(false));
         ClusterRerouteUtils.reroute(client());
-        health = clusterAdmin().prepareHealth()
+        health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
@@ -222,7 +222,7 @@ public void testAwarenessZonesIncrementalNodes() {
             .get();
 
         assertThat(health.isTimedOut(), equalTo(false));
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         counts = computeShardCounts(clusterState);
 
         assertThat(counts.get(A_0), equalTo(5));
@@ -230,7 +230,7 @@ public void testAwarenessZonesIncrementalNodes() {
         assertThat(counts.get(B_1), equalTo(2));
         assertThat(counts.containsKey(noZoneNode), equalTo(false));
         updateClusterSettings(Settings.builder().put("cluster.routing.allocation.awareness.attributes", ""));
-        health = clusterAdmin().prepareHealth()
+        health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
@@ -240,7 +240,7 @@ public void testAwarenessZonesIncrementalNodes() {
             .get();
 
         assertThat(health.isTimedOut(), equalTo(false));
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         counts = computeShardCounts(clusterState);
 
         assertThat(counts.get(A_0), equalTo(3));
@@ -254,7 +254,8 @@ public void testForceAwarenessSettingValidation() {
 
         final IllegalArgumentException illegalArgumentException = expectThrows(
             IllegalArgumentException.class,
-            clusterAdmin().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(prefix + "nonsense", "foo"))
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(Settings.builder().put(prefix + "nonsense", "foo"))
         );
         assertThat(illegalArgumentException.getMessage(), containsString("[cluster.routing.allocation.awareness.force.]"));
         assertThat(illegalArgumentException.getCause(), instanceOf(SettingsException.class));
@@ -263,7 +264,8 @@ public void testForceAwarenessSettingValidation() {
         assertThat(
             expectThrows(
                 IllegalArgumentException.class,
-                clusterAdmin().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(prefix + "attr.not_values", "foo"))
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                    .setPersistentSettings(Settings.builder().put(prefix + "attr.not_values", "foo"))
             ).getMessage(),
             containsString("[cluster.routing.allocation.awareness.force.attr.not_values]")
         );
@@ -271,7 +273,8 @@ public void testForceAwarenessSettingValidation() {
         assertThat(
             expectThrows(
                 IllegalArgumentException.class,
-                clusterAdmin().prepareUpdateSettings().setPersistentSettings(Settings.builder().put(prefix + "attr.values.junk", "foo"))
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                    .setPersistentSettings(Settings.builder().put(prefix + "attr.values.junk", "foo"))
             ).getMessage(),
             containsString("[cluster.routing.allocation.awareness.force.attr.values.junk]")
         );
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java
index dc93aaa81401..da585d1bb67d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java
@@ -96,7 +96,7 @@ private void rerouteWithCommands(Settings commonSettings) throws Exception {
             indicesAdmin().prepareClose("test").setWaitForActiveShards(ActiveShardCount.NONE).get();
         }
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(2));
 
         logger.info("--> explicitly allocate shard 1, *under dry_run*");
@@ -115,7 +115,7 @@ private void rerouteWithCommands(Settings commonSettings) throws Exception {
         );
 
         logger.info("--> get the state, verify nothing changed because of the dry run");
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(2));
 
         logger.info("--> explicitly allocate shard 1, actually allocating, no dry run");
@@ -132,7 +132,7 @@ private void rerouteWithCommands(Settings commonSettings) throws Exception {
             equalTo(ShardRoutingState.INITIALIZING)
         );
 
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth()
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForYellowStatus()
@@ -140,7 +140,7 @@ private void rerouteWithCommands(Settings commonSettings) throws Exception {
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         logger.info("--> get the state, verify shard 1 primary allocated");
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(1));
         assertThat(
             state.getRoutingNodes().node(state.nodes().resolveNode(node_1).getId()).iterator().next().state(),
@@ -165,7 +165,7 @@ private void rerouteWithCommands(Settings commonSettings) throws Exception {
             equalTo(ShardRoutingState.INITIALIZING)
         );
 
-        healthResponse = clusterAdmin().prepareHealth()
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForYellowStatus()
@@ -174,7 +174,7 @@ private void rerouteWithCommands(Settings commonSettings) throws Exception {
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         logger.info("--> get the state, verify shard 1 primary moved from node1 to node2");
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(1));
         assertThat(
             state.getRoutingNodes().node(state.nodes().resolveNode(node_2).getId()).iterator().next().state(),
@@ -209,7 +209,7 @@ public void testDelayWithALargeAmountOfShards() throws Exception {
         internalCluster().startNode(commonSettings);
 
         assertThat(cluster().size(), equalTo(4));
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth().setWaitForNodes("4").get();
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("4").get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         logger.info("--> create indices");
@@ -239,7 +239,7 @@ private void rerouteWithAllocateLocalGateway(Settings commonSettings) throws Exc
         String node_1 = internalCluster().startNode(commonSettings);
         internalCluster().startNode(commonSettings);
         assertThat(cluster().size(), equalTo(2));
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth().setWaitForNodes("2").get();
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("2").get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         logger.info("--> create an index with 1 shard, 1 replica, nothing should allocate");
@@ -253,7 +253,7 @@ private void rerouteWithAllocateLocalGateway(Settings commonSettings) throws Exc
             indicesAdmin().prepareClose("test").setWaitForActiveShards(ActiveShardCount.NONE).get();
         }
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(2));
 
         logger.info("--> explicitly allocate shard 1, actually allocating, no dry run");
@@ -270,7 +270,7 @@ private void rerouteWithAllocateLocalGateway(Settings commonSettings) throws Exc
             equalTo(ShardRoutingState.INITIALIZING)
         );
 
-        healthResponse = clusterAdmin().prepareHealth()
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setIndices("test")
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForYellowStatus()
@@ -278,7 +278,7 @@ private void rerouteWithAllocateLocalGateway(Settings commonSettings) throws Exc
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         logger.info("--> get the state, verify shard 1 primary allocated");
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(1));
         assertThat(
             state.getRoutingNodes().node(state.nodes().resolveNode(node_1).getId()).iterator().next().state(),
@@ -306,7 +306,7 @@ private void rerouteWithAllocateLocalGateway(Settings commonSettings) throws Exc
         // TODO can we get around this? the cluster is RED, so what do we wait for?
         ClusterRerouteUtils.reroute(client());
         assertThat(
-            clusterAdmin().prepareHealth().setIndices("test").setWaitForNodes("2").get().getStatus(),
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setIndices("test").setWaitForNodes("2").get().getStatus(),
             equalTo(ClusterHealthStatus.RED)
         );
         logger.info("--> explicitly allocate primary");
@@ -326,7 +326,7 @@ private void rerouteWithAllocateLocalGateway(Settings commonSettings) throws Exc
         logger.info("--> get the state, verify shard 1 primary allocated");
         final String nodeToCheck = node_1;
         assertBusy(() -> {
-            ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+            ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             String nodeId = clusterState.nodes().resolveNode(nodeToCheck).getId();
             assertThat(clusterState.getRoutingNodes().node(nodeId).iterator().next().state(), equalTo(ShardRoutingState.STARTED));
         });
@@ -339,7 +339,7 @@ public void testRerouteExplain() {
         String node_1 = internalCluster().startNode(commonSettings);
 
         assertThat(cluster().size(), equalTo(1));
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth().setWaitForNodes("1").get();
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("1").get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         logger.info("--> create an index with 1 shard");
@@ -356,7 +356,7 @@ public void testRerouteExplain() {
         logger.info("--> starting a second node");
         String node_2 = internalCluster().startNode(commonSettings);
         assertThat(cluster().size(), equalTo(2));
-        healthResponse = clusterAdmin().prepareHealth().setWaitForNodes("2").get();
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("2").get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         logger.info("--> try to move the shard from node1 to node2");
@@ -385,12 +385,12 @@ public void testMessageLogging() {
 
         final String nodeName1 = internalCluster().startNode(settings);
         assertThat(cluster().size(), equalTo(1));
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth().setWaitForNodes("1").get();
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("1").get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         final String nodeName2 = internalCluster().startNode(settings);
         assertThat(cluster().size(), equalTo(2));
-        healthResponse = clusterAdmin().prepareHealth().setWaitForNodes("2").get();
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("2").get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         final String indexName = "test_index";
@@ -474,7 +474,7 @@ public void testClusterRerouteWithBlocks() {
         ensureGreen("test-blocks");
 
         logger.info("--> check that the index has 1 shard");
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<ShardRouting> shards = state.routingTable().allShards("test-blocks");
         assertThat(shards, hasSize(1));
 
@@ -504,7 +504,7 @@ public void testClusterRerouteWithBlocks() {
                     new MoveAllocationCommand("test-blocks", 0, nodesIds.get(toggle % 2), nodesIds.get(++toggle % 2))
                 );
 
-                ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth()
+                ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setIndices("test-blocks")
                     .setWaitForYellowStatus()
                     .setWaitForNoRelocatingShards(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java
index 5f54b32ab4a1..abce3ce30fba 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java
@@ -66,7 +66,7 @@ public void testDecommissionNodeNoReplicas() {
         ensureGreen("test");
 
         logger.info("--> verify all are allocated on node1 now");
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (IndexRoutingTable indexRoutingTable : clusterState.routingTable()) {
             for (int shardId = 0; shardId < indexRoutingTable.size(); shardId++) {
                 final IndexShardRoutingTable indexShardRoutingTable = indexRoutingTable.shard(shardId);
@@ -93,7 +93,7 @@ public void testAutoExpandReplicasToFilteredNodes() {
 
         logger.info("--> creating an index with auto-expand replicas");
         createIndex("test", Settings.builder().put(AutoExpandReplicas.SETTING.getKey(), "0-all").build());
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().index("test").getNumberOfReplicas(), equalTo(1));
         ensureGreen("test");
 
@@ -106,7 +106,7 @@ public void testAutoExpandReplicasToFilteredNodes() {
         ensureGreen("test");
 
         logger.info("--> verify all are allocated on node1 now");
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().index("test").getNumberOfReplicas(), equalTo(0));
         for (IndexRoutingTable indexRoutingTable : clusterState.routingTable()) {
             for (int shardId = 0; shardId < indexRoutingTable.size(); shardId++) {
@@ -142,7 +142,7 @@ public void testDisablingAllocationFiltering() {
             ensureGreen("test");
         }
 
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         IndexRoutingTable indexRoutingTable = clusterState.routingTable().index("test");
         int numShardsOnNode1 = 0;
         for (int shardId = 0; shardId < indexRoutingTable.size(); shardId++) {
@@ -165,7 +165,7 @@ public void testDisablingAllocationFiltering() {
         ensureGreen("test");
 
         logger.info("--> verify all shards are allocated on node_1 now");
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         indexRoutingTable = clusterState.routingTable().index("test");
         for (int shardId = 0; shardId < indexRoutingTable.size(); shardId++) {
             final IndexShardRoutingTable indexShardRoutingTable = indexRoutingTable.shard(shardId);
@@ -180,7 +180,7 @@ public void testDisablingAllocationFiltering() {
         ensureGreen("test");
 
         logger.info("--> verify that there are shards allocated on both nodes now");
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.routingTable().index("test").numberOfNodesShardsAreAllocatedOn(), equalTo(2));
     }
 
@@ -193,7 +193,7 @@ public void testInvalidIPFilterClusterSettings() {
         );
         IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
-            clusterAdmin().prepareUpdateSettings()
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setPersistentSettings(Settings.builder().put(filterSetting.getKey() + ipKey, "192.168.1.1."))
         );
         assertEquals("invalid IP address [192.168.1.1.] for [" + filterSetting.getKey() + ipKey + "]", e.getMessage());
@@ -221,12 +221,12 @@ public void testTransientSettingsStillApplied() {
             .build();
 
         logger.info("--> updating settings");
-        clusterAdmin().prepareUpdateSettings().setTransientSettings(exclude).get();
+        clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(exclude).get();
 
         logger.info("--> waiting for relocation");
         waitForRelocation(ClusterHealthStatus.GREEN);
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         for (ShardRouting shard : RoutingNodesHelper.shardsWithState(state.getRoutingNodes(), ShardRoutingState.STARTED)) {
             String node = state.getRoutingNodes().node(shard.currentNodeId()).node().getName();
@@ -243,12 +243,15 @@ public void testTransientSettingsStillApplied() {
         Settings other = Settings.builder().put("cluster.info.update.interval", "45s").build();
 
         logger.info("--> updating settings with random persistent setting");
-        clusterAdmin().prepareUpdateSettings().setPersistentSettings(other).setTransientSettings(exclude).get();
+        clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .setPersistentSettings(other)
+            .setTransientSettings(exclude)
+            .get();
 
         logger.info("--> waiting for relocation");
         waitForRelocation(ClusterHealthStatus.GREEN);
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         // The transient settings still exist in the state
         assertThat(state.metadata().transientSettings(), equalTo(exclude));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java
index f66430871c9d..6a3d2f2fe521 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java
@@ -33,7 +33,7 @@ public void testSaneAllocation() {
         }
         ensureGreen("test");
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(0));
         for (RoutingNode node : state.getRoutingNodes()) {
             if (node.isEmpty() == false) {
@@ -42,7 +42,7 @@ public void testSaneAllocation() {
         }
         setReplicaCount(0, "test");
         ensureGreen("test");
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(0));
         for (RoutingNode node : state.getRoutingNodes()) {
@@ -60,7 +60,7 @@ public void testSaneAllocation() {
 
         setReplicaCount(1, "test");
         ensureGreen("test");
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         assertThat(state.getRoutingNodes().unassigned().size(), equalTo(0));
         for (RoutingNode node : state.getRoutingNodes()) {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/InitialClusterStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/InitialClusterStateIT.java
index 97112b97cc13..eebd059ed13b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/InitialClusterStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/InitialClusterStateIT.java
@@ -33,7 +33,13 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
 
     private static void assertClusterUuid(boolean expectCommitted, String expectedValue) {
         for (String nodeName : internalCluster().getNodeNames()) {
-            final Metadata metadata = client(nodeName).admin().cluster().prepareState().setLocal(true).get().getState().metadata();
+            final Metadata metadata = client(nodeName).admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState()
+                .metadata();
             assertEquals(expectCommitted, metadata.clusterUUIDCommitted());
             assertEquals(expectedValue, metadata.clusterUUID());
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java
index a20865617933..bd12f570e136 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java
@@ -135,7 +135,7 @@ public void testDeleteCreateInOneBulk() throws Exception {
         final var dataNode = internalCluster().startDataOnlyNode();
         final var dataNodeClusterService = internalCluster().clusterService(dataNode);
 
-        assertFalse(clusterAdmin().prepareHealth().setWaitForNodes("2").get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("2").get().isTimedOut());
         prepareCreate("test").setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)).get();
         ensureGreen("test");
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RemoveCustomsCommandIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RemoveCustomsCommandIT.java
index 65484066ee9b..a9948367f278 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RemoveCustomsCommandIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RemoveCustomsCommandIT.java
@@ -46,7 +46,10 @@ public void testRemoveCustomsSuccessful() throws Exception {
         String node = internalCluster().startNode();
         createIndex("test");
         indicesAdmin().prepareDelete("test").get();
-        assertEquals(1, clusterAdmin().prepareState().get().getState().metadata().indexGraveyard().getTombstones().size());
+        assertEquals(
+            1,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().indexGraveyard().getTombstones().size()
+        );
         Settings dataPathSettings = internalCluster().dataPathSettings(node);
         ensureStableCluster(1);
         internalCluster().stopRandomDataNode();
@@ -64,7 +67,10 @@ public void testRemoveCustomsSuccessful() throws Exception {
         assertThat(terminal.getOutput(), containsString("index-graveyard"));
 
         internalCluster().startNode(dataPathSettings);
-        assertEquals(0, clusterAdmin().prepareState().get().getState().metadata().indexGraveyard().getTombstones().size());
+        assertEquals(
+            0,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().indexGraveyard().getTombstones().size()
+        );
     }
 
     public void testCustomDoesNotMatch() throws Exception {
@@ -72,7 +78,10 @@ public void testCustomDoesNotMatch() throws Exception {
         String node = internalCluster().startNode();
         createIndex("test");
         indicesAdmin().prepareDelete("test").get();
-        assertEquals(1, clusterAdmin().prepareState().get().getState().metadata().indexGraveyard().getTombstones().size());
+        assertEquals(
+            1,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().indexGraveyard().getTombstones().size()
+        );
         Settings dataPathSettings = internalCluster().dataPathSettings(node);
         ensureStableCluster(1);
         internalCluster().stopRandomDataNode();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RemoveSettingsCommandIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RemoveSettingsCommandIT.java
index 560ca3e8a548..527d8b0a62fe 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RemoveSettingsCommandIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RemoveSettingsCommandIT.java
@@ -58,7 +58,7 @@ public void testRemoveSettingsSuccessful() throws Exception {
             Settings.builder().put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.getKey(), false)
         );
         assertThat(
-            clusterAdmin().prepareState().get().getState().metadata().persistentSettings().keySet(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().persistentSettings().keySet(),
             contains(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.getKey())
         );
         Settings dataPathSettings = internalCluster().dataPathSettings(node);
@@ -84,7 +84,7 @@ public void testRemoveSettingsSuccessful() throws Exception {
 
         internalCluster().startNode(dataPathSettings);
         assertThat(
-            clusterAdmin().prepareState().get().getState().metadata().persistentSettings().keySet(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().persistentSettings().keySet(),
             not(contains(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.getKey()))
         );
     }
@@ -96,7 +96,7 @@ public void testSettingDoesNotMatch() throws Exception {
             Settings.builder().put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.getKey(), false)
         );
         assertThat(
-            clusterAdmin().prepareState().get().getState().metadata().persistentSettings().keySet(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().persistentSettings().keySet(),
             contains(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.getKey())
         );
         Settings dataPathSettings = internalCluster().dataPathSettings(node);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/UnsafeBootstrapAndDetachCommandIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/UnsafeBootstrapAndDetachCommandIT.java
index 00e171a7a132..2c1ca5866fa4 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/UnsafeBootstrapAndDetachCommandIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/UnsafeBootstrapAndDetachCommandIT.java
@@ -137,7 +137,7 @@ public void testBootstrapNotBootstrappedCluster() throws Exception {
                 .build()
         );
         assertBusy(() -> {
-            ClusterState state = clusterAdmin().prepareState().setLocal(true).get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
             assertTrue(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
         });
 
@@ -242,7 +242,13 @@ public void test3MasterNodes2Failed() throws Exception {
 
         logger.info("--> ensure NO_MASTER_BLOCK on data-only node");
         assertBusy(() -> {
-            ClusterState state = internalCluster().client(dataNode).admin().cluster().prepareState().setLocal(true).get().getState();
+            ClusterState state = internalCluster().client(dataNode)
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState();
             assertTrue(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
         });
 
@@ -288,7 +294,13 @@ public void test3MasterNodes2Failed() throws Exception {
 
         logger.info("--> ensure there is no NO_MASTER_BLOCK and unsafe-bootstrap is reflected in cluster state");
         assertBusy(() -> {
-            ClusterState state = internalCluster().client(dataNode2).admin().cluster().prepareState().setLocal(true).get().getState();
+            ClusterState state = internalCluster().client(dataNode2)
+                .admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState();
             assertFalse(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
             assertTrue(state.metadata().persistentSettings().getAsBoolean(UnsafeBootstrapMasterCommand.UNSAFE_BOOTSTRAP.getKey(), false));
         });
@@ -333,7 +345,13 @@ public void testNoInitialBootstrapAfterDetach() throws Exception {
                 .build()
         );
 
-        ClusterState state = internalCluster().client().admin().cluster().prepareState().setLocal(true).get().getState();
+        ClusterState state = internalCluster().client()
+            .admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .setLocal(true)
+            .get()
+            .getState();
         assertTrue(state.blocks().hasGlobalBlockWithId(NoMasterBlockService.NO_MASTER_BLOCK_ID));
 
         internalCluster().stopNode(node);
@@ -345,7 +363,7 @@ public void testCanRunUnsafeBootstrapAfterErroneousDetachWithoutLoosingMetadata(
         Settings masterNodeDataPathSettings = internalCluster().dataPathSettings(masterNode);
         updateClusterSettings(Settings.builder().put(INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey(), "1234kb"));
 
-        ClusterState state = internalCluster().client().admin().cluster().prepareState().get().getState();
+        ClusterState state = internalCluster().client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.metadata().persistentSettings().get(INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey()), equalTo("1234kb"));
 
         internalCluster().stopCurrentMasterNode();
@@ -359,7 +377,7 @@ public void testCanRunUnsafeBootstrapAfterErroneousDetachWithoutLoosingMetadata(
         internalCluster().startMasterOnlyNode(masterNodeDataPathSettings);
         ensureGreen();
 
-        state = internalCluster().client().admin().cluster().prepareState().get().getState();
+        state = internalCluster().client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.metadata().settings().get(INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey()), equalTo("1234kb"));
     }
 }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/VotingConfigurationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/VotingConfigurationIT.java
index b0cc81bf3481..6e21c3622ec4 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/VotingConfigurationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/VotingConfigurationIT.java
@@ -43,8 +43,11 @@ public void testAbdicateAfterVotingConfigExclusionAdded() throws ExecutionExcept
         final String originalMaster = internalCluster().getMasterName();
 
         logger.info("--> excluding master node {}", originalMaster);
-        client().execute(TransportAddVotingConfigExclusionsAction.TYPE, new AddVotingConfigExclusionsRequest(originalMaster)).get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get();
+        client().execute(
+            TransportAddVotingConfigExclusionsAction.TYPE,
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, originalMaster)
+        ).get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get();
         assertNotEquals(originalMaster, internalCluster().getMasterName());
     }
 
@@ -60,7 +63,7 @@ public void testElectsNodeNotInVotingConfiguration() throws Exception {
             internalCluster().client()
                 .admin()
                 .cluster()
-                .prepareHealth()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForNodes("4")
                 .setWaitForEvents(Priority.LANGUID)
                 .get()
@@ -71,7 +74,7 @@ public void testElectsNodeNotInVotingConfiguration() throws Exception {
         final ClusterState clusterState = internalCluster().client()
             .admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setNodes(true)
             .setMetadata(true)
@@ -111,7 +114,7 @@ public void testElectsNodeNotInVotingConfiguration() throws Exception {
             internalCluster().client()
                 .admin()
                 .cluster()
-                .prepareHealth()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForNodes("3")
                 .setWaitForEvents(Priority.LANGUID)
                 .get()
@@ -121,7 +124,7 @@ public void testElectsNodeNotInVotingConfiguration() throws Exception {
         final ClusterState newClusterState = internalCluster().client()
             .admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setNodes(true)
             .setMetadata(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/ZenDiscoveryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/ZenDiscoveryIT.java
index 9b117365777c..ea127a735291 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/ZenDiscoveryIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/ZenDiscoveryIT.java
@@ -35,7 +35,7 @@ public void testNoShardRelocationsOccurWhenElectedMasterNodeFails() throws Excep
         internalCluster().startNodes(2, masterNodeSettings);
         Settings dateNodeSettings = dataNode();
         internalCluster().startNodes(2, dateNodeSettings);
-        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes("4")
             .setWaitForNoRelocatingShards(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java
index 8cee57ee34b8..69923c787a05 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java
@@ -111,7 +111,7 @@ public void testFailedRecoveryOnAllocateStalePrimaryRequiresAnotherAllocateStale
 
         // allocation fails due to corruption marker
         assertBusy(() -> {
-            final ClusterState state = clusterAdmin().prepareState().get().getState();
+            final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             final ShardRouting shardRouting = state.routingTable().index(indexName).shard(shardId.id()).primaryShard();
             assertThat(shardRouting.state(), equalTo(ShardRoutingState.UNASSIGNED));
             assertThat(shardRouting.unassignedInfo().reason(), equalTo(UnassignedInfo.Reason.ALLOCATION_FAILED));
@@ -143,7 +143,9 @@ public void testFailedRecoveryOnAllocateStalePrimaryRequiresAnotherAllocateStale
     }
 
     public void checkHealthStatus(String indexName, ClusterHealthStatus healthStatus) {
-        final ClusterHealthStatus indexHealthStatus = clusterAdmin().health(new ClusterHealthRequest(indexName)).actionGet().getStatus();
+        final ClusterHealthStatus indexHealthStatus = clusterAdmin().health(new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, indexName))
+            .actionGet()
+            .getStatus();
         assertThat(indexHealthStatus, is(healthStatus));
     }
 
@@ -169,7 +171,7 @@ private Path getIndexPath(String nodeName, ShardId shardId) {
     }
 
     private Set<String> getAllocationIds(String indexName) {
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         return state.metadata().index(indexName).inSyncAllocationIds(0);
     }
 
@@ -181,7 +183,14 @@ private IndexSettings getIndexSettings(String indexName, String nodeName) {
 
     private String historyUUID(String node, String indexName) {
         final ShardStats[] shards = client(node).admin().indices().prepareStats(indexName).clear().get().getShards();
-        final String nodeId = client(node).admin().cluster().prepareState().get().getState().nodes().resolveNode(node).getId();
+        final String nodeId = client(node).admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .nodes()
+            .resolveNode(node)
+            .getId();
         assertThat(shards.length, greaterThan(0));
         final Set<String> historyUUIDs = Arrays.stream(shards)
             .filter(shard -> shard.getShardRouting().currentNodeId().equals(nodeId))
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java
index 543b0be8ae48..8a2f5d749ff2 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java
@@ -32,7 +32,7 @@ public void testNoDelayedTimeout() throws Exception {
         ensureGreen("test");
         indexRandomData();
         internalCluster().stopNode(findNodeWithShard());
-        assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(0));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(0));
         ensureGreen("test");
     }
 
@@ -53,9 +53,12 @@ public void testDelayedAllocationNodeLeavesAndComesBack() throws Exception {
         Settings nodeWithShardDataPathSettings = internalCluster().dataPathSettings(nodeWithShard);
         internalCluster().stopNode(nodeWithShard);
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareState().all().get().getState().getRoutingNodes().unassigned().size() > 0, equalTo(true))
+            () -> assertThat(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState().getRoutingNodes().unassigned().size() > 0,
+                equalTo(true)
+            )
         );
-        assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(1));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(1));
         internalCluster().startNode(nodeWithShardDataPathSettings); // this will use the same data location as the stopped node
         ensureGreen("test");
     }
@@ -97,16 +100,19 @@ public void testDelayedAllocationChangeWithSettingTo100ms() throws Exception {
         indexRandomData();
         internalCluster().stopNode(findNodeWithShard());
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareState().all().get().getState().getRoutingNodes().unassigned().size() > 0, equalTo(true))
+            () -> assertThat(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState().getRoutingNodes().unassigned().size() > 0,
+                equalTo(true)
+            )
         );
-        assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(1));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(1));
         logger.info("Setting shorter allocation delay");
         updateIndexSettings(
             Settings.builder().put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMillis(100)),
             "test"
         );
         ensureGreen("test");
-        assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(0));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(0));
     }
 
     /**
@@ -123,15 +129,18 @@ public void testDelayedAllocationChangeWithSettingTo0() throws Exception {
         indexRandomData();
         internalCluster().stopNode(findNodeWithShard());
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareState().all().get().getState().getRoutingNodes().unassigned().size() > 0, equalTo(true))
+            () -> assertThat(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState().getRoutingNodes().unassigned().size() > 0,
+                equalTo(true)
+            )
         );
-        assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(1));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(1));
         updateIndexSettings(
             Settings.builder().put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMillis(0)),
             "test"
         );
         ensureGreen("test");
-        assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(0));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(0));
     }
 
     private void indexRandomData() throws Exception {
@@ -147,7 +156,7 @@ private void indexRandomData() throws Exception {
     }
 
     private String findNodeWithShard() {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<ShardRouting> startedShards = RoutingNodesHelper.shardsWithState(state.getRoutingNodes(), ShardRoutingState.STARTED);
         return state.nodes().get(randomFrom(startedShards).currentNodeId()).getName();
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java
index d97063454920..9a13470eea25 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java
@@ -118,7 +118,7 @@ public void testBulkWeirdScenario() throws Exception {
     private Settings createStaleReplicaScenario(String master) throws Exception {
         prepareIndex("test").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get();
         refresh();
-        ClusterState state = clusterAdmin().prepareState().all().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState();
         List<ShardRouting> shards = state.routingTable().allShards("test");
         assertThat(shards.size(), equalTo(2));
 
@@ -164,7 +164,10 @@ private Settings createStaleReplicaScenario(String master) throws Exception {
         );
         // kick reroute a second time and check that all shards are unassigned
         ClusterRerouteUtils.reroute(client(master));
-        assertThat(client(master).admin().cluster().prepareState().get().getState().getRoutingNodes().unassigned().size(), equalTo(2));
+        assertThat(
+            client(master).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getRoutingNodes().unassigned().size(),
+            equalTo(2)
+        );
         return inSyncDataPathSettings;
     }
 
@@ -197,7 +200,7 @@ public void testFailedAllocationOfStalePrimaryToDataNodeWithNoData() throws Exce
         internalCluster().stopNode(dataNodeWithShardCopy);
         ensureStableCluster(1);
         assertThat(
-            clusterAdmin().prepareState()
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .get()
                 .getState()
                 .getRoutingTable()
@@ -223,11 +226,11 @@ public void testFailedAllocationOfStalePrimaryToDataNodeWithNoData() throws Exce
 
         logger.info("--> wait until shard is failed and becomes unassigned again");
         assertTrue(
-            clusterAdmin().prepareState().get().getState().toString(),
-            clusterAdmin().prepareState().get().getState().getRoutingTable().index("test").allPrimaryShardsUnassigned()
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().toString(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getRoutingTable().index("test").allPrimaryShardsUnassigned()
         );
         assertThat(
-            clusterAdmin().prepareState()
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .get()
                 .getState()
                 .getRoutingTable()
@@ -302,7 +305,14 @@ public void testForceStaleReplicaToBePromotedToPrimary() throws Exception {
             // search can throw an "all shards failed" exception. We will wait until the shard initialization has completed before
             // verifying the search hit count.
             assertBusy(
-                () -> assertTrue(clusterAdmin().prepareState().get().getState().routingTable().index(idxName).allPrimaryShardsActive())
+                () -> assertTrue(
+                    clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                        .get()
+                        .getState()
+                        .routingTable()
+                        .index(idxName)
+                        .allPrimaryShardsActive()
+                )
             );
         }
         ShardStats[] shardStats = indicesAdmin().prepareStats("test")
@@ -313,7 +323,7 @@ public void testForceStaleReplicaToBePromotedToPrimary() throws Exception {
             assertThat(shardStat.getCommitStats().getNumDocs(), equalTo(useStaleReplica ? 1 : 0));
         }
         // allocation id of old primary was cleaned from the in-sync set
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         assertEquals(
             Collections.singleton(state.routingTable().index(idxName).shard(0).primary.allocationId().getId()),
@@ -402,7 +412,15 @@ public void testForcePrimaryShardIfAllocationDecidersSayNoAfterIndexCreation() t
             .setSettings(indexSettings(1, 0).put("index.routing.allocation.exclude._name", node))
             .get();
 
-        assertThat(clusterAdmin().prepareState().get().getState().getRoutingTable().shardRoutingTable("test", 0).assignedShards(), empty());
+        assertThat(
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .getRoutingTable()
+                .shardRoutingTable("test", 0)
+                .assignedShards(),
+            empty()
+        );
 
         ClusterRerouteUtils.reroute(client(), new AllocateEmptyPrimaryAllocationCommand("test", 0, node, true));
         ensureGreen("test");
@@ -419,7 +437,10 @@ public void testDoNotRemoveAllocationIdOnNodeLeave() throws Exception {
         final Settings inSyncDataPathSettings = internalCluster().dataPathSettings(replicaNode);
         internalCluster().stopNode(replicaNode);
         ensureYellow("test");
-        assertEquals(2, clusterAdmin().prepareState().get().getState().metadata().index("test").inSyncAllocationIds(0).size());
+        assertEquals(
+            2,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").inSyncAllocationIds(0).size()
+        );
         internalCluster().restartRandomDataNode(new InternalTestCluster.RestartCallback() {
             @Override
             public boolean clearData(String nodeName) {
@@ -428,9 +449,19 @@ public boolean clearData(String nodeName) {
         });
         logger.info("--> wait until shard is failed and becomes unassigned again");
         assertBusy(
-            () -> assertTrue(clusterAdmin().prepareState().get().getState().getRoutingTable().index("test").allPrimaryShardsUnassigned())
+            () -> assertTrue(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                    .get()
+                    .getState()
+                    .getRoutingTable()
+                    .index("test")
+                    .allPrimaryShardsUnassigned()
+            )
+        );
+        assertEquals(
+            2,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").inSyncAllocationIds(0).size()
         );
-        assertEquals(2, clusterAdmin().prepareState().get().getState().metadata().index("test").inSyncAllocationIds(0).size());
 
         logger.info("--> starting node that reuses data folder with the up-to-date shard");
         internalCluster().startDataOnlyNode(inSyncDataPathSettings);
@@ -448,10 +479,16 @@ public void testRemoveAllocationIdOnWriteAfterNodeLeave() throws Exception {
         final Settings inSyncDataPathSettings = internalCluster().dataPathSettings(replicaNode);
         internalCluster().stopNode(replicaNode);
         ensureYellow("test");
-        assertEquals(2, clusterAdmin().prepareState().get().getState().metadata().index("test").inSyncAllocationIds(0).size());
+        assertEquals(
+            2,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").inSyncAllocationIds(0).size()
+        );
         logger.info("--> indexing...");
         prepareIndex("test").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get();
-        assertEquals(1, clusterAdmin().prepareState().get().getState().metadata().index("test").inSyncAllocationIds(0).size());
+        assertEquals(
+            1,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").inSyncAllocationIds(0).size()
+        );
         internalCluster().restartRandomDataNode(new InternalTestCluster.RestartCallback() {
             @Override
             public boolean clearData(String nodeName) {
@@ -460,14 +497,31 @@ public boolean clearData(String nodeName) {
         });
         logger.info("--> wait until shard is failed and becomes unassigned again");
         assertBusy(
-            () -> assertTrue(clusterAdmin().prepareState().get().getState().getRoutingTable().index("test").allPrimaryShardsUnassigned())
+            () -> assertTrue(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                    .get()
+                    .getState()
+                    .getRoutingTable()
+                    .index("test")
+                    .allPrimaryShardsUnassigned()
+            )
+        );
+        assertEquals(
+            1,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").inSyncAllocationIds(0).size()
         );
-        assertEquals(1, clusterAdmin().prepareState().get().getState().metadata().index("test").inSyncAllocationIds(0).size());
 
         logger.info("--> starting node that reuses data folder with the up-to-date shard");
         internalCluster().startDataOnlyNode(inSyncDataPathSettings);
         assertBusy(
-            () -> assertTrue(clusterAdmin().prepareState().get().getState().getRoutingTable().index("test").allPrimaryShardsUnassigned())
+            () -> assertTrue(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                    .get()
+                    .getState()
+                    .getRoutingTable()
+                    .index("test")
+                    .allPrimaryShardsUnassigned()
+            )
         );
     }
 
@@ -506,7 +560,13 @@ public void testForceAllocatePrimaryOnNoDecision() throws Exception {
         ensureGreen(indexName);
         assertEquals(
             1,
-            clusterAdmin().prepareState().get().getState().routingTable().index(indexName).shardsWithState(ShardRoutingState.STARTED).size()
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .routingTable()
+                .index(indexName)
+                .shardsWithState(ShardRoutingState.STARTED)
+                .size()
         );
     }
 
@@ -547,7 +607,7 @@ public void testPrimaryReplicaResyncFailed() throws Exception {
         internalCluster().stopNode(oldPrimary);
         // Checks that we fails replicas in one side but not mark them as stale.
         assertBusy(() -> {
-            ClusterState state = client(master).admin().cluster().prepareState().get().getState();
+            ClusterState state = client(master).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             final IndexShardRoutingTable shardRoutingTable = state.routingTable().shardRoutingTable(shardId);
             final String newPrimaryNode = state.getRoutingNodes().node(shardRoutingTable.primary.currentNodeId()).node().getName();
             assertThat(newPrimaryNode, not(equalTo(oldPrimary)));
@@ -563,7 +623,7 @@ public void testPrimaryReplicaResyncFailed() throws Exception {
         partition.ensureHealthy(internalCluster());
         logger.info("--> stop disrupting network and re-enable allocation");
         assertBusy(() -> {
-            ClusterState state = client(master).admin().cluster().prepareState().get().getState();
+            ClusterState state = client(master).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertThat(state.routingTable().shardRoutingTable(shardId).activeShards(), hasSize(numberOfReplicas));
             assertThat(state.metadata().index("test").inSyncAllocationIds(shardId.id()), hasSize(numberOfReplicas + 1));
             for (String node : replicaNodes) {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/RemoveReplicaPriorityIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/RemoveReplicaPriorityIT.java
index 57c4c0986a79..de61c6cf566c 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/RemoveReplicaPriorityIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/RemoveReplicaPriorityIT.java
@@ -52,7 +52,7 @@ public void testReplicaRemovalPriority() throws Exception {
             });
         }
 
-        final String dataNodeIdFilter = clusterAdmin().prepareState()
+        final String dataNodeIdFilter = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setNodes(true)
             .get()
@@ -74,7 +74,7 @@ public void testReplicaRemovalPriority() throws Exception {
         );
 
         assertBusy(() -> {
-            final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState()
+            final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setRoutingTable(true)
                 .get()
@@ -90,7 +90,7 @@ public void testReplicaRemovalPriority() throws Exception {
         updateIndexSettings(Settings.builder().putNull(IndexMetadata.INDEX_ROUTING_EXCLUDE_GROUP_PREFIX + "._id"), INDEX_NAME);
 
         assertBusy(() -> {
-            final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState()
+            final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setRoutingTable(true)
                 .get()
@@ -107,7 +107,7 @@ public void testReplicaRemovalPriority() throws Exception {
             setReplicaCount(2, INDEX_NAME);
 
             assertBusy(() -> {
-                final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState()
+                final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                     .clear()
                     .setRoutingTable(true)
                     .get()
@@ -125,7 +125,7 @@ public void testReplicaRemovalPriority() throws Exception {
             setReplicaCount(1, INDEX_NAME);
 
             assertBusy(() -> {
-                final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState()
+                final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                     .clear()
                     .setRoutingTable(true)
                     .get()
@@ -143,7 +143,7 @@ public void testReplicaRemovalPriority() throws Exception {
             setReplicaCount(0, INDEX_NAME);
 
             assertBusy(() -> {
-                final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState()
+                final IndexShardRoutingTable indexShardRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                     .clear()
                     .setRoutingTable(true)
                     .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java
index 85a04ee6f185..556836736a9f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java
@@ -296,7 +296,7 @@ public void testShardCreation() throws Exception {
 
             createIndex(INDEX_NAME, routingTableWatcher.getIndexSettings());
 
-            final var clusterState = clusterAdmin().prepareState().clear().setRoutingTable(true).get().getState();
+            final var clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setRoutingTable(true).get().getState();
 
             // verify non-DEFAULT roles reported in cluster state XContent
             assertRolesInRoutingTableXContent(clusterState);
@@ -440,7 +440,7 @@ public void testPromotion() {
 
     @Nullable
     public AllocationCommand getCancelPrimaryCommand() {
-        final var indexRoutingTable = clusterAdmin().prepareState()
+        final var indexRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setRoutingTable(true)
             .get()
@@ -488,7 +488,7 @@ public void testSearchRouting() throws Exception {
             assertEngineTypes();
 
             final var searchShardProfileKeys = new HashSet<String>();
-            final var indexRoutingTable = clusterAdmin().prepareState()
+            final var indexRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setRoutingTable(true)
                 .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/AllocationFailuresResetIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/AllocationFailuresResetIT.java
index 671c308f98fb..6b97a8b6f3ad 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/AllocationFailuresResetIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/AllocationFailuresResetIT.java
@@ -48,7 +48,7 @@ private void removeAllocationFailuresInjection(String node) {
     private void awaitShardAllocMaxRetries() throws Exception {
         var maxRetries = MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY.get(internalCluster().getDefaultSettings());
         assertBusy(() -> {
-            var state = clusterAdmin().prepareState().get().getState();
+            var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             var index = state.getRoutingTable().index(INDEX);
             assertNotNull(index);
             var shard = index.shard(SHARD).primaryShard();
@@ -61,7 +61,7 @@ private void awaitShardAllocMaxRetries() throws Exception {
 
     private void awaitShardAllocSucceed() throws Exception {
         assertBusy(() -> {
-            var state = clusterAdmin().prepareState().get().getState();
+            var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             var index = state.getRoutingTable().index(INDEX);
             assertNotNull(index);
             var shard = index.shard(SHARD).primaryShard();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java
index eb62ad5e6eec..5509f46786a8 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java
@@ -86,7 +86,7 @@ public void testFloodStageExceeded() throws Exception {
         final String newDataNodeName = internalCluster().startDataOnlyNode();
         final String newDataNodeId = clusterAdmin().prepareNodesInfo(newDataNodeName).get().getNodes().get(0).getNode().getId();
         assertBusy(() -> {
-            final ShardRouting primaryShard = clusterAdmin().prepareState()
+            final ShardRouting primaryShard = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setRoutingTable(true)
                 .setNodes(true)
@@ -103,7 +103,7 @@ public void testFloodStageExceeded() throws Exception {
 
         // Verify that the block is removed once the shard migration is complete
         refreshClusterInfo();
-        assertFalse(clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get().isTimedOut());
         assertNull(getIndexBlock(indexName, IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE));
     }
 
@@ -135,7 +135,7 @@ public void testRemoveExistingIndexBlocksWhenDiskThresholdMonitorIsDisabled() th
 
         // Verify that the block is removed
         refreshClusterInfo();
-        assertFalse(clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get().isTimedOut());
         assertNull(getIndexBlock(indexName, IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE));
 
         // Re-enable and the blocks should be back!
@@ -143,7 +143,7 @@ public void testRemoveExistingIndexBlocksWhenDiskThresholdMonitorIsDisabled() th
             Settings.builder().put(DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED_SETTING.getKey(), true)
         );
         refreshClusterInfo();
-        assertFalse(clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get().isTimedOut());
         assertThat(getIndexBlock(indexName, IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE), equalTo("true"));
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java
index e3b6f2ddba4c..2f4b3588cf56 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java
@@ -28,7 +28,7 @@ public void testPrimaryFailureIncreasesTerm() throws Exception {
         logger.info("--> disabling allocation to capture shard failure");
         disableAllocation("test");
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final int shard = randomBoolean() ? 0 : 1;
         final String nodeId = state.routingTable().index("test").shard(shard).primaryShard().currentNodeId();
         final String node = state.nodes().get(nodeId).getName();
@@ -38,7 +38,12 @@ public void testPrimaryFailureIncreasesTerm() throws Exception {
 
         logger.info("--> waiting for a yellow index");
         // we can't use ensureYellow since that one is just as happy with a GREEN status.
-        assertBusy(() -> assertThat(clusterAdmin().prepareHealth("test").get().getStatus(), equalTo(ClusterHealthStatus.YELLOW)));
+        assertBusy(
+            () -> assertThat(
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test").get().getStatus(),
+                equalTo(ClusterHealthStatus.YELLOW)
+            )
+        );
 
         final long term0 = shard == 0 ? 2 : 1;
         final long term1 = shard == 1 ? 2 : 1;
@@ -53,7 +58,7 @@ public void testPrimaryFailureIncreasesTerm() throws Exception {
     protected void assertPrimaryTerms(long shard0Term, long shard1Term) {
         for (String node : internalCluster().getNodeNames()) {
             logger.debug("--> asserting primary terms terms on [{}]", node);
-            ClusterState state = client(node).admin().cluster().prepareState().setLocal(true).get().getState();
+            ClusterState state = client(node).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
             IndexMetadata metadata = state.metadata().index("test");
             assertThat(metadata.primaryTerm(0), equalTo(shard0Term));
             assertThat(metadata.primaryTerm(1), equalTo(shard1Term));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java
index a1a29468cc5b..106fd9530c3a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java
@@ -231,7 +231,7 @@ public void testRestoreSnapshotAllocationDoesNotExceedWatermarkWithMultipleShard
 
     private Set<ShardId> getShardIds(final String nodeId, final String indexName) {
         final Set<ShardId> shardIds = new HashSet<>();
-        final IndexRoutingTable indexRoutingTable = clusterAdmin().prepareState()
+        final IndexRoutingTable indexRoutingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setRoutingTable(true)
             .get()
@@ -319,7 +319,7 @@ private void refreshDiskUsage() {
         }
 
         assertFalse(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setWaitForNoRelocatingShards(true)
                 .setWaitForNoInitializingShards(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java
index 7464f83cb281..fd7e9f8fb357 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java
@@ -75,7 +75,7 @@ public void testRerouteOccursOnDiskPassingHighWatermark() throws Exception {
             internalCluster().startNode(Settings.builder().put(Environment.PATH_DATA_SETTING.getKey(), createTempDir()));
         }
 
-        final List<String> nodeIds = clusterAdmin().prepareState()
+        final List<String> nodeIds = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .getRoutingNodes()
@@ -153,7 +153,7 @@ public void testAutomaticReleaseOfIndexBlock() throws Exception {
             internalCluster().startNode(Settings.builder().put(Environment.PATH_DATA_SETTING.getKey(), createTempDir()));
         }
 
-        final List<String> nodeIds = clusterAdmin().prepareState()
+        final List<String> nodeIds = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .getRoutingNodes()
@@ -211,7 +211,7 @@ public void testAutomaticReleaseOfIndexBlock() throws Exception {
             () -> assertBlocked(prepareIndex("test").setId("1").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK)
         );
 
-        assertFalse(clusterAdmin().prepareHealth("test").setWaitForEvents(Priority.LANGUID).get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test").setWaitForEvents(Priority.LANGUID).get().isTimedOut());
 
         // Cannot add further documents
         assertBlocked(prepareIndex("test").setId("2").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK);
@@ -261,7 +261,7 @@ public void testOnlyMovesEnoughShardsToDropBelowHighWatermark() throws Exception
                 .put(CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING.getKey(), "0ms")
         );
 
-        final List<String> nodeIds = clusterAdmin().prepareState()
+        final List<String> nodeIds = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .getRoutingNodes()
@@ -318,7 +318,7 @@ public void testDoesNotExceedLowWatermarkWhenRebalancing() throws Exception {
 
         final MockInternalClusterInfoService clusterInfoService = getMockInternalClusterInfoService();
 
-        final List<String> nodeIds = clusterAdmin().prepareState()
+        final List<String> nodeIds = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .getRoutingNodes()
@@ -414,7 +414,7 @@ public void testMovesShardsOffSpecificDataPathAboveWatermark() throws Exception
                 .put(CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING.getKey(), "0ms")
         );
 
-        final List<String> nodeIds = clusterAdmin().prepareState()
+        final List<String> nodeIds = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .getRoutingNodes()
@@ -483,7 +483,7 @@ public void testMovesShardsOffSpecificDataPathAboveWatermark() throws Exception
 
     private Map<String, Integer> getShardCountByNodeId() {
         final Map<String, Integer> shardCountByNodeId = new HashMap<>();
-        final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (final RoutingNode node : clusterState.getRoutingNodes()) {
             logger.info(
                 "----> node {} has {} shards",
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java
index 921ed3265f1b..be530f0bd4cb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java
@@ -100,7 +100,7 @@ public void testUpdateSameHostSetting() {
         updateClusterSettings(Settings.builder().put(CLUSTER_ROUTING_ALLOCATION_SAME_HOST_SETTING.getKey(), true));
         final String indexName = "idx";
         createIndex(indexName, 1, 1);
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertFalse(
             "replica should be unassigned",
             clusterState.getRoutingTable().index(indexName).shardsWithState(ShardRoutingState.UNASSIGNED).isEmpty()
@@ -109,7 +109,7 @@ public void testUpdateSameHostSetting() {
         // the same host - the replica should get assigned
         updateClusterSettings(Settings.builder().put(CLUSTER_ROUTING_ALLOCATION_SAME_HOST_SETTING.getKey(), false));
 
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertTrue(
             "all shards should be assigned",
             clusterState.getRoutingTable().index(indexName).shardsWithState(ShardRoutingState.UNASSIGNED).isEmpty()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java
index a142d594fe06..a9767cce318d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java
@@ -43,7 +43,7 @@ public class ClusterSettingsIT extends ESIntegTestCase {
     @After
     public void cleanup() throws Exception {
         assertAcked(
-            clusterAdmin().prepareUpdateSettings()
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setPersistentSettings(Settings.builder().putNull("*"))
                 .setTransientSettings(Settings.builder().putNull("*"))
         );
@@ -64,7 +64,7 @@ private void testClusterNonExistingSettingsUpdate(
         String key1 = "no_idea_what_you_are_talking_about";
         int value1 = 10;
         try {
-            ClusterUpdateSettingsRequestBuilder builder = clusterAdmin().prepareUpdateSettings();
+            ClusterUpdateSettingsRequestBuilder builder = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
             consumer.accept(Settings.builder().put(key1, value1), builder);
 
             builder.get();
@@ -95,7 +95,7 @@ private void testDeleteIsAppliedFirst(
         final Setting<Integer> INITIAL_RECOVERIES = CLUSTER_ROUTING_ALLOCATION_NODE_INITIAL_PRIMARIES_RECOVERIES_SETTING;
         final Setting<TimeValue> REROUTE_INTERVAL = CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING;
 
-        ClusterUpdateSettingsRequestBuilder builder = clusterAdmin().prepareUpdateSettings();
+        ClusterUpdateSettingsRequestBuilder builder = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         consumer.accept(Settings.builder().put(INITIAL_RECOVERIES.getKey(), 7).put(REROUTE_INTERVAL.getKey(), "42s"), builder);
 
         ClusterUpdateSettingsResponse response = builder.get();
@@ -106,7 +106,7 @@ private void testDeleteIsAppliedFirst(
         assertThat(REROUTE_INTERVAL.get(settingsFunction.apply(response)), equalTo(TimeValue.timeValueSeconds(42)));
         assertThat(clusterService().getClusterSettings().get(REROUTE_INTERVAL), equalTo(TimeValue.timeValueSeconds(42)));
 
-        ClusterUpdateSettingsRequestBuilder undoBuilder = clusterAdmin().prepareUpdateSettings();
+        ClusterUpdateSettingsRequestBuilder undoBuilder = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         consumer.accept(
             Settings.builder().putNull((randomBoolean() ? "cluster.routing.*" : "*")).put(REROUTE_INTERVAL.getKey(), "43s"),
             undoBuilder
@@ -124,7 +124,7 @@ public void testResetClusterTransientSetting() {
         final Setting<Integer> INITIAL_RECOVERIES = CLUSTER_ROUTING_ALLOCATION_NODE_INITIAL_PRIMARIES_RECOVERIES_SETTING;
         final Setting<TimeValue> REROUTE_INTERVAL = CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING;
 
-        ClusterUpdateSettingsResponse response = clusterAdmin().prepareUpdateSettings()
+        ClusterUpdateSettingsResponse response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(Settings.builder().put(INITIAL_RECOVERIES.getKey(), 7).build())
             .get();
 
@@ -132,7 +132,7 @@ public void testResetClusterTransientSetting() {
         assertThat(INITIAL_RECOVERIES.get(response.getTransientSettings()), equalTo(7));
         assertThat(clusterService().getClusterSettings().get(INITIAL_RECOVERIES), equalTo(7));
 
-        response = clusterAdmin().prepareUpdateSettings()
+        response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(Settings.builder().putNull(INITIAL_RECOVERIES.getKey()))
             .get();
 
@@ -140,7 +140,7 @@ public void testResetClusterTransientSetting() {
         assertNull(response.getTransientSettings().get(INITIAL_RECOVERIES.getKey()));
         assertThat(clusterService().getClusterSettings().get(INITIAL_RECOVERIES), equalTo(INITIAL_RECOVERIES.get(Settings.EMPTY)));
 
-        response = clusterAdmin().prepareUpdateSettings()
+        response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(Settings.builder().put(INITIAL_RECOVERIES.getKey(), 8).put(REROUTE_INTERVAL.getKey(), "43s").build())
             .get();
 
@@ -149,7 +149,7 @@ public void testResetClusterTransientSetting() {
         assertThat(clusterService().getClusterSettings().get(INITIAL_RECOVERIES), equalTo(8));
         assertThat(REROUTE_INTERVAL.get(response.getTransientSettings()), equalTo(TimeValue.timeValueSeconds(43)));
         assertThat(clusterService().getClusterSettings().get(REROUTE_INTERVAL), equalTo(TimeValue.timeValueSeconds(43)));
-        response = clusterAdmin().prepareUpdateSettings()
+        response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(Settings.builder().putNull((randomBoolean() ? "cluster.routing.*" : "*")))
             .get();
 
@@ -164,7 +164,7 @@ public void testResetClusterPersistentSetting() {
         final Setting<Integer> INITIAL_RECOVERIES = CLUSTER_ROUTING_ALLOCATION_NODE_INITIAL_PRIMARIES_RECOVERIES_SETTING;
         final Setting<TimeValue> REROUTE_INTERVAL = CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING;
 
-        ClusterUpdateSettingsResponse response = clusterAdmin().prepareUpdateSettings()
+        ClusterUpdateSettingsResponse response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().put(INITIAL_RECOVERIES.getKey(), 9).build())
             .get();
 
@@ -172,7 +172,7 @@ public void testResetClusterPersistentSetting() {
         assertThat(INITIAL_RECOVERIES.get(response.getPersistentSettings()), equalTo(9));
         assertThat(clusterService().getClusterSettings().get(INITIAL_RECOVERIES), equalTo(9));
 
-        response = clusterAdmin().prepareUpdateSettings()
+        response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().putNull(INITIAL_RECOVERIES.getKey()))
             .get();
 
@@ -180,7 +180,7 @@ public void testResetClusterPersistentSetting() {
         assertThat(INITIAL_RECOVERIES.get(response.getPersistentSettings()), equalTo(INITIAL_RECOVERIES.get(Settings.EMPTY)));
         assertThat(clusterService().getClusterSettings().get(INITIAL_RECOVERIES), equalTo(INITIAL_RECOVERIES.get(Settings.EMPTY)));
 
-        response = clusterAdmin().prepareUpdateSettings()
+        response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().put(INITIAL_RECOVERIES.getKey(), 10).put(REROUTE_INTERVAL.getKey(), "44s").build())
             .get();
 
@@ -189,7 +189,7 @@ public void testResetClusterPersistentSetting() {
         assertThat(clusterService().getClusterSettings().get(INITIAL_RECOVERIES), equalTo(10));
         assertThat(REROUTE_INTERVAL.get(response.getPersistentSettings()), equalTo(TimeValue.timeValueSeconds(44)));
         assertThat(clusterService().getClusterSettings().get(REROUTE_INTERVAL), equalTo(TimeValue.timeValueSeconds(44)));
-        response = clusterAdmin().prepareUpdateSettings()
+        response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().putNull((randomBoolean() ? "cluster.routing.*" : "*")))
             .get();
 
@@ -209,7 +209,7 @@ public void testClusterSettingsUpdateResponse() {
         Settings transientSettings1 = Settings.builder().put(key1, value1, ByteSizeUnit.BYTES).build();
         Settings persistentSettings1 = Settings.builder().put(key2, value2).build();
 
-        ClusterUpdateSettingsResponse response1 = clusterAdmin().prepareUpdateSettings()
+        ClusterUpdateSettingsResponse response1 = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(transientSettings1)
             .setPersistentSettings(persistentSettings1)
             .get();
@@ -223,7 +223,7 @@ public void testClusterSettingsUpdateResponse() {
         Settings transientSettings2 = Settings.builder().put(key1, value1, ByteSizeUnit.BYTES).put(key2, value2).build();
         Settings persistentSettings2 = Settings.EMPTY;
 
-        ClusterUpdateSettingsResponse response2 = clusterAdmin().prepareUpdateSettings()
+        ClusterUpdateSettingsResponse response2 = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(transientSettings2)
             .setPersistentSettings(persistentSettings2)
             .get();
@@ -237,7 +237,7 @@ public void testClusterSettingsUpdateResponse() {
         Settings transientSettings3 = Settings.EMPTY;
         Settings persistentSettings3 = Settings.builder().put(key1, value1, ByteSizeUnit.BYTES).put(key2, value2).build();
 
-        ClusterUpdateSettingsResponse response3 = clusterAdmin().prepareUpdateSettings()
+        ClusterUpdateSettingsResponse response3 = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(transientSettings3)
             .setPersistentSettings(persistentSettings3)
             .get();
@@ -267,7 +267,7 @@ private void testCanUpdateTracerSettings(
         final BiConsumer<Settings.Builder, ClusterUpdateSettingsRequestBuilder> consumer,
         final Function<ClusterUpdateSettingsResponse, Settings> settingsFunction
     ) {
-        ClusterUpdateSettingsRequestBuilder builder = clusterAdmin().prepareUpdateSettings();
+        ClusterUpdateSettingsRequestBuilder builder = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         consumer.accept(
             Settings.builder().putList("transport.tracer.include", "internal:index/shard/recovery/*", "internal:gateway/local*"),
             builder
@@ -300,7 +300,10 @@ private void testUpdateSettings(
     ) {
         final Setting<Integer> INITIAL_RECOVERIES = CLUSTER_ROUTING_ALLOCATION_NODE_INITIAL_PRIMARIES_RECOVERIES_SETTING;
 
-        ClusterUpdateSettingsRequestBuilder initialBuilder = clusterAdmin().prepareUpdateSettings();
+        ClusterUpdateSettingsRequestBuilder initialBuilder = clusterAdmin().prepareUpdateSettings(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT
+        );
         consumer.accept(Settings.builder().put(INITIAL_RECOVERIES.getKey(), 42), initialBuilder);
 
         ClusterUpdateSettingsResponse response = initialBuilder.get();
@@ -310,7 +313,10 @@ private void testUpdateSettings(
         assertThat(clusterService().getClusterSettings().get(INITIAL_RECOVERIES), equalTo(42));
 
         try {
-            ClusterUpdateSettingsRequestBuilder badBuilder = clusterAdmin().prepareUpdateSettings();
+            ClusterUpdateSettingsRequestBuilder badBuilder = clusterAdmin().prepareUpdateSettings(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             consumer.accept(Settings.builder().put(INITIAL_RECOVERIES.getKey(), "whatever"), badBuilder);
             badBuilder.get();
             fail("bogus value");
@@ -321,7 +327,10 @@ private void testUpdateSettings(
         assertThat(clusterService().getClusterSettings().get(INITIAL_RECOVERIES), equalTo(42));
 
         try {
-            ClusterUpdateSettingsRequestBuilder badBuilder = clusterAdmin().prepareUpdateSettings();
+            ClusterUpdateSettingsRequestBuilder badBuilder = clusterAdmin().prepareUpdateSettings(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             consumer.accept(Settings.builder().put(INITIAL_RECOVERIES.getKey(), -1), badBuilder);
             badBuilder.get();
             fail("bogus value");
@@ -346,9 +355,13 @@ private void testRemoveArchiveSettingsWithBlocks(boolean readOnly, boolean readO
         if (readOnlyAllowDelete) {
             settingsBuilder.put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), "true");
         }
-        assertAcked(clusterAdmin().prepareUpdateSettings().setPersistentSettings(settingsBuilder).setTransientSettings(settingsBuilder));
+        assertAcked(
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(settingsBuilder)
+                .setTransientSettings(settingsBuilder)
+        );
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         if (readOnly) {
             assertTrue(Metadata.SETTING_READ_ONLY_SETTING.get(state.getMetadata().transientSettings()));
             assertTrue(Metadata.SETTING_READ_ONLY_SETTING.get(state.getMetadata().persistentSettings()));
@@ -365,7 +378,7 @@ private void testRemoveArchiveSettingsWithBlocks(boolean readOnly, boolean readO
             .build();
         restartNodesOnBrokenClusterState(ClusterState.builder(state).metadata(brokenMeta));
         ensureGreen(); // wait for state recovery
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertTrue(state.getMetadata().persistentSettings().getAsBoolean("archived.this.is.unknown", false));
 
         // cannot remove read only block due to archived settings
@@ -375,7 +388,9 @@ private void testRemoveArchiveSettingsWithBlocks(boolean readOnly, boolean readO
             clearOrSetFalse(builder, readOnlyAllowDelete, Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING);
             final IllegalArgumentException e1 = expectThrows(
                 IllegalArgumentException.class,
-                clusterAdmin().prepareUpdateSettings().setPersistentSettings(builder).setTransientSettings(builder)
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                    .setPersistentSettings(builder)
+                    .setTransientSettings(builder)
             );
             assertTrue(e1.getMessage().contains("unknown setting [archived.this.is.unknown]"));
         }
@@ -383,7 +398,7 @@ private void testRemoveArchiveSettingsWithBlocks(boolean readOnly, boolean readO
         // fail to clear archived settings with non-archived settings
         final ClusterBlockException e2 = expectThrows(
             ClusterBlockException.class,
-            clusterAdmin().prepareUpdateSettings()
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setPersistentSettings(Settings.builder().putNull("cluster.routing.allocation.enable"))
                 .setTransientSettings(Settings.builder().putNull("archived.*"))
         );
@@ -397,7 +412,8 @@ private void testRemoveArchiveSettingsWithBlocks(boolean readOnly, boolean readO
         // fail to clear archived settings due to cluster read only block
         final ClusterBlockException e3 = expectThrows(
             ClusterBlockException.class,
-            clusterAdmin().prepareUpdateSettings().setPersistentSettings(Settings.builder().putNull("archived.*"))
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(Settings.builder().putNull("archived.*"))
         );
         if (readOnly) {
             assertTrue(e3.getMessage().contains("cluster read-only (api)"));
@@ -419,7 +435,7 @@ private void testRemoveArchiveSettingsWithBlocks(boolean readOnly, boolean readO
             }
             final ClusterBlockException e4 = expectThrows(
                 ClusterBlockException.class,
-                clusterAdmin().prepareUpdateSettings().setPersistentSettings(builder)
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setPersistentSettings(builder)
             );
             if (readOnly) {
                 assertTrue(e4.getMessage().contains("cluster read-only (api)"));
@@ -436,7 +452,7 @@ private void testRemoveArchiveSettingsWithBlocks(boolean readOnly, boolean readO
             clearOrSetFalse(builder, readOnlyAllowDelete, Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING);
             final ClusterBlockException e5 = expectThrows(
                 ClusterBlockException.class,
-                clusterAdmin().prepareUpdateSettings().setPersistentSettings(builder)
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setPersistentSettings(builder)
             );
             if (readOnly) {
                 assertTrue(e5.getMessage().contains("cluster read-only (api)"));
@@ -450,9 +466,14 @@ private void testRemoveArchiveSettingsWithBlocks(boolean readOnly, boolean readO
         Settings.Builder builder = Settings.builder().putNull("archived.*");
         clearOrSetFalse(builder, readOnly, Metadata.SETTING_READ_ONLY_SETTING);
         clearOrSetFalse(builder, readOnlyAllowDelete, Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING);
-        assertAcked(clusterAdmin().prepareUpdateSettings().setPersistentSettings(builder).setTransientSettings(builder).get());
+        assertAcked(
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(builder)
+                .setTransientSettings(builder)
+                .get()
+        );
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertFalse(Metadata.SETTING_READ_ONLY_SETTING.get(state.getMetadata().transientSettings()));
         assertFalse(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.get(state.getMetadata().transientSettings()));
         assertFalse(Metadata.SETTING_READ_ONLY_SETTING.get(state.getMetadata().persistentSettings()));
@@ -477,7 +498,7 @@ public void testClusterUpdateSettingsWithBlocks() {
         String key2 = "cluster.routing.allocation.node_concurrent_recoveries";
         Settings persistentSettings = Settings.builder().put(key2, "5").build();
 
-        ClusterUpdateSettingsRequestBuilder request = clusterAdmin().prepareUpdateSettings()
+        ClusterUpdateSettingsRequestBuilder request = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setTransientSettings(transientSettings)
             .setPersistentSettings(persistentSettings);
 
@@ -488,7 +509,9 @@ public void testClusterUpdateSettingsWithBlocks() {
 
             // But it's possible to update the settings to update the "cluster.blocks.read_only" setting
             Settings settings = Settings.builder().putNull(Metadata.SETTING_READ_ONLY_SETTING.getKey()).build();
-            assertAcked(clusterAdmin().prepareUpdateSettings().setTransientSettings(settings).get());
+            assertAcked(
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(settings).get()
+            );
 
         } finally {
             setClusterReadOnly(false);
@@ -498,12 +521,14 @@ public void testClusterUpdateSettingsWithBlocks() {
         try {
             // But it's possible to update the settings to update the "cluster.blocks.read_only" setting
             Settings settings = Settings.builder().put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), true).build();
-            assertAcked(clusterAdmin().prepareUpdateSettings().setTransientSettings(settings).get());
+            assertAcked(
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(settings).get()
+            );
             assertBlocked(request, Metadata.CLUSTER_READ_ONLY_ALLOW_DELETE_BLOCK);
         } finally {
             // But it's possible to update the settings to update the "cluster.blocks.read_only" setting
             Settings s = Settings.builder().putNull(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey()).build();
-            assertAcked(clusterAdmin().prepareUpdateSettings().setTransientSettings(s).get());
+            assertAcked(clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(s).get());
         }
 
         // It should work now
@@ -541,7 +566,7 @@ private void testLoggerLevelUpdate(final BiConsumer<Settings.Builder, ClusterUpd
 
         final Level level = LogManager.getRootLogger().getLevel();
 
-        ClusterUpdateSettingsRequestBuilder throwBuilder = clusterAdmin().prepareUpdateSettings();
+        ClusterUpdateSettingsRequestBuilder throwBuilder = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         consumer.accept(Settings.builder().put("logger._root", "BOOM"), throwBuilder);
 
         final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, throwBuilder);
@@ -549,14 +574,20 @@ private void testLoggerLevelUpdate(final BiConsumer<Settings.Builder, ClusterUpd
 
         try {
             final Settings.Builder testSettings = Settings.builder().put("logger.test", "TRACE").put("logger._root", "trace");
-            ClusterUpdateSettingsRequestBuilder updateBuilder = clusterAdmin().prepareUpdateSettings();
+            ClusterUpdateSettingsRequestBuilder updateBuilder = clusterAdmin().prepareUpdateSettings(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             consumer.accept(testSettings, updateBuilder);
 
             updateBuilder.get();
             assertEquals(Level.TRACE, LogManager.getLogger("test").getLevel());
             assertEquals(Level.TRACE, LogManager.getRootLogger().getLevel());
         } finally {
-            ClusterUpdateSettingsRequestBuilder undoBuilder = clusterAdmin().prepareUpdateSettings();
+            ClusterUpdateSettingsRequestBuilder undoBuilder = clusterAdmin().prepareUpdateSettings(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
 
             if (randomBoolean()) {
                 final Settings.Builder defaultSettings = Settings.builder().putNull("logger.test").putNull("logger._root");
@@ -592,18 +623,21 @@ public void testUserMetadata() {
 
         logger.info("Using " + ((persistent) ? "persistent" : "transient") + " settings");
 
-        ClusterUpdateSettingsRequestBuilder builder = clusterAdmin().prepareUpdateSettings();
+        ClusterUpdateSettingsRequestBuilder builder = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         consumer.accept(settings, builder);
 
         builder.get();
-        ClusterStateResponse state = clusterAdmin().prepareState().get();
+        ClusterStateResponse state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertEquals(value, getter.apply(state.getState().getMetadata()).get(key));
 
-        ClusterUpdateSettingsRequestBuilder updateBuilder = clusterAdmin().prepareUpdateSettings();
+        ClusterUpdateSettingsRequestBuilder updateBuilder = clusterAdmin().prepareUpdateSettings(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT
+        );
         consumer.accept(updatedSettings, updateBuilder);
         updateBuilder.get();
 
-        ClusterStateResponse updatedState = clusterAdmin().prepareState().get();
+        ClusterStateResponse updatedState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertEquals(updatedValue, getter.apply(updatedState.getState().getMetadata()).get(key));
     }
 }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsUpdateWithFaultyMasterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsUpdateWithFaultyMasterIT.java
index 6d7b219c9dfc..99d431747ec7 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsUpdateWithFaultyMasterIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsUpdateWithFaultyMasterIT.java
@@ -55,7 +55,7 @@ public void testClusterSettingsUpdateNotAcknowledged() throws Exception {
         logger.info("--> updating cluster settings");
         var future = client(masterNode).admin()
             .cluster()
-            .prepareUpdateSettings()
+            .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().put(BlockingClusterSettingTestPlugin.TEST_BLOCKING_SETTING.getKey(), true).build())
             .setMasterNodeTimeout(TimeValue.timeValueMillis(100L))
             .execute();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java
index 895bd6932fdb..7e9406dfcf09 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java
@@ -88,7 +88,7 @@ public void testMultipleIndicesAllocation() {
             .addAliasAction(AliasActions.add().index("test1").alias("routing_alias").routing("ABC"))
             .addAliasAction(AliasActions.add().index("test2").alias("routing_alias").routing("EFG"))
             .get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         ClusterSearchShardsResponse response = safeExecute(new ClusterSearchShardsRequest(TEST_REQUEST_TIMEOUT, "routing_alias"));
         assertThat(response.getGroups().length, equalTo(2));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java
index 31dd002a6af7..7a66cb3abb7c 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java
@@ -49,11 +49,11 @@ public void testMinimumPerNode() {
         int negativeShardsPerNode = between(-50_000, 0);
         try {
             if (frequently()) {
-                clusterAdmin().prepareUpdateSettings()
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                     .setPersistentSettings(Settings.builder().put(shardsPerNodeKey, negativeShardsPerNode).build())
                     .get();
             } else {
-                clusterAdmin().prepareUpdateSettings()
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                     .setPersistentSettings(Settings.builder().put(shardsPerNodeKey, negativeShardsPerNode).build())
                     .get();
             }
@@ -67,7 +67,7 @@ public void testMinimumPerNode() {
     }
 
     public void testIndexCreationOverLimit() {
-        int dataNodes = clusterAdmin().prepareState().get().getState().getNodes().getDataNodes().size();
+        int dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getDataNodes().size();
 
         ShardCounts counts = ShardCounts.forDataNodeCount(dataNodes);
 
@@ -95,12 +95,12 @@ public void testIndexCreationOverLimit() {
         } catch (IllegalArgumentException e) {
             verifyException(dataNodes, counts, e);
         }
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertFalse(clusterState.getMetadata().hasIndex("should-fail"));
     }
 
     public void testIndexCreationOverLimitFromTemplate() {
-        int dataNodes = clusterAdmin().prepareState().get().getState().getNodes().getDataNodes().size();
+        int dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getDataNodes().size();
 
         final ShardCounts counts = ShardCounts.forDataNodeCount(dataNodes);
 
@@ -126,12 +126,12 @@ public void testIndexCreationOverLimitFromTemplate() {
 
         final IllegalArgumentException e = expectThrows(IllegalArgumentException.class, indicesAdmin().prepareCreate("should-fail"));
         verifyException(dataNodes, counts, e);
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertFalse(clusterState.getMetadata().hasIndex("should-fail"));
     }
 
     public void testIncreaseReplicasOverLimit() {
-        int dataNodes = clusterAdmin().prepareState().get().getState().getNodes().getDataNodes().size();
+        int dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getDataNodes().size();
 
         dataNodes = ensureMultipleDataNodes(dataNodes);
 
@@ -158,12 +158,12 @@ public void testIncreaseReplicasOverLimit() {
                 + ";";
             assertEquals(expectedError, e.getMessage());
         }
-        Metadata clusterState = clusterAdmin().prepareState().get().getState().metadata();
+        Metadata clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         assertEquals(0, clusterState.index("growing-should-fail").getNumberOfReplicas());
     }
 
     public void testChangingMultipleIndicesOverLimit() {
-        int dataNodes = clusterAdmin().prepareState().get().getState().getNodes().getDataNodes().size();
+        int dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getDataNodes().size();
 
         dataNodes = ensureMultipleDataNodes(dataNodes);
 
@@ -219,13 +219,13 @@ public void testChangingMultipleIndicesOverLimit() {
                 + ";";
             assertEquals(expectedError, e.getMessage());
         }
-        Metadata clusterState = clusterAdmin().prepareState().get().getState().metadata();
+        Metadata clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         assertEquals(firstIndexReplicas, clusterState.index("test-1-index").getNumberOfReplicas());
         assertEquals(secondIndexReplicas, clusterState.index("test-2-index").getNumberOfReplicas());
     }
 
     public void testPreserveExistingSkipsCheck() {
-        int dataNodes = clusterAdmin().prepareState().get().getState().getNodes().getDataNodes().size();
+        int dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getDataNodes().size();
 
         dataNodes = ensureMultipleDataNodes(dataNodes);
 
@@ -245,7 +245,7 @@ public void testPreserveExistingSkipsCheck() {
                 .setPreserveExisting(true)
                 .setSettings(Settings.builder().put("number_of_replicas", dataNodes))
         );
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertEquals(0, clusterState.getMetadata().index("test-index").getNumberOfReplicas());
     }
 
@@ -266,7 +266,7 @@ public void testRestoreSnapshotOverLimit() {
                 .setSettings(repoSettings.build())
         );
 
-        int dataNodes = clusterAdmin().prepareState().get().getState().getNodes().getDataNodes().size();
+        int dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getDataNodes().size();
         ShardCounts counts = ShardCounts.forDataNodeCount(dataNodes);
         createIndex(
             "snapshot-index",
@@ -330,13 +330,13 @@ public void testRestoreSnapshotOverLimit() {
             verifyException(dataNodes, counts, e);
         }
         ensureGreen();
-        ClusterState clusterState = client.admin().cluster().prepareState().get().getState();
+        ClusterState clusterState = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertFalse(clusterState.getMetadata().hasIndex("snapshot-index"));
     }
 
     public void testOpenIndexOverLimit() {
         Client client = client();
-        int dataNodes = clusterAdmin().prepareState().get().getState().getNodes().getDataNodes().size();
+        int dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getDataNodes().size();
         ShardCounts counts = ShardCounts.forDataNodeCount(dataNodes);
 
         createIndex(
@@ -348,7 +348,7 @@ public void testOpenIndexOverLimit() {
                 .build()
         );
 
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertFalse(healthResponse.isTimedOut());
 
         AcknowledgedResponse closeIndexResponse = client.admin().indices().prepareClose("test-index-1").get();
@@ -371,7 +371,7 @@ public void testOpenIndexOverLimit() {
         } catch (IllegalArgumentException e) {
             verifyException(dataNodes, counts, e);
         }
-        ClusterState clusterState = client.admin().cluster().prepareState().get().getState();
+        ClusterState clusterState = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertFalse(clusterState.getMetadata().hasIndex("snapshot-index"));
     }
 
@@ -379,17 +379,22 @@ private int ensureMultipleDataNodes(int dataNodes) {
         if (dataNodes == 1) {
             internalCluster().startNode(dataNode());
             assertThat(
-                clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes(">=2").setLocal(true).get().isTimedOut(),
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+                    .setWaitForEvents(Priority.LANGUID)
+                    .setWaitForNodes(">=2")
+                    .setLocal(true)
+                    .get()
+                    .isTimedOut(),
                 equalTo(false)
             );
-            dataNodes = clusterAdmin().prepareState().get().getState().getNodes().getDataNodes().size();
+            dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getDataNodes().size();
         }
         return dataNodes;
     }
 
     private void setShardsPerNode(int shardsPerNode) {
         try {
-            ClusterUpdateSettingsResponse response = clusterAdmin().prepareUpdateSettings()
+            ClusterUpdateSettingsResponse response = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setPersistentSettings(Settings.builder().put(shardsPerNodeKey, shardsPerNode).build())
                 .get();
             assertEquals(shardsPerNode, response.getPersistentSettings().getAsInt(shardsPerNodeKey, -1).intValue());
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java
index a0fa63aa58ab..6ae7e0f7e84e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java
@@ -293,7 +293,14 @@ public void testRejoinDocumentExistsInAllShardCopies() throws Exception {
         NetworkDisruption scheme = addRandomDisruptionType(partitions);
         scheme.startDisrupting();
         ensureStableCluster(2, notIsolatedNode);
-        assertFalse(client(notIsolatedNode).admin().cluster().prepareHealth("test").setWaitForYellowStatus().get().isTimedOut());
+        assertFalse(
+            client(notIsolatedNode).admin()
+                .cluster()
+                .prepareHealth(TEST_REQUEST_TIMEOUT, "test")
+                .setWaitForYellowStatus()
+                .get()
+                .isTimedOut()
+        );
 
         DocWriteResponse indexResponse = internalCluster().client(notIsolatedNode).prepareIndex("test").setSource("field", "value").get();
         assertThat(indexResponse.getVersion(), equalTo(1L));
@@ -424,12 +431,12 @@ public boolean validateClusterForming() {
         });
 
         assertBusy(() -> {
-            assertFalse(internalCluster().client(masterNode).admin().cluster().prepareHealth().get().isTimedOut());
+            assertFalse(internalCluster().client(masterNode).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get().isTimedOut());
             assertTrue(
                 internalCluster().client(masterNode)
                     .admin()
                     .cluster()
-                    .prepareHealth()
+                    .prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForNodes("2")
                     .setTimeout(TimeValue.timeValueSeconds(2))
                     .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java
index cad5c8f524bc..b512f369c76d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java
@@ -145,7 +145,7 @@ public void testElectMasterWithLatestVersion() throws Exception {
 
         isolateAllNodes.stopDisrupting();
 
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         if (state.metadata().hasIndex("test") == false) {
             fail("index 'test' was lost. current cluster state: " + state);
         }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java
index f8bdf17e2cec..601266b50d23 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java
@@ -158,7 +158,13 @@ private String xContentToString(ChunkedToXContent xContent) throws IOException {
     private void ensureNoMaster(String node) throws Exception {
         assertBusy(
             () -> assertNull(
-                client(node).admin().cluster().state(new ClusterStateRequest().local(true)).get().getState().nodes().getMasterNode()
+                client(node).admin()
+                    .cluster()
+                    .state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).local(true))
+                    .get()
+                    .getState()
+                    .nodes()
+                    .getMasterNode()
             )
         );
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java b/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java
index 3aa97f79a82d..eeda0257fb0e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java
@@ -113,12 +113,14 @@ private void assertShardInfo(ReplicationResponse response, int expectedTotal, in
 
     private void ensureActiveShardCopies(final int shardId, final int copyCount) throws Exception {
         assertBusy(() -> {
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertThat(state.routingTable().index("idx"), not(nullValue()));
             assertThat(state.routingTable().index("idx").shard(shardId), not(nullValue()));
             assertThat(state.routingTable().index("idx").shard(shardId).activeShards().size(), equalTo(copyCount));
 
-            ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth("idx").setWaitForNoRelocatingShards(true).get();
+            ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "idx")
+                .setWaitForNoRelocatingShards(true)
+                .get();
             assertThat(healthResponse.isTimedOut(), equalTo(false));
 
             RecoveryResponse recoveryResponse = indicesAdmin().prepareRecoveries("idx").setActiveOnly(true).get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java
index 8c6abc3e14cd..00a4f170cf7e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java
@@ -153,7 +153,7 @@ public void testUpgradeDataFolder() throws IOException, InterruptedException {
         String node = internalCluster().startNode();
         prepareCreate("test").get();
         indexRandom(true, prepareIndex("test").setId("1").setSource("{}", XContentType.JSON));
-        String nodeId = clusterAdmin().prepareState().get().getState().nodes().getMasterNodeId();
+        String nodeId = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNodeId();
 
         final Settings dataPathSettings = internalCluster().dataPathSettings(node);
         internalCluster().stopRandomDataNode();
@@ -235,7 +235,7 @@ public void testUpgradeDataFolder() throws IOException, InterruptedException {
         dataPaths.forEach(path -> assertTrue(Files.isDirectory(path.resolve("nodes"))));
         internalCluster().startNode(dataPathSettings);
         dataPaths.forEach(path -> assertTrue(Files.isRegularFile(path.resolve("nodes"))));
-        assertEquals(nodeId, clusterAdmin().prepareState().get().getState().nodes().getMasterNodeId());
+        assertEquals(nodeId, clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNodeId());
         assertTrue(indexExists("test"));
         ensureYellow("test");
         assertHitCount(prepareSearch().setQuery(matchAllQuery()), 1L);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/features/ClusterFeaturesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/features/ClusterFeaturesIT.java
index 24bf198b7b42..a695c46bcbfa 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/features/ClusterFeaturesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/features/ClusterFeaturesIT.java
@@ -32,7 +32,7 @@ public void testClusterHasFeatures() {
         assertThat(service.getNodeFeatures(), hasKey(FeatureService.FEATURES_SUPPORTED.id()));
 
         // check the nodes all have a feature in their cluster state (there should always be features_supported)
-        var response = clusterAdmin().state(new ClusterStateRequest().clear().nodes(true)).actionGet();
+        var response = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).clear().nodes(true)).actionGet();
         var features = response.getState().clusterFeatures().nodeFeatures();
         Set<String> missing = features.entrySet()
             .stream()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
index e05bda69d2c9..92c1e9729b46 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
@@ -92,7 +92,7 @@ public void testMappingMetadataParsed() throws Exception {
             .get();
 
         logger.info("--> verify meta _routing required exists");
-        MappingMetadata mappingMd = clusterAdmin().prepareState().get().getState().metadata().index("test").mapping();
+        MappingMetadata mappingMd = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").mapping();
         assertThat(mappingMd.routingRequired(), equalTo(true));
 
         logger.info("--> restarting nodes...");
@@ -102,7 +102,7 @@ public void testMappingMetadataParsed() throws Exception {
         ensureYellow();
 
         logger.info("--> verify meta _routing required exists");
-        mappingMd = clusterAdmin().prepareState().get().getState().metadata().index("test").mapping();
+        mappingMd = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").mapping();
         assertThat(mappingMd.routingRequired(), equalTo(true));
     }
 
@@ -118,7 +118,7 @@ public void testSimpleOpenClose() throws Exception {
         logger.info("--> waiting for green status");
         ensureGreen();
 
-        ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.OPEN));
         assertThat(stateResponse.getState().routingTable().index("test").size(), equalTo(test.numPrimaries));
         assertThat(
@@ -132,7 +132,7 @@ public void testSimpleOpenClose() throws Exception {
         logger.info("--> closing test index...");
         assertAcked(indicesAdmin().prepareClose("test"));
 
-        stateResponse = clusterAdmin().prepareState().get();
+        stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.CLOSE));
         assertThat(stateResponse.getState().routingTable().index("test"), notNullValue());
 
@@ -158,7 +158,7 @@ public void testSimpleOpenClose() throws Exception {
         logger.info("--> verifying that the state is green");
         ensureGreen();
 
-        stateResponse = clusterAdmin().prepareState().get();
+        stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.OPEN));
         assertThat(stateResponse.getState().routingTable().index("test").size(), equalTo(test.numPrimaries));
         assertThat(
@@ -172,7 +172,7 @@ public void testSimpleOpenClose() throws Exception {
 
         logger.info("--> closing test index...");
         assertAcked(indicesAdmin().prepareClose("test"));
-        stateResponse = clusterAdmin().prepareState().get();
+        stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.CLOSE));
         assertThat(stateResponse.getState().routingTable().index("test"), notNullValue());
 
@@ -181,7 +181,7 @@ public void testSimpleOpenClose() throws Exception {
         logger.info("--> waiting for two nodes and green status");
         ensureGreen();
 
-        stateResponse = clusterAdmin().prepareState().get();
+        stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.CLOSE));
         assertThat(stateResponse.getState().routingTable().index("test"), notNullValue());
 
@@ -199,7 +199,7 @@ public void testSimpleOpenClose() throws Exception {
         logger.info("--> waiting for green status");
         ensureGreen();
 
-        stateResponse = clusterAdmin().prepareState().get();
+        stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.OPEN));
         assertThat(stateResponse.getState().routingTable().index("test").size(), equalTo(test.numPrimaries));
         assertThat(
@@ -233,11 +233,14 @@ public Settings onNodeStopped(String nodeName) {
         });
 
         logger.info("--> waiting for test index to be created");
-        ClusterHealthResponse health = clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setIndices("test").get();
+        ClusterHealthResponse health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForEvents(Priority.LANGUID)
+            .setIndices("test")
+            .get();
         assertThat(health.isTimedOut(), equalTo(false));
 
         logger.info("--> verify we have an index");
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().setIndices("test").get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setIndices("test").get();
         assertThat(clusterStateResponse.getState().metadata().hasIndex("test"), equalTo(true));
     }
 
@@ -264,7 +267,7 @@ public void testTwoNodesSingleDoc() throws Exception {
         prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get();
 
         logger.info("--> waiting for green status");
-        ClusterHealthResponse health = clusterAdmin().prepareHealth()
+        ClusterHealthResponse health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForNodes("2")
@@ -279,7 +282,7 @@ public void testTwoNodesSingleDoc() throws Exception {
         logger.info("--> closing test index...");
         assertAcked(indicesAdmin().prepareClose("test"));
 
-        ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.CLOSE));
         assertThat(stateResponse.getState().routingTable().index("test"), notNullValue());
 
@@ -287,7 +290,11 @@ public void testTwoNodesSingleDoc() throws Exception {
         indicesAdmin().prepareOpen("test").get();
 
         logger.info("--> waiting for green status");
-        health = clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().setWaitForNodes("2").get();
+        health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForEvents(Priority.LANGUID)
+            .setWaitForGreenStatus()
+            .setWaitForNodes("2")
+            .get();
         assertThat(health.isTimedOut(), equalTo(false));
 
         logger.info("--> verify 1 doc in the index");
@@ -337,7 +344,8 @@ public Settings onNodeStopped(final String nodeName) throws Exception {
 
         logger.info("--> wait until all nodes are back online");
         clusterAdmin().health(
-            new ClusterHealthRequest(new String[] {}).waitForEvents(Priority.LANGUID).waitForNodes(Integer.toString(numNodes))
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForEvents(Priority.LANGUID)
+                .waitForNodes(Integer.toString(numNodes))
         ).actionGet();
 
         logger.info("--> waiting for green status");
@@ -372,13 +380,13 @@ public void testRecoverBrokenIndexMetadata() throws Exception {
         } else {
             internalCluster().startNode();
             clusterAdmin().health(
-                new ClusterHealthRequest(new String[] {}).waitForGreenStatus()
+                new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForGreenStatus()
                     .waitForEvents(Priority.LANGUID)
                     .waitForNoRelocatingShards(true)
                     .waitForNodes("2")
             ).actionGet();
         }
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         final IndexMetadata metadata = state.getMetadata().index("test");
         final IndexMetadata.Builder brokenMeta = IndexMetadata.builder(metadata)
@@ -395,7 +403,7 @@ public void testRecoverBrokenIndexMetadata() throws Exception {
 
         // check that the cluster does not keep reallocating shards
         assertBusy(() -> {
-            final RoutingTable routingTable = clusterAdmin().prepareState().get().getState().routingTable();
+            final RoutingTable routingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().routingTable();
             final IndexRoutingTable indexRoutingTable = routingTable.index("test");
             assertNotNull(indexRoutingTable);
             for (int i = 0; i < indexRoutingTable.size(); i++) {
@@ -410,7 +418,7 @@ public void testRecoverBrokenIndexMetadata() throws Exception {
         }, 60, TimeUnit.SECONDS);
         indicesAdmin().prepareClose("test").get();
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertEquals(IndexMetadata.State.CLOSE, state.getMetadata().index(metadata.getIndex()).getState());
         assertEquals("boolean", state.getMetadata().index(metadata.getIndex()).getSettings().get("archived.index.similarity.BM25.type"));
         // try to open it with the broken setting - fail again!
@@ -449,13 +457,13 @@ public void testRecoverMissingAnalyzer() throws Exception {
         } else {
             internalCluster().startNode();
             clusterAdmin().health(
-                new ClusterHealthRequest(new String[] {}).waitForGreenStatus()
+                new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForGreenStatus()
                     .waitForEvents(Priority.LANGUID)
                     .waitForNoRelocatingShards(true)
                     .waitForNodes("2")
             ).actionGet();
         }
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         final IndexMetadata metadata = state.getMetadata().index("test");
         final IndexMetadata.Builder brokenMeta = IndexMetadata.builder(metadata)
@@ -464,7 +472,7 @@ public void testRecoverMissingAnalyzer() throws Exception {
 
         // check that the cluster does not keep reallocating shards
         assertBusy(() -> {
-            final RoutingTable routingTable = clusterAdmin().prepareState().get().getState().routingTable();
+            final RoutingTable routingTable = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().routingTable();
             final IndexRoutingTable indexRoutingTable = routingTable.index("test");
             assertNotNull(indexRoutingTable);
             for (int i = 0; i < indexRoutingTable.size(); i++) {
@@ -497,13 +505,13 @@ public void testArchiveBrokenClusterSettings() throws Exception {
         } else {
             internalCluster().startNode();
             clusterAdmin().health(
-                new ClusterHealthRequest(new String[] {}).waitForGreenStatus()
+                new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForGreenStatus()
                     .waitForEvents(Priority.LANGUID)
                     .waitForNoRelocatingShards(true)
                     .waitForNodes("2")
             ).actionGet();
         }
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         final Metadata metadata = state.getMetadata();
         final Metadata brokenMeta = Metadata.builder(metadata)
@@ -518,7 +526,7 @@ public void testArchiveBrokenClusterSettings() throws Exception {
         restartNodesOnBrokenClusterState(ClusterState.builder(state).metadata(brokenMeta));
 
         ensureYellow("test"); // wait for state recovery
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertEquals("true", state.metadata().persistentSettings().get("archived.this.is.unknown"));
         assertEquals(
             "broken",
@@ -528,7 +536,7 @@ public void testArchiveBrokenClusterSettings() throws Exception {
         // delete these settings
         updateClusterSettings(Settings.builder().putNull("archived.*"));
 
-        state = clusterAdmin().prepareState().get().getState();
+        state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertNull(state.metadata().persistentSettings().get("archived.this.is.unknown"));
         assertNull(
             state.metadata().persistentSettings().get("archived." + ShardLimitValidator.SETTING_CLUSTER_MAX_SHARDS_PER_NODE.getKey())
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/MetadataNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/MetadataNodesIT.java
index 1e34967073ad..94824db66d15 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/MetadataNodesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/MetadataNodesIT.java
@@ -69,7 +69,7 @@ public void testIndexFilesAreRemovedIfAllShardsFromIndexRemoved() throws Excepti
 
         logger.debug("relocating index...");
         updateIndexSettings(Settings.builder().put(IndexMetadata.INDEX_ROUTING_INCLUDE_GROUP_SETTING.getKey() + "_name", node2), index);
-        clusterAdmin().prepareHealth().setWaitForNoRelocatingShards(true).get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNoRelocatingShards(true).get();
         ensureGreen();
         assertIndexDirectoryDeleted(node1, resolveIndex);
         assertIndexInMetaState(node2, index);
@@ -98,7 +98,7 @@ public void testMetaWrittenWhenIndexIsClosedAndMetaUpdated() throws Exception {
         logger.info("--> close index");
         indicesAdmin().prepareClose(index).get();
         // close the index
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(clusterStateResponse.getState().getMetadata().index(index).getState().name(), equalTo(IndexMetadata.State.CLOSE.name()));
 
         // update the mapping. this should cause the new meta data to be written although index is closed
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java
index 15a72e3534b5..f1b06e4efc97 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java
@@ -62,7 +62,7 @@ public void doAfterNodes(int numNodes, final Client activeClient) throws Excepti
                         ClusterHealthResponse clusterHealth = activeClient.admin()
                             .cluster()
                             .health(
-                                new ClusterHealthRequest(new String[] {}).waitForYellowStatus()
+                                new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForYellowStatus()
                                     .waitForNodes("2")
                                     .waitForActiveShards(test.numPrimaries * 2)
                             )
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java
index b55dd5e207c4..4281562b6479 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java
@@ -35,7 +35,7 @@ public Set<ClusterBlock> waitForNoBlocksOnNode(TimeValue timeout, Client nodeCli
         do {
             blocks = nodeClient.admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .setLocal(true)
                 .get()
                 .getState()
@@ -55,33 +55,75 @@ public void testRecoverAfterDataNodes() {
         logger.info("--> start master_node (1)");
         Client master1 = startNode(Settings.builder().put(RECOVER_AFTER_DATA_NODES_SETTING.getKey(), 2).put(masterOnlyNode()));
         assertThat(
-            master1.admin().cluster().prepareState().setLocal(true).get().getState().blocks().global(ClusterBlockLevel.METADATA_WRITE),
+            master1.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState()
+                .blocks()
+                .global(ClusterBlockLevel.METADATA_WRITE),
             hasItem(GatewayService.STATE_NOT_RECOVERED_BLOCK)
         );
 
         logger.info("--> start data_node (1)");
         Client data1 = startNode(Settings.builder().put(RECOVER_AFTER_DATA_NODES_SETTING.getKey(), 2).put(dataOnlyNode()));
         assertThat(
-            master1.admin().cluster().prepareState().setLocal(true).get().getState().blocks().global(ClusterBlockLevel.METADATA_WRITE),
+            master1.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState()
+                .blocks()
+                .global(ClusterBlockLevel.METADATA_WRITE),
             hasItem(GatewayService.STATE_NOT_RECOVERED_BLOCK)
         );
         assertThat(
-            data1.admin().cluster().prepareState().setLocal(true).get().getState().blocks().global(ClusterBlockLevel.METADATA_WRITE),
+            data1.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState()
+                .blocks()
+                .global(ClusterBlockLevel.METADATA_WRITE),
             hasItem(GatewayService.STATE_NOT_RECOVERED_BLOCK)
         );
 
         logger.info("--> start master_node (2)");
         Client master2 = startNode(Settings.builder().put(RECOVER_AFTER_DATA_NODES_SETTING.getKey(), 2).put(masterOnlyNode()));
         assertThat(
-            master2.admin().cluster().prepareState().setLocal(true).get().getState().blocks().global(ClusterBlockLevel.METADATA_WRITE),
+            master2.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState()
+                .blocks()
+                .global(ClusterBlockLevel.METADATA_WRITE),
             hasItem(GatewayService.STATE_NOT_RECOVERED_BLOCK)
         );
         assertThat(
-            data1.admin().cluster().prepareState().setLocal(true).get().getState().blocks().global(ClusterBlockLevel.METADATA_WRITE),
+            data1.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState()
+                .blocks()
+                .global(ClusterBlockLevel.METADATA_WRITE),
             hasItem(GatewayService.STATE_NOT_RECOVERED_BLOCK)
         );
         assertThat(
-            master2.admin().cluster().prepareState().setLocal(true).get().getState().blocks().global(ClusterBlockLevel.METADATA_WRITE),
+            master2.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .setLocal(true)
+                .get()
+                .getState()
+                .blocks()
+                .global(ClusterBlockLevel.METADATA_WRITE),
             hasItem(GatewayService.STATE_NOT_RECOVERED_BLOCK)
         );
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java
index 26573644790f..193f025e6843 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java
@@ -142,7 +142,7 @@ private Map<String, long[]> assertAndCapturePrimaryTerms(Map<String, long[]> pre
             previousTerms = new HashMap<>();
         }
         final Map<String, long[]> result = new HashMap<>();
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (IndexMetadata indexMetadata : state.metadata().indices().values()) {
             final String index = indexMetadata.getIndex().getName();
             final long[] previous = previousTerms.get(index);
@@ -316,7 +316,10 @@ public void testTwoNodeFirstNodeCleared() throws Exception {
 
         Map<String, long[]> primaryTerms = assertAndCapturePrimaryTerms(null);
 
-        client().execute(TransportAddVotingConfigExclusionsAction.TYPE, new AddVotingConfigExclusionsRequest(firstNode)).get();
+        client().execute(
+            TransportAddVotingConfigExclusionsAction.TYPE,
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, firstNode)
+        ).get();
 
         internalCluster().fullRestart(new RestartCallback() {
             @Override
@@ -342,7 +345,8 @@ public boolean clearData(String nodeName) {
             assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
         }
 
-        client().execute(TransportClearVotingConfigExclusionsAction.TYPE, new ClearVotingConfigExclusionsRequest()).get();
+        client().execute(TransportClearVotingConfigExclusionsAction.TYPE, new ClearVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT))
+            .get();
     }
 
     public void testLatestVersionLoaded() throws Exception {
@@ -364,7 +368,7 @@ public void testLatestVersionLoaded() throws Exception {
             assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
         }
 
-        String metadataUuid = clusterAdmin().prepareState().execute().get().getState().getMetadata().clusterUUID();
+        String metadataUuid = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).execute().get().getState().getMetadata().clusterUUID();
         assertThat(metadataUuid, not(equalTo("_na_")));
 
         logger.info("--> closing first node, and indexing more data to the second node");
@@ -420,13 +424,16 @@ public void testLatestVersionLoaded() throws Exception {
         logger.info("--> running cluster_health (wait for the shards to startup)");
         ensureGreen();
 
-        assertThat(clusterAdmin().prepareState().execute().get().getState().getMetadata().clusterUUID(), equalTo(metadataUuid));
+        assertThat(
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).execute().get().getState().getMetadata().clusterUUID(),
+            equalTo(metadataUuid)
+        );
 
         for (int i = 0; i < 10; i++) {
             assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 3);
         }
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(state.metadata().templates().get("template_1").patterns(), equalTo(Collections.singletonList("te*")));
         assertThat(state.metadata().index("test").getAliases().get("test_alias"), notNullValue());
         assertThat(state.metadata().index("test").getAliases().get("test_alias").filter(), notNullValue());
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java
index ae0a1e15923e..02c566f49e2b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java
@@ -202,7 +202,7 @@ public void testRecentPrimaryInformation() throws Exception {
         );
         internalCluster().startDataOnlyNode(nodeWithReplicaSettings);
         // need to wait for events to ensure the reroute has happened since we perform it async when a new node joins.
-        clusterAdmin().prepareHealth(indexName).setWaitForYellowStatus().setWaitForEvents(Priority.LANGUID).get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).setWaitForYellowStatus().setWaitForEvents(Priority.LANGUID).get();
         blockRecovery.countDown();
         ensureGreen(indexName);
         assertThat(internalCluster().nodesInclude(indexName), hasItem(newNode));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/health/HealthMetadataServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/health/HealthMetadataServiceIT.java
index 660d6028486a..30fc7e263a4c 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/health/HealthMetadataServiceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/health/HealthMetadataServiceIT.java
@@ -253,7 +253,7 @@ private static void updateSettings(InternalTestCluster internalCluster, Settings
         internalCluster.client()
             .admin()
             .cluster()
-            .updateSettings(new ClusterUpdateSettingsRequest().persistentSettings(settings))
+            .updateSettings(new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).persistentSettings(settings))
             .actionGet();
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/health/HealthServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/health/HealthServiceIT.java
index 14697cc6533c..a5931f29b9ff 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/health/HealthServiceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/health/HealthServiceIT.java
@@ -88,7 +88,7 @@ private void waitForAllNodesToReportHealth() throws Exception {
             ClusterState state = internalCluster().client()
                 .admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setMetadata(true)
                 .setNodes(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/health/UpdateHealthInfoCacheIT.java b/server/src/internalClusterTest/java/org/elasticsearch/health/UpdateHealthInfoCacheIT.java
index 5a5fad9be3ef..b6477a7e1a6c 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/health/UpdateHealthInfoCacheIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/health/UpdateHealthInfoCacheIT.java
@@ -136,13 +136,22 @@ private void decreasePollingInterval(InternalTestCluster internalCluster) {
             .admin()
             .cluster()
             .updateSettings(
-                new ClusterUpdateSettingsRequest().persistentSettings(
+                new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).persistentSettings(
                     Settings.builder().put(LocalHealthMonitor.POLL_INTERVAL_SETTING.getKey(), TimeValue.timeValueSeconds(10))
                 )
             );
     }
 
     private static Map<String, DiscoveryNode> getNodes(InternalTestCluster internalCluster) {
-        return internalCluster.client().admin().cluster().prepareState().clear().setNodes(true).get().getState().getNodes().getNodes();
+        return internalCluster.client()
+            .admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get()
+            .getState()
+            .getNodes()
+            .getNodes();
     }
 }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java
index 216d5e25218e..026bb00d69bb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java
@@ -12,12 +12,8 @@
 import org.elasticsearch.action.get.GetRequestBuilder;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.ingest.DeletePipelineRequest;
 import org.elasticsearch.action.ingest.GetPipelineResponse;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.support.WriteRequest;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.ingest.AbstractProcessor;
 import org.elasticsearch.ingest.ConfigurationUtils;
@@ -28,7 +24,6 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.xcontent.XContentType;
 import org.junit.After;
 
 import java.io.IOException;
@@ -56,10 +51,9 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
     public void cleanUpPipelines() {
         indicesAdmin().prepareDelete("*").get();
 
-        final GetPipelineResponse response = clusterAdmin().prepareGetPipeline("default_pipeline", "final_pipeline", "request_pipeline")
-            .get();
+        final GetPipelineResponse response = getPipelines("default_pipeline", "final_pipeline", "request_pipeline");
         for (final PipelineConfiguration pipeline : response.pipelines()) {
-            clusterAdmin().deletePipeline(new DeletePipelineRequest(pipeline.getId())).actionGet();
+            deletePipeline(pipeline.getId());
         }
     }
 
@@ -67,9 +61,8 @@ public void testFinalPipelineCantChangeDestination() {
         final Settings settings = Settings.builder().put(IndexSettings.FINAL_PIPELINE.getKey(), "final_pipeline").build();
         createIndex("index", settings);
 
-        final BytesReference finalPipelineBody = new BytesArray("""
+        putJsonPipeline("final_pipeline", """
             {"processors": [{"changing_dest": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet();
 
         final IllegalStateException e = expectThrows(
             IllegalStateException.class,
@@ -87,9 +80,8 @@ public void testFinalPipelineCantRerouteDestination() {
         final Settings settings = Settings.builder().put(IndexSettings.FINAL_PIPELINE.getKey(), "final_pipeline").build();
         createIndex("index", settings);
 
-        final BytesReference finalPipelineBody = new BytesArray("""
+        putJsonPipeline("final_pipeline", """
             {"processors": [{"reroute": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet();
 
         final IllegalStateException e = expectThrows(
             IllegalStateException.class,
@@ -110,13 +102,11 @@ public void testFinalPipelineOfOldDestinationIsNotInvoked() {
             .build();
         createIndex("index", settings);
 
-        BytesReference defaultPipelineBody = new BytesArray("""
+        putJsonPipeline("default_pipeline", """
             {"processors": [{"changing_dest": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("default_pipeline", defaultPipelineBody, XContentType.JSON)).actionGet();
 
-        BytesReference finalPipelineBody = new BytesArray("""
+        putJsonPipeline("final_pipeline", """
             {"processors": [{"final": {"exists":"no_such_field"}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet();
 
         DocWriteResponse indexResponse = prepareIndex("index").setId("1")
             .setSource(Map.of("field", "value"))
@@ -136,13 +126,11 @@ public void testFinalPipelineOfNewDestinationIsInvoked() {
         settings = Settings.builder().put(IndexSettings.FINAL_PIPELINE.getKey(), "final_pipeline").build();
         createIndex("target", settings);
 
-        BytesReference defaultPipelineBody = new BytesArray("""
+        putJsonPipeline("default_pipeline", """
             {"processors": [{"changing_dest": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("default_pipeline", defaultPipelineBody, XContentType.JSON)).actionGet();
 
-        BytesReference finalPipelineBody = new BytesArray("""
+        putJsonPipeline("final_pipeline", """
             {"processors": [{"final": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet();
 
         DocWriteResponse indexResponse = prepareIndex("index").setId("1")
             .setSource(Map.of("field", "value"))
@@ -162,13 +150,11 @@ public void testDefaultPipelineOfNewDestinationIsNotInvoked() {
         settings = Settings.builder().put(IndexSettings.DEFAULT_PIPELINE.getKey(), "target_default_pipeline").build();
         createIndex("target", settings);
 
-        BytesReference defaultPipelineBody = new BytesArray("""
+        putJsonPipeline("default_pipeline", """
             {"processors": [{"changing_dest": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("default_pipeline", defaultPipelineBody, XContentType.JSON)).actionGet();
 
-        BytesReference targetPipeline = new BytesArray("""
+        putJsonPipeline("target_default_pipeline", """
             {"processors": [{"final": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("target_default_pipeline", targetPipeline, XContentType.JSON)).actionGet();
 
         DocWriteResponse indexResponse = prepareIndex("index").setId("1")
             .setSource(Map.of("field", "value"))
@@ -188,13 +174,11 @@ public void testDefaultPipelineOfRerouteDestinationIsInvoked() {
         settings = Settings.builder().put(IndexSettings.DEFAULT_PIPELINE.getKey(), "target_default_pipeline").build();
         createIndex("target", settings);
 
-        BytesReference defaultPipelineBody = new BytesArray("""
+        putJsonPipeline("default_pipeline", """
             {"processors": [{"reroute": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("default_pipeline", defaultPipelineBody, XContentType.JSON)).actionGet();
 
-        BytesReference targetPipeline = new BytesArray("""
+        putJsonPipeline("target_default_pipeline", """
             {"processors": [{"final": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("target_default_pipeline", targetPipeline, XContentType.JSON)).actionGet();
 
         DocWriteResponse indexResponse = prepareIndex("index").setId("1")
             .setSource(Map.of("field", "value"))
@@ -214,13 +198,11 @@ public void testAvoidIndexingLoop() {
         settings = Settings.builder().put(IndexSettings.DEFAULT_PIPELINE.getKey(), "target_default_pipeline").build();
         createIndex("target", settings);
 
-        BytesReference defaultPipelineBody = new BytesArray("""
+        putJsonPipeline("default_pipeline", """
             {"processors": [{"reroute": {"dest": "target"}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("default_pipeline", defaultPipelineBody, XContentType.JSON)).actionGet();
 
-        BytesReference targetPipeline = new BytesArray("""
+        putJsonPipeline("target_default_pipeline", """
             {"processors": [{"reroute": {"dest": "index"}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("target_default_pipeline", targetPipeline, XContentType.JSON)).actionGet();
 
         IllegalStateException exception = expectThrows(
             IllegalStateException.class,
@@ -245,12 +227,10 @@ public void testFinalPipeline() {
     }
 
     public void testRequestPipelineAndFinalPipeline() {
-        final BytesReference requestPipelineBody = new BytesArray("""
+        putJsonPipeline("request_pipeline", """
             {"processors": [{"request": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("request_pipeline", requestPipelineBody, XContentType.JSON)).actionGet();
-        final BytesReference finalPipelineBody = new BytesArray("""
+        putJsonPipeline("final_pipeline", """
             {"processors": [{"final": {"exists":"request"}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet();
         final Settings settings = Settings.builder().put(IndexSettings.FINAL_PIPELINE.getKey(), "final_pipeline").build();
         createIndex("index", settings);
         final IndexRequestBuilder index = prepareIndex("index").setId("1");
@@ -270,12 +250,10 @@ public void testRequestPipelineAndFinalPipeline() {
     }
 
     public void testDefaultAndFinalPipeline() {
-        final BytesReference defaultPipelineBody = new BytesArray("""
+        putJsonPipeline("default_pipeline", """
             {"processors": [{"default": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("default_pipeline", defaultPipelineBody, XContentType.JSON)).actionGet();
-        final BytesReference finalPipelineBody = new BytesArray("""
+        putJsonPipeline("final_pipeline", """
             {"processors": [{"final": {"exists":"default"}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet();
         final Settings settings = Settings.builder()
             .put(IndexSettings.DEFAULT_PIPELINE.getKey(), "default_pipeline")
             .put(IndexSettings.FINAL_PIPELINE.getKey(), "final_pipeline")
@@ -297,12 +275,10 @@ public void testDefaultAndFinalPipeline() {
     }
 
     public void testDefaultAndFinalPipelineFromTemplates() {
-        final BytesReference defaultPipelineBody = new BytesArray("""
+        putJsonPipeline("default_pipeline", """
             {"processors": [{"default": {}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("default_pipeline", defaultPipelineBody, XContentType.JSON)).actionGet();
-        final BytesReference finalPipelineBody = new BytesArray("""
+        putJsonPipeline("final_pipeline", """
             {"processors": [{"final": {"exists":"default"}}]}""");
-        clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet();
         final int lowOrder = randomIntBetween(0, Integer.MAX_VALUE - 1);
         final int highOrder = randomIntBetween(lowOrder + 1, Integer.MAX_VALUE);
         final int finalPipelineOrder;
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java
index da89f3252bec..97dd3d9723d5 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java
@@ -396,7 +396,15 @@ public Settings onNodeStopped(String nodeName) {
     }
 
     private String getCoordinatingOnlyNode() {
-        return clusterAdmin().prepareState().get().getState().nodes().getCoordinatingOnlyNodes().values().iterator().next().getName();
+        return clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .nodes()
+            .getCoordinatingOnlyNodes()
+            .values()
+            .iterator()
+            .next()
+            .getName();
     }
 
     private Tuple<String, String> getPrimaryReplicaNodeNames() {
@@ -413,7 +421,7 @@ private Tuple<String, String> getPrimaryReplicaNodeNames() {
             .findAny()
             .get()
             .currentNodeId();
-        DiscoveryNodes nodes = clusterAdmin().prepareState().get().getState().nodes();
+        DiscoveryNodes nodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes();
         String primaryName = nodes.get(primaryId).getName();
         String replicaName = nodes.get(replicaId).getName();
         return new Tuple<>(primaryName, replicaName);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java
index 53f632f6ba8d..749cf73e822e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java
@@ -84,7 +84,7 @@ public void testPostOperationGlobalCheckpointSync() throws Exception {
     public void testBackgroundGlobalCheckpointSync() throws Exception {
         runGlobalCheckpointSyncTest(TimeValue.timeValueSeconds(randomIntBetween(1, 3)), client -> {
             // prevent global checkpoint syncs between all nodes
-            final DiscoveryNodes nodes = client.admin().cluster().prepareState().get().getState().getNodes();
+            final DiscoveryNodes nodes = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes();
             for (final DiscoveryNode node : nodes) {
                 for (final DiscoveryNode other : nodes) {
                     if (node == other) {
@@ -105,7 +105,7 @@ public void testBackgroundGlobalCheckpointSync() throws Exception {
             }
         }, client -> {
             // restore global checkpoint syncs between all nodes
-            final DiscoveryNodes nodes = client.admin().cluster().prepareState().get().getState().getNodes();
+            final DiscoveryNodes nodes = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes();
             for (final DiscoveryNode node : nodes) {
                 for (final DiscoveryNode other : nodes) {
                     if (node == other) {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java
index c9906ccf1fbe..5a4785252bf9 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java
@@ -558,7 +558,7 @@ private void runWaitForShardsTest(
             .build();
         assertAcked(prepareCreate("index").setSettings(settings));
         ensureYellowAndNoInitializingShards("index");
-        assertFalse(clusterAdmin().prepareHealth("index").setWaitForActiveShards(numDataNodes).get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index").setWaitForActiveShards(numDataNodes).get().isTimedOut());
 
         final String primaryShardNodeId = clusterService().state().routingTable().index("index").shard(0).primaryShard().currentNodeId();
         final String primaryShardNodeName = clusterService().state().nodes().get(primaryShardNodeId).getName();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java
index bdfe629f4bab..b7dbcf42630e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java
@@ -194,7 +194,7 @@ public Settings onNodeStopped(String nodeName) throws Exception {
         waitNoPendingTasksOnAll();
 
         String nodeId = null;
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final DiscoveryNodes nodes = state.nodes();
         for (Map.Entry<String, DiscoveryNode> cursor : nodes.getNodes().entrySet()) {
             final String name = cursor.getValue().getName();
@@ -350,7 +350,7 @@ public Settings onNodeStopped(String nodeName) throws Exception {
         });
 
         String primaryNodeId = null;
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final DiscoveryNodes nodes = state.nodes();
         for (Map.Entry<String, DiscoveryNode> cursor : nodes.getNodes().entrySet()) {
             final String name = cursor.getValue().getName();
@@ -524,7 +524,7 @@ public void testResolvePath() throws Exception {
         ensureGreen(indexName);
 
         final Map<String, String> nodeNameToNodeId = new HashMap<>();
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final DiscoveryNodes nodes = state.nodes();
         for (Map.Entry<String, DiscoveryNode> cursor : nodes.getNodes().entrySet()) {
             nodeNameToNodeId.put(cursor.getValue().getName(), cursor.getKey());
@@ -569,7 +569,7 @@ public void testResolvePath() throws Exception {
     }
 
     private Path getPathToShardData(String indexName, String dirSuffix) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         GroupShardsIterator<ShardIterator> shardIterators = state.getRoutingTable()
             .activePrimaryShardsGrouped(new String[] { indexName }, false);
         List<ShardIterator> iterators = iterableAsArrayList(shardIterators);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
index 4bd8fadc9309..f3b888022127 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
@@ -180,14 +180,18 @@ public void testCorruptFileAndRecover() throws InterruptedException, IOException
          */
         setReplicaCount(2, "test");
         ClusterHealthResponse health = clusterAdmin().health(
-            new ClusterHealthRequest("test").waitForGreenStatus()
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, "test").waitForGreenStatus()
                 // sometimes due to cluster rebalancing and random settings default timeout is just not enough.
                 .masterNodeTimeout(TimeValue.timeValueMinutes(5))
                 .timeout(TimeValue.timeValueMinutes(5))
                 .waitForNoRelocatingShards(true)
         ).actionGet();
         if (health.isTimedOut()) {
-            logger.info("cluster state:\n{}\n{}", clusterAdmin().prepareState().get().getState(), getClusterPendingTasks());
+            logger.info(
+                "cluster state:\n{}\n{}",
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(),
+                getClusterPendingTasks()
+            );
             assertThat("timed out waiting for green state", health.isTimedOut(), equalTo(false));
         }
         assertThat(health.getStatus(), equalTo(ClusterHealthStatus.GREEN));
@@ -288,18 +292,24 @@ public void testCorruptPrimaryNoReplica() throws ExecutionException, Interrupted
         ClusterRerouteUtils.reroute(client());
 
         boolean didClusterTurnRed = waitUntil(() -> {
-            ClusterHealthStatus test = clusterAdmin().health(new ClusterHealthRequest("test")).actionGet().getStatus();
+            ClusterHealthStatus test = clusterAdmin().health(new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, "test"))
+                .actionGet()
+                .getStatus();
             return test == ClusterHealthStatus.RED;
         }, 5, TimeUnit.MINUTES);// sometimes on slow nodes the replication / recovery is just dead slow
 
-        final ClusterHealthResponse response = clusterAdmin().health(new ClusterHealthRequest("test")).get();
+        final ClusterHealthResponse response = clusterAdmin().health(new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, "test")).get();
 
         if (response.getStatus() != ClusterHealthStatus.RED) {
             logger.info("Cluster turned red in busy loop: {}", didClusterTurnRed);
-            logger.info("cluster state:\n{}\n{}", clusterAdmin().prepareState().get().getState(), getClusterPendingTasks());
+            logger.info(
+                "cluster state:\n{}\n{}",
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(),
+                getClusterPendingTasks()
+            );
         }
         assertThat(response.getStatus(), is(ClusterHealthStatus.RED));
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         GroupShardsIterator<ShardIterator> shardIterators = state.getRoutingTable()
             .activePrimaryShardsGrouped(new String[] { "test" }, false);
         for (ShardIterator iterator : shardIterators) {
@@ -509,7 +519,7 @@ public void onTimeout(TimeValue timeout) {
     }
 
     private void assertThatAllShards(String index, Consumer<IndexShardRoutingTable> verifier) {
-        var clusterStateResponse = clusterAdmin().state(new ClusterStateRequest().routingTable(true)).actionGet();
+        var clusterStateResponse = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).routingTable(true)).actionGet();
         var indexRoutingTable = clusterStateResponse.getState().getRoutingTable().index(index);
         for (int shardId = 0; shardId < indexRoutingTable.size(); shardId++) {
             verifier.accept(indexRoutingTable.shard(shardId));
@@ -655,7 +665,7 @@ public void testReplicaCorruption() throws Exception {
     }
 
     private int numShards(String... index) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         GroupShardsIterator<?> shardIterators = state.getRoutingTable().activePrimaryShardsGrouped(index, false);
         return shardIterators.size();
     }
@@ -682,7 +692,7 @@ private ShardRouting corruptRandomPrimaryFile() throws IOException {
     }
 
     private ShardRouting corruptRandomPrimaryFile(final boolean includePerCommitFiles) throws IOException {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         Index test = state.metadata().index("test").getIndex();
         GroupShardsIterator<ShardIterator> shardIterators = state.getRoutingTable()
             .activePrimaryShardsGrouped(new String[] { "test" }, false);
@@ -738,7 +748,7 @@ private static boolean isPerSegmentFile(String fileName) {
 
     public List<Path> listShardFiles(ShardRouting routing) throws IOException {
         NodesStatsResponse nodeStatses = clusterAdmin().prepareNodesStats(routing.currentNodeId()).setFs(true).get();
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final Index test = state.metadata().index("test").getIndex();
         assertThat(routing.toString(), nodeStatses.getNodes().size(), equalTo(1));
         List<Path> files = new ArrayList<>();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java
index 143ffedeefc5..45b9091ab255 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java
@@ -144,7 +144,7 @@ private SearchRequestBuilder addSuggestions(SearchRequestBuilder request, int i)
     }
 
     private Set<String> nodeIdsWithIndex(String... indices) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         GroupShardsIterator<ShardIterator> allAssignedShardsGrouped = state.routingTable().allAssignedShardsGrouped(indices, true);
         Set<String> nodes = new HashSet<>();
         for (ShardIterator shardIterator : allAssignedShardsGrouped) {
@@ -159,7 +159,7 @@ private Set<String> nodeIdsWithIndex(String... indices) {
     }
 
     protected int numAssignedShards(String... indices) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         GroupShardsIterator<?> allAssignedShardsGrouped = state.routingTable().allAssignedShardsGrouped(indices, true);
         return allAssignedShardsGrouped.size();
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java
index 5c4cdc8cde85..8ea707c0a26b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java
@@ -58,7 +58,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
         CreateIndexResponse createIndexResponse = indicesAdmin().create(new CreateIndexRequest("test").settings(settings)).actionGet();
         assertAcked(createIndexResponse);
 
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         RoutingNode routingNodeEntry1 = clusterState.getRoutingNodes().node(node1);
         assertThat(routingNodeEntry1.numberOfShardsWithState(STARTED), equalTo(11));
 
@@ -68,7 +68,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
 
         // first wait for 2 nodes in the cluster
         logger.info("Waiting for replicas to be assigned");
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForGreenStatus()
             .setWaitForNodes("2")
             .setWaitForNoRelocatingShards(true)
@@ -83,7 +83,9 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
         ClusterRerouteUtils.reroute(client());
 
         clusterHealth = clusterAdmin().health(
-            new ClusterHealthRequest(new String[] {}).waitForGreenStatus().waitForNodes("2").waitForNoRelocatingShards(true)
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForGreenStatus()
+                .waitForNodes("2")
+                .waitForNoRelocatingShards(true)
         ).actionGet();
         assertThat(clusterHealth.isTimedOut(), equalTo(false));
         assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN));
@@ -94,7 +96,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
         assertThat(clusterHealth.getActiveShards(), equalTo(22));
         assertThat(clusterHealth.getActivePrimaryShards(), equalTo(11));
 
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertNodesPresent(clusterState.getRoutingNodes(), node1, node2);
         routingNodeEntry1 = clusterState.getRoutingNodes().node(node1);
         assertThat(routingNodeEntry1.numberOfShardsWithState(RELOCATING), equalTo(0));
@@ -109,7 +111,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
 
         // first wait for 3 nodes in the cluster
         logger.info("Waiting for replicas to be assigned");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForGreenStatus()
             .setWaitForNodes("3")
             .setWaitForNoRelocatingShards(true)
@@ -123,7 +125,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
         // explicitly call reroute, so shards will get relocated to the new node (we delay it in ES in case other nodes join)
         ClusterRerouteUtils.reroute(client());
 
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForGreenStatus()
             .setWaitForNodes("3")
             .setWaitForNoRelocatingShards(true)
@@ -138,7 +140,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
         assertThat(clusterHealth.getActiveShards(), equalTo(22));
         assertThat(clusterHealth.getActivePrimaryShards(), equalTo(11));
 
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertNodesPresent(clusterState.getRoutingNodes(), node1, node2, node3);
 
         routingNodeEntry1 = clusterState.getRoutingNodes().node(node1);
@@ -165,7 +167,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
         internalCluster().stopNode(server_1);
         // verify health
         logger.info("Running Cluster Health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForGreenStatus()
             .setWaitForNodes("2")
             .setWaitForNoRelocatingShards(true)
@@ -177,7 +179,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
 
         ClusterRerouteUtils.reroute(client());
 
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForGreenStatus()
             .setWaitForNodes("2")
             .setWaitForNoRelocatingShards(true)
@@ -189,7 +191,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
         assertThat(clusterHealth.getActiveShards(), equalTo(22));
         assertThat(clusterHealth.getActivePrimaryShards(), equalTo(11));
 
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertNodesPresent(clusterState.getRoutingNodes(), node3, node2);
         routingNodeEntry2 = clusterState.getRoutingNodes().node(node2);
         routingNodeEntry3 = clusterState.getRoutingNodes().node(node3);
@@ -207,7 +209,7 @@ public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception {
         AcknowledgedResponse deleteIndexResponse = indicesAdmin().prepareDelete("test").get();
         assertThat(deleteIndexResponse.isAcknowledged(), equalTo(true));
 
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertNodesPresent(clusterState.getRoutingNodes(), node3, node2);
         routingNodeEntry2 = clusterState.getRoutingNodes().node(node2);
         assertThat(routingNodeEntry2.isEmpty(), equalTo(true));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
index fb22aaa3747c..69e982a30b35 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
@@ -177,7 +177,7 @@ public void testCreateIndexWithDateMathExpression() {
             assertEquals(dateMathExp3, response.getSetting(index3, IndexMetadata.SETTING_INDEX_PROVIDED_NAME));
         });
 
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().index(index1), notNullValue());
         assertThat(clusterState.metadata().index(index2), notNullValue());
         assertThat(clusterState.metadata().index(index3), notNullValue());
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java
index e9e88a2d6b76..325cd27f0090 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java
@@ -97,7 +97,7 @@ public void beforeIndexCreated(Index index, Settings indexSettings) {
             fail("should have thrown an exception during creation");
         } catch (Exception e) {
             assertTrue(e.getMessage().contains("failing on purpose"));
-            assertFalse(clusterAdmin().prepareState().get().getState().routingTable().hasIndex("failed"));
+            assertFalse(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().routingTable().hasIndex("failed"));
         }
     }
 
@@ -120,7 +120,7 @@ public void beforeIndexCreated(Index index, Settings indexSettings) {
         ClusterRerouteUtils.reroute(client(), new MoveAllocationCommand("index1", 0, node1, node2));
         ensureGreen("index1");
 
-        var state = clusterAdmin().prepareState().get().getState();
+        var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         logger.info("Final routing is {}", state.getRoutingNodes().toString());
         var shard = state.routingTable().index("index1").shard(0).primaryShard();
         assertThat(shard, notNullValue());
@@ -148,13 +148,13 @@ public void beforeIndexCreated(Index index, Settings indexSettings) {
 
         // await all relocation attempts are exhausted
         assertBusy(() -> {
-            var state = clusterAdmin().prepareState().get().getState();
+            var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             var shard = state.routingTable().index("index1").shard(0).primaryShard();
             assertThat(shard, notNullValue());
             assertThat(shard.relocationFailureInfo().failedRelocations(), equalTo(maxAttempts));
         });
         // ensure the shard remain started
-        var state = clusterAdmin().prepareState().get().getState();
+        var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         logger.info("Final routing is {}", state.getRoutingNodes().toString());
         var shard = state.routingTable().index("index1").shard(0).primaryShard();
         assertThat(shard, notNullValue());
@@ -177,7 +177,7 @@ public void testIndexStateShardChanged() throws Throwable {
             fail("should have thrown an exception");
         } catch (ElasticsearchException e) {
             assertTrue(e.getMessage().contains("failing on purpose"));
-            ClusterStateResponse resp = clusterAdmin().prepareState().get();
+            ClusterStateResponse resp = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
             assertFalse(resp.getState().routingTable().indicesRouting().keySet().contains("failed"));
         }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ResolveClusterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ResolveClusterIT.java
index c4be9568f8ba..1ca8fb315b09 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ResolveClusterIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ResolveClusterIT.java
@@ -677,7 +677,7 @@ private Map<String, Object> setupThreeClusters(boolean useAlias) throws IOExcept
         assertFalse(
             client(REMOTE_CLUSTER_1).admin()
                 .cluster()
-                .prepareHealth(remoteIndex1)
+                .prepareHealth(TEST_REQUEST_TIMEOUT, remoteIndex1)
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
@@ -715,7 +715,7 @@ private Map<String, Object> setupThreeClusters(boolean useAlias) throws IOExcept
         assertFalse(
             client(REMOTE_CLUSTER_2).admin()
                 .cluster()
-                .prepareHealth(remoteIndex2)
+                .prepareHealth(TEST_REQUEST_TIMEOUT, remoteIndex2)
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ShardLockFailureIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ShardLockFailureIT.java
index 28e89f459055..d263a9d65889 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ShardLockFailureIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ShardLockFailureIT.java
@@ -106,7 +106,7 @@ public void assertMatched() {}
             updateIndexSettings(Settings.builder().putNull(IndexMetadata.INDEX_ROUTING_EXCLUDE_GROUP_PREFIX + "._name"), indexName);
             ensureYellow(indexName);
             assertTrue(countDownLatch.await(30, TimeUnit.SECONDS));
-            assertEquals(ClusterHealthStatus.YELLOW, clusterAdmin().prepareHealth(indexName).get().getStatus());
+            assertEquals(ClusterHealthStatus.YELLOW, clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).get().getStatus());
             mockLog.assertAllExpectationsMatched();
         }
 
@@ -153,7 +153,7 @@ public void testShardLockTimeout() throws Exception {
 
             updateIndexSettings(Settings.builder().putNull(IndexMetadata.INDEX_ROUTING_EXCLUDE_GROUP_PREFIX + "._name"), indexName);
             assertBusy(mockLog::assertAllExpectationsMatched);
-            final var clusterHealthResponse = clusterAdmin().prepareHealth(indexName)
+            final var clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .setWaitForNoInitializingShards(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java
index 937addb473f8..c80f13861e83 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.indices.mapping;
 
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.MapperParsingException;
@@ -33,6 +34,8 @@ protected boolean forbidPrivateIndexSettings() {
      * contains unknown parameters. We were able to create those templates in 7.x still, so we need
      * to be able to index new documents into them. Indexing should issue a deprecation warning though.
      */
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this is testing 7.x specific compatibility which may be n/a now after 9.0 bump")
     public void testBWCMalformedDynamicTemplate() {
         // this parameter is not supported by "keyword" field type
         String mapping = """
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java
index 720f48754519..57f09e1ed2bb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java
@@ -62,7 +62,7 @@ public void testSimpleGetMappings() throws Exception {
         indicesAdmin().prepareCreate("indexa").setMapping(getMappingForType()).get();
         indicesAdmin().prepareCreate("indexb").setMapping(getMappingForType()).get();
 
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
index 0008ec1f9cbd..3d240627cf23 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
@@ -62,7 +62,7 @@ public void testDynamicUpdates() throws Exception {
         indicesAdmin().prepareCreate("test")
             .setSettings(indexSettings(1, 0).put(MapperService.INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING.getKey(), Long.MAX_VALUE))
             .get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
         updateClusterSettings(
             Settings.builder().put(MappingUpdatedAction.INDICES_MAPPING_DYNAMIC_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMinutes(5))
         );
@@ -100,7 +100,7 @@ public void testUpdateMappingWithoutType() {
         indicesAdmin().prepareCreate("test").setSettings(indexSettings(1, 0)).setMapping("""
             {"properties":{"body":{"type":"text"}}}
             """).get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         AcknowledgedResponse putMappingResponse = indicesAdmin().preparePutMapping("test").setSource("""
             {"properties":{"date":{"type":"integer"}}}
@@ -115,7 +115,7 @@ public void testUpdateMappingWithoutType() {
 
     public void testUpdateMappingWithoutTypeMultiObjects() {
         createIndex("test", 1, 0);
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         AcknowledgedResponse putMappingResponse = indicesAdmin().preparePutMapping("test").setSource("""
             {"properties":{"date":{"type":"integer"}}}""", XContentType.JSON).get();
@@ -131,7 +131,7 @@ public void testUpdateMappingWithConflicts() {
         indicesAdmin().prepareCreate("test").setSettings(indexSettings(2, 0)).setMapping("""
             {"properties":{"body":{"type":"text"}}}
             """).get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         try {
             indicesAdmin().preparePutMapping("test").setSource("""
@@ -163,7 +163,7 @@ public void testUpdateMappingWithNormsConflicts() {
     public void testUpdateMappingNoChanges() {
         indicesAdmin().prepareCreate("test").setSettings(indexSettings(2, 0)).setMapping("""
             {"properties":{"body":{"type":"text"}}}""").get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         AcknowledgedResponse putMappingResponse = indicesAdmin().preparePutMapping("test").setSource("""
             {"_doc":{"properties":{"body":{"type":"text"}}}}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java
index 705fb879e912..e547ae5a46de 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java
@@ -319,7 +319,7 @@ public void testCanResetUnreasonableSettings() {
         reset();
 
         assertThat(
-            clusterAdmin().prepareState()
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .get()
                 .getState()
                 .metadata()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/HierarchyCircuitBreakerTelemetryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/HierarchyCircuitBreakerTelemetryIT.java
index ff2117ea93bb..56fcb3c1d123 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/HierarchyCircuitBreakerTelemetryIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/HierarchyCircuitBreakerTelemetryIT.java
@@ -63,7 +63,12 @@ public void testCircuitBreakerTripCountMetric() {
             // NOTE: we start with empty circuitBreakerSettings to allow cluster formation
             masterNodeName = internalCluster().startMasterOnlyNode(Settings.EMPTY);
             dataNodeName = internalCluster().startDataOnlyNode(Settings.EMPTY);
-            assertTrue(clusterAdmin().prepareUpdateSettings().setPersistentSettings(circuitBreakerSettings).get().isAcknowledged());
+            assertTrue(
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                    .setPersistentSettings(circuitBreakerSettings)
+                    .get()
+                    .isAcknowledged()
+            );
             assertTrue(
                 client().admin()
                     .indices()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/DanglingIndicesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/DanglingIndicesIT.java
index 0b9ca9d9f958..a51f4bb10dc0 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/DanglingIndicesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/DanglingIndicesIT.java
@@ -325,7 +325,7 @@ public void testDanglingIndicesImportedAndDeletedCannotBeReimported() throws Exc
             }
         }
 
-        final Metadata metadata = clusterAdmin().prepareState().clear().setMetadata(true).get().getState().metadata();
+        final Metadata metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setMetadata(true).get().getState().metadata();
         assertTrue(metadata.indexGraveyard().toString(), metadata.indexGraveyard().containsIndex(new Index(INDEX_NAME, danglingIndexUUID)));
         assertNull(Strings.toString(metadata, true, true), metadata.index(INDEX_NAME));
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java
index a9e06fe438c4..64f594c488a5 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java
@@ -53,7 +53,7 @@ public void run() {
         };
         indexingThread.start();
 
-        ClusterState initialState = clusterAdmin().prepareState().get().getState();
+        ClusterState initialState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         DiscoveryNode[] dataNodes = initialState.getNodes().getDataNodes().values().toArray(DiscoveryNode[]::new);
         DiscoveryNode relocationSource = initialState.getNodes()
             .getDataNodes()
@@ -65,7 +65,7 @@ public void run() {
             }
             logger.info("--> [iteration {}] relocating from {} to {} ", i, relocationSource.getName(), relocationTarget.getName());
             ClusterRerouteUtils.reroute(client(), new MoveAllocationCommand("test", 0, relocationSource.getId(), relocationTarget.getId()));
-            ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+            ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setTimeout(TimeValue.timeValueSeconds(60))
                 .setWaitForEvents(Priority.LANGUID)
                 .setWaitForNoRelocatingShards(true)
@@ -77,7 +77,7 @@ public void run() {
                     "timed out waiting for relocation iteration [" + i + "]",
                     ReferenceDocs.LOGGING
                 );
-                final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+                final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
                 logger.info("timed out for waiting for relocation iteration [{}] \ncluster state {}", i, clusterState);
                 finished.set(true);
                 indexingThread.join();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
index fbbeec4b4e9b..abeaf8422748 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
@@ -523,7 +523,7 @@ public Settings onNodeStopped(String nodeName) throws Exception {
         transportService.clearAllRules();
 
         // make sure nodeA has primary and nodeB has replica
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<ShardRouting> startedShards = RoutingNodesHelper.shardsWithState(state.getRoutingNodes(), ShardRoutingState.STARTED);
         assertThat(startedShards.size(), equalTo(2));
         for (ShardRouting shardRouting : startedShards) {
@@ -635,7 +635,7 @@ public void testRerouteRecovery() throws Exception {
 
         logger.info("--> start node C");
         String nodeC = internalCluster().startNode();
-        assertFalse(clusterAdmin().prepareHealth().setWaitForNodes("3").get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("3").get().isTimedOut());
 
         logger.info("--> slowing down recoveries");
         throttleRecovery10Seconds(shardSize);
@@ -1118,7 +1118,7 @@ public void testOngoingRecoveryAndMasterFailOver() throws Exception {
                 Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 2).putNull("index.routing.allocation.include._name"),
                 indexName
             );
-            assertFalse(clusterAdmin().prepareHealth(indexName).setWaitForActiveShards(2).get().isTimedOut());
+            assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).setWaitForActiveShards(2).get().isTimedOut());
         } finally {
             allowToCompletePhase1Latch.countDown();
         }
@@ -1261,7 +1261,7 @@ public void testUsesFileBasedRecoveryIfRetentionLeaseMissing() throws Exception
                 @Override
                 public Settings onNodeStopped(String nodeName) throws Exception {
                     assertFalse(
-                        clusterAdmin().prepareHealth()
+                        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                             .setWaitForNodes(Integer.toString(discoveryNodes.getSize() - 1))
                             .setWaitForEvents(Priority.LANGUID)
                             .get()
@@ -1325,7 +1325,7 @@ public void testUsesFileBasedRecoveryIfRetentionLeaseAheadOfGlobalCheckpoint() t
                 @Override
                 public Settings onNodeStopped(String nodeName) throws Exception {
                     assertFalse(
-                        clusterAdmin().prepareHealth()
+                        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                             .setWaitForNodes(Integer.toString(discoveryNodes.getSize() - 1))
                             .setWaitForEvents(Priority.LANGUID)
                             .get()
@@ -1432,7 +1432,7 @@ public void testUsesFileBasedRecoveryIfOperationsBasedRecoveryWouldBeUnreasonabl
                 @Override
                 public Settings onNodeStopped(String nodeName) throws Exception {
                     assertFalse(
-                        clusterAdmin().prepareHealth()
+                        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                             .setWaitForNodes(Integer.toString(discoveryNodes.getSize() - 1))
                             .setWaitForEvents(Priority.LANGUID)
                             .get()
@@ -1657,7 +1657,7 @@ public void testPeerRecoveryTrimsLocalTranslog() throws Exception {
         String indexName = "test-index";
         createIndex(indexName, indexSettings(1, 1).put("index.routing.allocation.include._name", String.join(",", dataNodes)).build());
         ensureGreen(indexName);
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         DiscoveryNode nodeWithOldPrimary = clusterState.nodes()
             .get(clusterState.routingTable().index(indexName).shard(0).primaryShard().currentNodeId());
         final var transportService = MockTransportService.getInstance(nodeWithOldPrimary.getName());
@@ -1731,7 +1731,7 @@ public void testReservesBytesDuringPeerRecoveryPhaseOne() throws Exception {
         indexRandom(randomBoolean(), true, true, indexRequests);
         assertThat(indicesAdmin().prepareFlush(indexName).get().getFailedShards(), equalTo(0));
 
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         DiscoveryNode nodeWithPrimary = clusterState.nodes()
             .get(clusterState.routingTable().index(indexName).shard(0).primaryShard().currentNodeId());
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/ReplicaToPrimaryPromotionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/ReplicaToPrimaryPromotionIT.java
index 8595f11bae42..25ac384a2291 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/ReplicaToPrimaryPromotionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/ReplicaToPrimaryPromotionIT.java
@@ -55,7 +55,11 @@ public void testPromoteReplicaToPrimary() throws Exception {
         }
 
         // pick up a data node that contains a random primary shard
-        ClusterState state = client(internalCluster().getMasterName()).admin().cluster().prepareState().get().getState();
+        ClusterState state = client(internalCluster().getMasterName()).admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState();
         final int numShards = state.metadata().index(indexName).getNumberOfShards();
         final ShardRouting primaryShard = state.routingTable().index(indexName).shard(randomIntBetween(0, numShards - 1)).primaryShard();
         final DiscoveryNode randomNode = state.nodes().resolveNode(primaryShard.currentNodeId());
@@ -64,7 +68,7 @@ public void testPromoteReplicaToPrimary() throws Exception {
         internalCluster().stopNode(randomNode.getName());
         ensureYellowAndNoInitializingShards(indexName);
 
-        state = client(internalCluster().getMasterName()).admin().cluster().prepareState().get().getState();
+        state = client(internalCluster().getMasterName()).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final IndexRoutingTable indexRoutingTable = state.routingTable().index(indexName);
         for (int i = 0; i < indexRoutingTable.size(); i++) {
             for (ShardRouting shardRouting : indexRoutingTable.shard(i).activeShards()) {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsServiceIT.java
index 2f336f25c3ca..d117373b58f0 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsServiceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/plan/ShardSnapshotsServiceIT.java
@@ -284,7 +284,7 @@ private ShardSnapshotsService getShardSnapshotsService() {
     }
 
     private ShardId getShardIdForIndex(String indexName) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         return state.routingTable().index(indexName).shard(0).shardId();
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
index 67482ad73367..606b694cbfeb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
@@ -36,7 +36,7 @@ public void testSimpleUpdateNumberOfReplicas() throws Exception {
         logger.info("Creating index test");
         assertAcked(prepareCreate("test", 2));
         logger.info("Running Cluster Health");
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .get();
@@ -62,11 +62,16 @@ public void testSimpleUpdateNumberOfReplicas() throws Exception {
             assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 10L);
         }
 
-        final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
         logger.info("Increasing the number of replicas from 1 to 2");
         setReplicaCount(2, "test");
         logger.info("Running Cluster Health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForYellowStatus()
             .setWaitForActiveShards(numShards.numPrimaries * 2)
@@ -79,7 +84,7 @@ public void testSimpleUpdateNumberOfReplicas() throws Exception {
         // only 2 copies allocated (1 replica) across 2 nodes
         assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries * 2));
 
-        final long afterReplicaIncreaseSettingsVersion = clusterAdmin().prepareState()
+        final long afterReplicaIncreaseSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -90,7 +95,7 @@ public void testSimpleUpdateNumberOfReplicas() throws Exception {
         logger.info("starting another node to new replicas will be allocated to it");
         allowNodes("test", 3);
 
-        final long afterStartingAnotherNodeVersion = clusterAdmin().prepareState()
+        final long afterStartingAnotherNodeVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -98,7 +103,7 @@ public void testSimpleUpdateNumberOfReplicas() throws Exception {
             .getSettingsVersion();
 
         logger.info("Running Cluster Health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForNoRelocatingShards(true)
@@ -120,7 +125,7 @@ public void testSimpleUpdateNumberOfReplicas() throws Exception {
         setReplicaCount(0, "test");
 
         logger.info("Running Cluster Health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForNoRelocatingShards(true)
@@ -138,7 +143,7 @@ public void testSimpleUpdateNumberOfReplicas() throws Exception {
             assertHitCount(prepareSearch().setQuery(matchAllQuery()), 10);
         }
 
-        final long afterReplicaDecreaseSettingsVersion = clusterAdmin().prepareState()
+        final long afterReplicaDecreaseSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -155,7 +160,7 @@ public void testAutoExpandNumberOfReplicas0ToData() throws IOException {
         NumShards numShards = getNumShards("test");
 
         logger.info("--> running cluster health");
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForActiveShards(numShards.numPrimaries * 2)
@@ -170,7 +175,7 @@ public void testAutoExpandNumberOfReplicas0ToData() throws IOException {
         if (randomBoolean()) {
             assertAcked(indicesAdmin().prepareClose("test").setWaitForActiveShards(ActiveShardCount.ALL));
 
-            clusterHealth = clusterAdmin().prepareHealth()
+            clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setWaitForGreenStatus()
                 .setWaitForActiveShards(numShards.numPrimaries * 2)
@@ -183,13 +188,18 @@ public void testAutoExpandNumberOfReplicas0ToData() throws IOException {
             assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries * 2));
         }
 
-        final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
 
         logger.info("--> add another node, should increase the number of replicas");
         allowNodes("test", 3);
 
         logger.info("--> running cluster health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForActiveShards(numShards.numPrimaries * 3)
@@ -202,7 +212,7 @@ public void testAutoExpandNumberOfReplicas0ToData() throws IOException {
         assertThat(clusterHealth.getIndices().get("test").getNumberOfReplicas(), equalTo(2));
         assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries * 3));
 
-        final long afterAddingOneNodeSettingsVersion = clusterAdmin().prepareState()
+        final long afterAddingOneNodeSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -215,7 +225,7 @@ public void testAutoExpandNumberOfReplicas0ToData() throws IOException {
         allowNodes("test", 2);
 
         logger.info("--> running cluster health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForActiveShards(numShards.numPrimaries * 2)
@@ -228,7 +238,7 @@ public void testAutoExpandNumberOfReplicas0ToData() throws IOException {
         assertThat(clusterHealth.getIndices().get("test").getNumberOfReplicas(), equalTo(1));
         assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries * 2));
 
-        final long afterClosingOneNodeSettingsVersion = clusterAdmin().prepareState()
+        final long afterClosingOneNodeSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -241,7 +251,7 @@ public void testAutoExpandNumberOfReplicas0ToData() throws IOException {
         allowNodes("test", 1);
 
         logger.info("--> running cluster health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForNodes(">=1")
@@ -254,7 +264,7 @@ public void testAutoExpandNumberOfReplicas0ToData() throws IOException {
         assertThat(clusterHealth.getIndices().get("test").getNumberOfReplicas(), equalTo(0));
         assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries));
 
-        final long afterClosingAnotherNodeSettingsVersion = clusterAdmin().prepareState()
+        final long afterClosingAnotherNodeSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -271,7 +281,7 @@ public void testAutoExpandNumberReplicas1ToData() throws IOException {
         NumShards numShards = getNumShards("test");
 
         logger.info("--> running cluster health");
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForActiveShards(numShards.numPrimaries * 2)
@@ -286,7 +296,7 @@ public void testAutoExpandNumberReplicas1ToData() throws IOException {
         if (randomBoolean()) {
             assertAcked(indicesAdmin().prepareClose("test").setWaitForActiveShards(ActiveShardCount.ALL));
 
-            clusterHealth = clusterAdmin().prepareHealth()
+            clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setWaitForGreenStatus()
                 .setWaitForActiveShards(numShards.numPrimaries * 2)
@@ -299,12 +309,17 @@ public void testAutoExpandNumberReplicas1ToData() throws IOException {
             assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries * 2));
         }
 
-        final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
         logger.info("--> add another node, should increase the number of replicas");
         allowNodes("test", 3);
 
         logger.info("--> running cluster health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForActiveShards(numShards.numPrimaries * 3)
@@ -316,7 +331,7 @@ public void testAutoExpandNumberReplicas1ToData() throws IOException {
         assertThat(clusterHealth.getIndices().get("test").getNumberOfReplicas(), equalTo(2));
         assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries * 3));
 
-        final long afterAddingOneNodeSettingsVersion = clusterAdmin().prepareState()
+        final long afterAddingOneNodeSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -329,7 +344,7 @@ public void testAutoExpandNumberReplicas1ToData() throws IOException {
         allowNodes("test", 2);
 
         logger.info("--> running cluster health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForNodes(">=2")
@@ -342,7 +357,7 @@ public void testAutoExpandNumberReplicas1ToData() throws IOException {
         assertThat(clusterHealth.getIndices().get("test").getNumberOfReplicas(), equalTo(1));
         assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries * 2));
 
-        final long afterClosingOneNodeSettingsVersion = clusterAdmin().prepareState()
+        final long afterClosingOneNodeSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -355,7 +370,7 @@ public void testAutoExpandNumberReplicas1ToData() throws IOException {
         allowNodes("test", 1);
 
         logger.info("--> running cluster health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForYellowStatus()
             .setWaitForNodes(">=1")
@@ -376,7 +391,7 @@ public void testAutoExpandNumberReplicas2() {
         NumShards numShards = getNumShards("test");
 
         logger.info("--> running cluster health");
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForActiveShards(numShards.numPrimaries * 3)
@@ -392,12 +407,17 @@ public void testAutoExpandNumberReplicas2() {
         allowNodes("test", 4);
         allowNodes("test", 5);
 
-        final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
         logger.info("--> update the auto expand replicas to 0-3");
         updateIndexSettings(Settings.builder().put("auto_expand_replicas", "0-3"), "test");
 
         logger.info("--> running cluster health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
             .setWaitForActiveShards(numShards.numPrimaries * 4)
@@ -414,14 +434,19 @@ public void testAutoExpandNumberReplicas2() {
          * time from the number of replicas changed by the allocation service.
          */
         assertThat(
-            clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").getSettingsVersion(),
             equalTo(1 + 1 + settingsVersion)
         );
     }
 
     public void testUpdateWithInvalidNumberOfReplicas() {
         createIndex("test");
-        final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
         final int value = randomIntBetween(-10, -1);
         try {
             indicesAdmin().prepareUpdateSettings("test")
@@ -431,7 +456,7 @@ public void testUpdateWithInvalidNumberOfReplicas() {
         } catch (IllegalArgumentException e) {
             assertEquals("Failed to parse value [" + value + "] for setting [index.number_of_replicas] must be >= 0", e.getMessage());
             assertThat(
-                clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion(),
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").getSettingsVersion(),
                 equalTo(settingsVersion)
             );
         }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java
index 6e58d275e578..20089cd463bf 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java
@@ -64,7 +64,7 @@ public void testInvalidDynamicUpdate() {
             indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.dummy", "boom"))
         );
         assertEquals(exception.getCause().getMessage(), "this setting goes boom");
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertNotEquals(indexMetadata.getSettings().get("index.dummy"), "invalid dynamic value");
     }
 
@@ -141,44 +141,48 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
     public void testUpdateDependentClusterSettings() {
         IllegalArgumentException iae = expectThrows(
             IllegalArgumentException.class,
-            clusterAdmin().prepareUpdateSettings().setPersistentSettings(Settings.builder().put("cluster.acc.test.pw", "asdf"))
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(Settings.builder().put("cluster.acc.test.pw", "asdf"))
         );
         assertEquals("missing required setting [cluster.acc.test.user] for setting [cluster.acc.test.pw]", iae.getMessage());
 
         iae = expectThrows(
             IllegalArgumentException.class,
-            clusterAdmin().prepareUpdateSettings().setTransientSettings(Settings.builder().put("cluster.acc.test.pw", "asdf"))
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setTransientSettings(Settings.builder().put("cluster.acc.test.pw", "asdf"))
         );
         assertEquals("missing required setting [cluster.acc.test.user] for setting [cluster.acc.test.pw]", iae.getMessage());
 
         iae = expectThrows(
             IllegalArgumentException.class,
-            clusterAdmin().prepareUpdateSettings()
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setTransientSettings(Settings.builder().put("cluster.acc.test.pw", "asdf"))
                 .setPersistentSettings(Settings.builder().put("cluster.acc.test.user", "asdf"))
         );
         assertEquals("missing required setting [cluster.acc.test.user] for setting [cluster.acc.test.pw]", iae.getMessage());
 
         if (randomBoolean()) {
-            clusterAdmin().prepareUpdateSettings()
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setTransientSettings(Settings.builder().put("cluster.acc.test.pw", "asdf").put("cluster.acc.test.user", "asdf"))
                 .get();
             iae = expectThrows(
                 IllegalArgumentException.class,
-                clusterAdmin().prepareUpdateSettings().setTransientSettings(Settings.builder().putNull("cluster.acc.test.user"))
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                    .setTransientSettings(Settings.builder().putNull("cluster.acc.test.user"))
             );
             assertEquals("missing required setting [cluster.acc.test.user] for setting [cluster.acc.test.pw]", iae.getMessage());
-            clusterAdmin().prepareUpdateSettings()
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setTransientSettings(Settings.builder().putNull("cluster.acc.test.pw").putNull("cluster.acc.test.user"))
                 .get();
         } else {
-            clusterAdmin().prepareUpdateSettings()
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setPersistentSettings(Settings.builder().put("cluster.acc.test.pw", "asdf").put("cluster.acc.test.user", "asdf"))
                 .get();
 
             iae = expectThrows(
                 IllegalArgumentException.class,
-                clusterAdmin().prepareUpdateSettings().setPersistentSettings(Settings.builder().putNull("cluster.acc.test.user"))
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                    .setPersistentSettings(Settings.builder().putNull("cluster.acc.test.user"))
             );
             assertEquals("missing required setting [cluster.acc.test.user] for setting [cluster.acc.test.pw]", iae.getMessage());
 
@@ -230,7 +234,7 @@ public void testResetDefaultWithWildcard() {
         createIndex("test");
 
         indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.refresh_interval", -1)).get();
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertEquals(indexMetadata.getSettings().get("index.refresh_interval"), "-1");
         for (IndicesService service : internalCluster().getInstances(IndicesService.class)) {
             IndexService indexService = service.indexService(resolveIndex("test"));
@@ -239,7 +243,7 @@ public void testResetDefaultWithWildcard() {
             }
         }
         indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().putNull("index.ref*")).get();
-        indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertNull(indexMetadata.getSettings().get("index.refresh_interval"));
         for (IndicesService service : internalCluster().getInstances(IndicesService.class)) {
             IndexService indexService = service.indexService(resolveIndex("test"));
@@ -259,7 +263,7 @@ public void testResetDefault() {
                     .put("index.translog.generation_threshold_size", "4096b")
             )
             .get();
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertEquals(indexMetadata.getSettings().get("index.refresh_interval"), "-1");
         for (IndicesService service : internalCluster().getInstances(IndicesService.class)) {
             IndexService indexService = service.indexService(resolveIndex("test"));
@@ -270,7 +274,7 @@ public void testResetDefault() {
             }
         }
         indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().putNull("index.refresh_interval")).get();
-        indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertNull(indexMetadata.getSettings().get("index.refresh_interval"));
         for (IndicesService service : internalCluster().getInstances(IndicesService.class)) {
             IndexService indexService = service.indexService(resolveIndex("test"));
@@ -303,7 +307,7 @@ public void testOpenCloseUpdateSettings() throws Exception {
                         .put("index.final", "no")
                 ) // this one can't
         );
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertThat(indexMetadata.getSettings().get("index.refresh_interval"), nullValue());
         assertThat(indexMetadata.getSettings().get("index.fielddata.cache"), nullValue());
         assertThat(indexMetadata.getSettings().get("index.final"), nullValue());
@@ -318,7 +322,7 @@ public void testOpenCloseUpdateSettings() throws Exception {
             .setSettings(Settings.builder().put("index.refresh_interval", -1)) // this one can change
             .get();
 
-        indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertThat(indexMetadata.getSettings().get("index.refresh_interval"), equalTo("-1"));
         // Now verify via dedicated get settings api:
         getSettingsResponse = indicesAdmin().prepareGetSettings("test").get();
@@ -327,7 +331,7 @@ public void testOpenCloseUpdateSettings() throws Exception {
         // now close the index, change the non dynamic setting, and see that it applies
 
         // Wait for the index to turn green before attempting to close it
-        ClusterHealthResponse health = clusterAdmin().prepareHealth()
+        ClusterHealthResponse health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setTimeout(TimeValue.timeValueSeconds(30))
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForGreenStatus()
@@ -338,7 +342,7 @@ public void testOpenCloseUpdateSettings() throws Exception {
 
         indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1)).get();
 
-        indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertThat(indexMetadata.getNumberOfReplicas(), equalTo(1));
 
         indicesAdmin().prepareUpdateSettings("test")
@@ -349,7 +353,7 @@ public void testOpenCloseUpdateSettings() throws Exception {
             ) // this one can't
             .get();
 
-        indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertThat(indexMetadata.getSettings().get("index.refresh_interval"), equalTo("1s"));
         assertThat(indexMetadata.getSettings().get("index.fielddata.cache"), equalTo("none"));
 
@@ -363,7 +367,7 @@ public void testOpenCloseUpdateSettings() throws Exception {
                 ) // this one really can't
         );
         assertThat(ex.getMessage(), containsString("final test setting [index.final], not updateable"));
-        indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertThat(indexMetadata.getSettings().get("index.refresh_interval"), equalTo("1s"));
         assertThat(indexMetadata.getSettings().get("index.final"), nullValue());
 
@@ -426,22 +430,42 @@ public void testSettingsVersion() {
         ensureGreen("test");
 
         {
-            final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+            final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test")
+                .getSettingsVersion();
             assertAcked(
                 indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.refresh_interval", "500ms"))
             );
-            final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+            final long newSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test")
+                .getSettingsVersion();
             assertThat(newSettingsVersion, equalTo(1 + settingsVersion));
         }
 
         {
             final boolean block = randomBoolean();
             assertAcked(indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)));
-            final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+            final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test")
+                .getSettingsVersion();
             assertAcked(
                 indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block == false))
             );
-            final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+            final long newSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test")
+                .getSettingsVersion();
             assertThat(newSettingsVersion, equalTo(1 + settingsVersion));
 
             // if the read-only block is present, remove it
@@ -458,12 +482,22 @@ public void testSettingsVersionUnchanged() {
         ensureGreen("test");
 
         {
-            final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+            final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test")
+                .getSettingsVersion();
             final String refreshInterval = indicesAdmin().prepareGetSettings("test").get().getSetting("test", "index.refresh_interval");
             assertAcked(
                 indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.refresh_interval", refreshInterval))
             );
-            final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+            final long newSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test")
+                .getSettingsVersion();
             assertThat(newSettingsVersion, equalTo(settingsVersion));
         }
 
@@ -471,9 +505,19 @@ public void testSettingsVersionUnchanged() {
             final boolean block = randomBoolean();
             assertAcked(indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)));
             // now put the same block again
-            final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+            final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test")
+                .getSettingsVersion();
             assertAcked(indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)));
-            final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+            final long newSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                .get()
+                .getState()
+                .metadata()
+                .index("test")
+                .getSettingsVersion();
             assertThat(newSettingsVersion, equalTo(settingsVersion));
 
             // if the read-only block is present, remove it
@@ -493,14 +537,24 @@ public void testSettingsVersionUnchanged() {
     public void testNumberOfReplicasSettingsVersionUnchanged() {
         createIndex("test");
 
-        final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
         final int numberOfReplicas = Integer.valueOf(
             indicesAdmin().prepareGetSettings("test").get().getSetting("test", "index.number_of_replicas")
         );
         assertAcked(
             indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", numberOfReplicas))
         );
-        final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long newSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
         assertThat(newSettingsVersion, equalTo(settingsVersion));
     }
 
@@ -512,7 +566,12 @@ public void testNumberOfReplicasSettingsVersionUnchanged() {
     public void testNumberOfReplicasSettingsVersion() {
         createIndex("test");
 
-        final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
         final int numberOfReplicas = Integer.valueOf(
             indicesAdmin().prepareGetSettings("test").get().getSetting("test", "index.number_of_replicas")
         );
@@ -520,7 +579,12 @@ public void testNumberOfReplicasSettingsVersion() {
             indicesAdmin().prepareUpdateSettings("test")
                 .setSettings(Settings.builder().put("index.number_of_replicas", 1 + numberOfReplicas))
         );
-        final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
+        final long newSettingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index("test")
+            .getSettingsVersion();
         assertThat(newSettingsVersion, equalTo(1 + settingsVersion));
     }
 
@@ -574,7 +638,7 @@ public void testNoopUpdate() {
             indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1))
         );
         assertNotSame(currentState, clusterService.state());
-        clusterAdmin().prepareHealth()
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForGreenStatus()
             .setWaitForNoInitializingShards(true)
             .setWaitForNoRelocatingShards(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java
index 6b1aafe2f9b1..5501b88d8a26 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java
@@ -47,7 +47,7 @@ public void testCloseAllRequiresName() {
     }
 
     private void assertIndexIsClosed(String... indices) {
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         for (String index : indices) {
             IndexMetadata indexMetadata = clusterStateResponse.getState().metadata().indices().get(index);
             assertNotNull(indexMetadata);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java
index d52294d7584b..3947ae6d2b57 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java
@@ -162,7 +162,7 @@ public void testCloseUnassignedIndex() throws Exception {
                 .setSettings(Settings.builder().put("index.routing.allocation.include._name", "nothing").build())
         );
 
-        final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().indices().get(indexName).getState(), is(IndexMetadata.State.OPEN));
         assertThat(clusterState.routingTable().allShards().allMatch(ShardRouting::unassigned), is(true));
 
@@ -182,7 +182,7 @@ public void testConcurrentClose() throws InterruptedException, ExecutionExceptio
             IntStream.range(0, nbDocs).mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)).collect(toList())
         );
 
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(indexName)
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName)
             .setWaitForYellowStatus()
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNoRelocatingShards(true)
@@ -243,7 +243,7 @@ public void testCloseWhileDeletingIndices() throws Exception {
             }
             indices[i] = indexName;
         }
-        assertThat(clusterAdmin().prepareState().get().getState().metadata().indices().size(), equalTo(indices.length));
+        assertThat(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().indices().size(), equalTo(indices.length));
 
         startInParallel(indices.length * 2, i -> {
             final String index = indices[i % indices.length];
@@ -285,7 +285,7 @@ public void testConcurrentClosesAndOpens() throws Exception {
 
         indexer.stopAndAwaitStopped();
 
-        final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         if (clusterState.metadata().indices().get(indexName).getState() == IndexMetadata.State.CLOSE) {
             assertIndexIsClosed(indexName);
             assertAcked(indicesAdmin().prepareOpen(indexName));
@@ -310,7 +310,7 @@ public void testCloseIndexWaitForActiveShards() throws Exception {
         ensureGreen(indexName);
 
         final CloseIndexResponse closeIndexResponse = indicesAdmin().prepareClose(indexName).get();
-        assertThat(clusterAdmin().prepareHealth(indexName).get().getStatus(), is(ClusterHealthStatus.GREEN));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).get().getStatus(), is(ClusterHealthStatus.GREEN));
         assertTrue(closeIndexResponse.isAcknowledged());
         assertTrue(closeIndexResponse.isShardsAcknowledged());
         assertThat(closeIndexResponse.getIndices().get(0), notNullValue());
@@ -532,7 +532,7 @@ private static void closeIndices(final CloseIndexRequestBuilder requestBuilder)
     }
 
     static void assertIndexIsClosed(final String... indices) {
-        final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (String index : indices) {
             final IndexMetadata indexMetadata = clusterState.metadata().indices().get(index);
             assertThat(indexMetadata.getState(), is(IndexMetadata.State.CLOSE));
@@ -555,7 +555,7 @@ static void assertIndexIsClosed(final String... indices) {
     }
 
     static void assertIndexIsOpened(final String... indices) {
-        final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (String index : indices) {
             final IndexMetadata indexMetadata = clusterState.metadata().indices().get(index);
             assertThat(indexMetadata.getState(), is(IndexMetadata.State.OPEN));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java
index a7a2af57ef81..9ec7ebcf9153 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java
@@ -49,7 +49,7 @@ public class OpenCloseIndexIT extends ESIntegTestCase {
     public void testSimpleCloseOpen() {
         Client client = client();
         createIndex("test1");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         AcknowledgedResponse closeIndexResponse = client.admin().indices().prepareClose("test1").get();
@@ -70,7 +70,7 @@ public void testSimpleOpenMissingIndex() {
     public void testOpenOneMissingIndex() {
         Client client = client();
         createIndex("test1");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
         Exception e = expectThrows(IndexNotFoundException.class, client.admin().indices().prepareOpen("test1", "test2"));
         assertThat(e.getMessage(), is("no such index [test2]"));
@@ -79,7 +79,7 @@ public void testOpenOneMissingIndex() {
     public void testOpenOneMissingIndexIgnoreMissing() {
         Client client = client();
         createIndex("test1");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
         OpenIndexResponse openIndexResponse = client.admin()
             .indices()
@@ -94,7 +94,7 @@ public void testOpenOneMissingIndexIgnoreMissing() {
     public void testCloseOpenMultipleIndices() {
         Client client = client();
         createIndex("test1", "test2", "test3");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         AcknowledgedResponse closeIndexResponse1 = client.admin().indices().prepareClose("test1").get();
@@ -116,7 +116,7 @@ public void testCloseOpenMultipleIndices() {
     public void testCloseOpenWildcard() {
         Client client = client();
         createIndex("test1", "test2", "a");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         AcknowledgedResponse closeIndexResponse = client.admin().indices().prepareClose("test*").get();
@@ -133,7 +133,7 @@ public void testCloseOpenWildcard() {
     public void testCloseOpenAll() {
         Client client = client();
         createIndex("test1", "test2", "test3");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         AcknowledgedResponse closeIndexResponse = client.admin().indices().prepareClose("_all").get();
@@ -149,7 +149,7 @@ public void testCloseOpenAll() {
     public void testCloseOpenAllWildcard() {
         Client client = client();
         createIndex("test1", "test2", "test3");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         AcknowledgedResponse closeIndexResponse = client.admin().indices().prepareClose("*").get();
@@ -175,7 +175,7 @@ public void testOpenNullIndex() {
     public void testOpenAlreadyOpenedIndex() {
         Client client = client();
         createIndex("test1");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         // no problem if we try to open an index that's already in open state
@@ -188,7 +188,7 @@ public void testOpenAlreadyOpenedIndex() {
     public void testSimpleCloseOpenAlias() {
         Client client = client();
         createIndex("test1");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         AcknowledgedResponse aliasesResponse = client.admin().indices().prepareAliases().addAlias("test1", "test1-alias").get();
@@ -207,7 +207,7 @@ public void testSimpleCloseOpenAlias() {
     public void testCloseOpenAliasMultipleIndices() {
         Client client = client();
         createIndex("test1", "test2");
-        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertThat(healthResponse.isTimedOut(), equalTo(false));
 
         AcknowledgedResponse aliasesResponse1 = client.admin().indices().prepareAliases().addAlias("test1", "test-alias").get();
@@ -240,7 +240,7 @@ public void testOpenWaitingForActiveShardsFailed() throws Exception {
         assertThat(response.isShardsAcknowledged(), equalTo(false));
         assertBusy(
             () -> assertThat(
-                client.admin().cluster().prepareState().get().getState().metadata().index("test").getState(),
+                client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test").getState(),
                 equalTo(IndexMetadata.State.OPEN)
             )
         );
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/ReopenWhileClosingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/ReopenWhileClosingIT.java
index 3c16e0f2624e..1b0b71b86f07 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/ReopenWhileClosingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/ReopenWhileClosingIT.java
@@ -159,7 +159,7 @@ private Releasable interceptVerifyShardBeforeCloseActions(final String indexPatt
     }
 
     private static void assertIndexIsBlocked(final String... indices) {
-        final ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        final ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (String index : indices) {
             assertThat(clusterState.metadata().indices().get(index).getState(), is(IndexMetadata.State.OPEN));
             assertThat(clusterState.routingTable().index(index), notNullValue());
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java
index b5448498f0ce..c62f1776178b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java
@@ -34,7 +34,7 @@ public void testSimpleOpenClose() {
 
         NumShards numShards = getNumShards("test");
 
-        ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.OPEN));
         assertThat(stateResponse.getState().routingTable().index("test").size(), equalTo(numShards.numPrimaries));
         assertEquals(
@@ -48,7 +48,7 @@ public void testSimpleOpenClose() {
         logger.info("--> closing test index...");
         assertAcked(indicesAdmin().prepareClose("test"));
 
-        stateResponse = clusterAdmin().prepareState().get();
+        stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.CLOSE));
         assertThat(stateResponse.getState().routingTable().index("test"), notNullValue());
 
@@ -66,7 +66,7 @@ public void testSimpleOpenClose() {
         logger.info("--> waiting for green status");
         ensureGreen();
 
-        stateResponse = clusterAdmin().prepareState().get();
+        stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.OPEN));
 
         assertThat(stateResponse.getState().routingTable().index("test").size(), equalTo(numShards.numPrimaries));
@@ -86,7 +86,7 @@ public void testFastCloseAfterCreateContinuesCreateAfterOpen() {
             .setSettings(Settings.builder().put("index.routing.allocation.include.tag", "no_such_node").build())
             .get();
 
-        ClusterHealthResponse health = clusterAdmin().prepareHealth("test").setWaitForNodes(">=2").get();
+        ClusterHealthResponse health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test").setWaitForNodes(">=2").get();
         assertThat(health.isTimedOut(), equalTo(false));
         assertThat(health.getStatus(), equalTo(ClusterHealthStatus.RED));
 
@@ -102,7 +102,7 @@ public void testFastCloseAfterCreateContinuesCreateAfterOpen() {
 
         NumShards numShards = getNumShards("test");
 
-        ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test").getState(), equalTo(IndexMetadata.State.OPEN));
         assertThat(stateResponse.getState().routingTable().index("test").size(), equalTo(numShards.numPrimaries));
         assertEquals(
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java
index 7ffc2539d2fa..083823523afa 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java
@@ -237,7 +237,7 @@ public void testClearAllCaches() throws Exception {
                 .setMapping("field", "type=text,fielddata=true")
         );
         ensureGreen();
-        clusterAdmin().prepareHealth().setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         prepareIndex("test").setId("1").setSource("field", "value1").get();
         prepareIndex("test").setId("2").setSource("field", "value2").get();
         indicesAdmin().prepareRefresh().get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java
index 5eeb07968ce4..58c1a30cb551 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java
@@ -98,7 +98,7 @@ public void testIndexCleanup() throws Exception {
             )
         );
         ensureGreen("test");
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         Index index = state.metadata().index("test").getIndex();
 
         logger.info("--> making sure that shard and its replica are allocated on node_1 and node_2");
@@ -110,7 +110,10 @@ public void testIndexCleanup() throws Exception {
         logger.info("--> starting node server3");
         final String node_3 = internalCluster().startNode(nonMasterNode());
         logger.info("--> running cluster_health");
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth().setWaitForNodes("4").setWaitForNoRelocatingShards(true).get();
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForNodes("4")
+            .setWaitForNoRelocatingShards(true)
+            .get();
         assertThat(clusterHealth.isTimedOut(), equalTo(false));
 
         assertThat(Files.exists(shardDirectory(node_1, index, 0)), equalTo(true));
@@ -131,7 +134,7 @@ public void testIndexCleanup() throws Exception {
         } else {
             ClusterRerouteUtils.reroute(internalCluster().client(), new MoveAllocationCommand("test", 0, node_1, node_3));
         }
-        clusterHealth = clusterAdmin().prepareHealth().setWaitForNoRelocatingShards(true).get();
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNoRelocatingShards(true).get();
         assertThat(clusterHealth.isTimedOut(), equalTo(false));
 
         assertShardDeleted(node_1, index, 0);
@@ -197,13 +200,13 @@ public void testShardCleanupIfShardDeletionAfterRelocationFailedAndIndexDeleted(
             )
         );
         ensureGreen("test");
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         Index index = state.metadata().index("test").getIndex();
         assertThat(Files.exists(shardDirectory(node_1, index, 0)), equalTo(true));
         assertThat(Files.exists(indexDirectory(node_1, index)), equalTo(true));
 
         final String node_2 = internalCluster().startDataOnlyNode(Settings.builder().build());
-        assertFalse(clusterAdmin().prepareHealth().setWaitForNodes("2").get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("2").get().isTimedOut());
 
         assertThat(Files.exists(shardDirectory(node_1, index, 0)), equalTo(true));
         assertThat(Files.exists(indexDirectory(node_1, index)), equalTo(true));
@@ -226,7 +229,7 @@ public void testShardCleanupIfShardDeletionAfterRelocationFailedAndIndexDeleted(
         logger.info("--> move shard from {} to {}, and wait for relocation to finish", node_1, node_2);
         ClusterRerouteUtils.reroute(client(), new MoveAllocationCommand("test", 0, node_1, node_2));
         shardActiveRequestSent.await();
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth().setWaitForNoRelocatingShards(true).get();
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNoRelocatingShards(true).get();
         assertThat(clusterHealth.isTimedOut(), equalTo(false));
         logClusterState();
         // delete the index. node_1 that still waits for the next cluster state update will then get the delete index next.
@@ -258,7 +261,7 @@ public void testShardsCleanup() throws Exception {
         );
         ensureGreen("test");
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         Index index = state.metadata().index("test").getIndex();
         logger.info("--> making sure that shard and its replica are allocated on node_1 and node_2");
         assertThat(Files.exists(shardDirectory(node_1, index, 0)), equalTo(true));
@@ -267,7 +270,10 @@ public void testShardsCleanup() throws Exception {
         logger.info("--> starting node server3");
         String node_3 = internalCluster().startNode();
         logger.info("--> running cluster_health");
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth().setWaitForNodes("3").setWaitForNoRelocatingShards(true).get();
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForNodes("3")
+            .setWaitForNoRelocatingShards(true)
+            .get();
         assertThat(clusterHealth.isTimedOut(), equalTo(false));
 
         logger.info("--> making sure that shard is not allocated on server3");
@@ -278,7 +284,7 @@ public void testShardsCleanup() throws Exception {
         internalCluster().stopNode(node_2);
 
         logger.info("--> running cluster_health");
-        clusterHealth = clusterAdmin().prepareHealth()
+        clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForGreenStatus()
             .setWaitForNodes("2")
             .setWaitForNoRelocatingShards(true)
@@ -325,7 +331,7 @@ public void testShardActiveElsewhereDoesNotDeleteAnother() throws Exception {
             )
         );
         assertFalse(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForNoRelocatingShards(true)
                 .setWaitForGreenStatus()
                 .setWaitForNodes("5")
@@ -344,7 +350,7 @@ public void testShardActiveElsewhereDoesNotDeleteAnother() throws Exception {
         internalCluster().stopNode(nodesToShutDown.get(1));
 
         logger.debug("--> verifying index is red");
-        ClusterHealthResponse health = clusterAdmin().prepareHealth().setWaitForNodes("3").get();
+        ClusterHealthResponse health = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("3").get();
         if (health.getStatus() != ClusterHealthStatus.RED) {
             logClusterState();
             fail("cluster didn't become red, despite of shutting 2 of 3 nodes");
@@ -362,7 +368,7 @@ public void testShardActiveElsewhereDoesNotDeleteAnother() throws Exception {
         assertBusy(() -> assertTrue(internalCluster().getInstance(IndicesService.class, node4).hasIndex(index)));
 
         // wait for 4 active shards - we should have lost one shard
-        assertFalse(clusterAdmin().prepareHealth().setWaitForActiveShards(4).get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForActiveShards(4).get().isTimedOut());
 
         // disable allocation again to control concurrency a bit and allow shard active to kick in before allocation
         updateClusterSettings(Settings.builder().put(EnableAllocationDecider.CLUSTER_ROUTING_ALLOCATION_ENABLE_SETTING.getKey(), "none"));
@@ -371,7 +377,7 @@ public void testShardActiveElsewhereDoesNotDeleteAnother() throws Exception {
 
         internalCluster().startNodes(node1DataPathSettings, node2DataPathSettings);
 
-        assertFalse(clusterAdmin().prepareHealth().setWaitForNodes("5").get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("5").get().isTimedOut());
 
         updateClusterSettings(Settings.builder().put(EnableAllocationDecider.CLUSTER_ROUTING_ALLOCATION_ENABLE_SETTING.getKey(), "all"));
 
@@ -395,7 +401,7 @@ public void testShardActiveElseWhere() throws Exception {
         ensureGreen("test");
 
         waitNoPendingTasksOnAll();
-        ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         final Index index = stateResponse.getState().metadata().index("test").getIndex();
         RoutingNode routingNode = stateResponse.getState().getRoutingNodes().node(nonMasterId);
         final int[] node2Shards = new int[routingNode.numberOfOwningShards()];
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java
index 1e1333f376e9..4051dba84588 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java
@@ -178,7 +178,7 @@ public void testSimpleIndexTemplateTests() throws Exception {
     }
 
     public void testDeleteIndexTemplate() throws Exception {
-        final int existingTemplates = admin().cluster().prepareState().get().getState().metadata().templates().size();
+        final int existingTemplates = admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().templates().size();
         logger.info("--> put template_1 and template_2");
         indicesAdmin().preparePutTemplate("template_1")
             .setPatterns(Collections.singletonList("te*"))
@@ -223,7 +223,7 @@ public void testDeleteIndexTemplate() throws Exception {
         logger.info("--> explicitly delete template_1");
         indicesAdmin().prepareDeleteTemplate("template_1").get();
 
-        ClusterState state = admin().cluster().prepareState().get().getState();
+        ClusterState state = admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         assertThat(state.metadata().templates().size(), equalTo(1 + existingTemplates));
         assertThat(state.metadata().templates().containsKey("template_2"), equalTo(true));
@@ -254,11 +254,14 @@ public void testDeleteIndexTemplate() throws Exception {
 
         logger.info("--> delete template*");
         indicesAdmin().prepareDeleteTemplate("template*").get();
-        assertThat(admin().cluster().prepareState().get().getState().metadata().templates().size(), equalTo(existingTemplates));
+        assertThat(
+            admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().templates().size(),
+            equalTo(existingTemplates)
+        );
 
         logger.info("--> delete * with no templates, make sure we don't get a failure");
         indicesAdmin().prepareDeleteTemplate("*").get();
-        assertThat(admin().cluster().prepareState().get().getState().metadata().templates().size(), equalTo(0));
+        assertThat(admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().templates().size(), equalTo(0));
     }
 
     public void testThatGetIndexTemplatesWorks() throws Exception {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestAsyncProcessorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestAsyncProcessorIT.java
index 2e515b07b59a..828c02a2ba89 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestAsyncProcessorIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestAsyncProcessorIT.java
@@ -14,10 +14,7 @@
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.plugins.IngestPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
@@ -56,8 +53,7 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
 
     public void testAsyncProcessorImplementation() {
         // A pipeline with 2 processors: the test async processor and sync test processor.
-        BytesReference pipelineBody = new BytesArray("{\"processors\": [{\"test-async\": {}, \"test\": {}}]}");
-        clusterAdmin().putPipeline(new PutPipelineRequest("_id", pipelineBody, XContentType.JSON)).actionGet();
+        putJsonPipeline("_id", "{\"processors\": [{\"test-async\": {}, \"test\": {}}]}");
 
         BulkRequest bulkRequest = new BulkRequest();
         int numDocs = randomIntBetween(8, 256);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java
index 9fd7aaabaf2f..4b26240d8165 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java
@@ -16,13 +16,12 @@
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.ingest.DeletePipelineRequest;
 import org.elasticsearch.action.ingest.GetPipelineResponse;
 import org.elasticsearch.action.ingest.PutPipelineRequest;
+import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.action.ingest.SimulateDocumentBaseResult;
 import org.elasticsearch.action.ingest.SimulatePipelineRequest;
 import org.elasticsearch.action.ingest.SimulatePipelineResponse;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.client.internal.Requests;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -30,7 +29,6 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.util.Collection;
@@ -38,6 +36,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.elasticsearch.ingest.IngestPipelineTestUtils.putJsonPipelineRequest;
 import static org.elasticsearch.test.NodeRoles.nonIngestNode;
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.equalTo;
@@ -63,19 +62,17 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
     }
 
     public void testSimulate() throws Exception {
-        BytesReference pipelineSource = BytesReference.bytes(
-            jsonBuilder().startObject()
-                .field("description", "my_pipeline")
+        putJsonPipeline(
+            "_id",
+            (builder, params) -> builder.field("description", "my_pipeline")
                 .startArray("processors")
                 .startObject()
                 .startObject("test")
                 .endObject()
                 .endObject()
                 .endArray()
-                .endObject()
         );
-        clusterAdmin().preparePutPipeline("_id", pipelineSource, XContentType.JSON).get();
-        GetPipelineResponse getResponse = clusterAdmin().prepareGetPipeline("_id").get();
+        GetPipelineResponse getResponse = getPipelines("_id");
         assertThat(getResponse.isFound(), is(true));
         assertThat(getResponse.pipelines().size(), equalTo(1));
         assertThat(getResponse.pipelines().get(0).getId(), equalTo("_id"));
@@ -118,26 +115,22 @@ public void testSimulate() throws Exception {
         assertThat(simulateDocumentBaseResult.getFailure(), nullValue());
 
         // cleanup
-        AcknowledgedResponse deletePipelineResponse = clusterAdmin().prepareDeletePipeline("_id").get();
-        assertTrue(deletePipelineResponse.isAcknowledged());
+        deletePipeline("_id");
     }
 
     public void testBulkWithIngestFailures() throws Exception {
         createIndex("index");
 
-        BytesReference source = BytesReference.bytes(
-            jsonBuilder().startObject()
-                .field("description", "my_pipeline")
+        putJsonPipeline(
+            "_id",
+            (builder, params) -> builder.field("description", "my_pipeline")
                 .startArray("processors")
                 .startObject()
                 .startObject("test")
                 .endObject()
                 .endObject()
                 .endArray()
-                .endObject()
         );
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest("_id", source, XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).get();
 
         int numRequests = scaledRandomIntBetween(32, 128);
         BulkRequest bulkRequest = new BulkRequest();
@@ -169,26 +162,22 @@ public void testBulkWithIngestFailures() throws Exception {
         }
 
         // cleanup
-        AcknowledgedResponse deletePipelineResponse = clusterAdmin().prepareDeletePipeline("_id").get();
-        assertTrue(deletePipelineResponse.isAcknowledged());
+        deletePipeline("_id");
     }
 
     public void testBulkWithUpsert() throws Exception {
         createIndex("index");
 
-        BytesReference source = BytesReference.bytes(
-            jsonBuilder().startObject()
-                .field("description", "my_pipeline")
+        putJsonPipeline(
+            "_id",
+            (builder, params) -> builder.field("description", "my_pipeline")
                 .startArray("processors")
                 .startObject()
                 .startObject("test")
                 .endObject()
                 .endObject()
                 .endArray()
-                .endObject()
         );
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest("_id", source, XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).get();
 
         BulkRequest bulkRequest = new BulkRequest();
         IndexRequest indexRequest = new IndexRequest("index").id("1").setPipeline("_id");
@@ -211,21 +200,18 @@ public void testBulkWithUpsert() throws Exception {
     }
 
     public void test() throws Exception {
-        BytesReference source = BytesReference.bytes(
-            jsonBuilder().startObject()
-                .field("description", "my_pipeline")
+        putJsonPipeline(
+            "_id",
+            (builder, params) -> builder.field("description", "my_pipeline")
                 .startArray("processors")
                 .startObject()
                 .startObject("test")
                 .endObject()
                 .endObject()
                 .endArray()
-                .endObject()
         );
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest("_id", source, XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).get();
 
-        GetPipelineResponse getResponse = clusterAdmin().prepareGetPipeline("_id").get();
+        GetPipelineResponse getResponse = getPipelines("_id");
         assertThat(getResponse.isFound(), is(true));
         assertThat(getResponse.pipelines().size(), equalTo(1));
         assertThat(getResponse.pipelines().get(0).getId(), equalTo("_id"));
@@ -241,11 +227,9 @@ public void test() throws Exception {
         assertThat(doc.get("field"), equalTo("value2"));
         assertThat(doc.get("processed"), equalTo(true));
 
-        DeletePipelineRequest deletePipelineRequest = new DeletePipelineRequest("_id");
-        AcknowledgedResponse response = clusterAdmin().deletePipeline(deletePipelineRequest).get();
-        assertThat(response.isAcknowledged(), is(true));
+        deletePipeline("_id");
 
-        getResponse = clusterAdmin().prepareGetPipeline("_id").get();
+        getResponse = getPipelines("_id");
         assertThat(getResponse.isFound(), is(false));
         assertThat(getResponse.pipelines().size(), equalTo(0));
     }
@@ -263,29 +247,29 @@ public void testPutWithPipelineFactoryError() throws Exception {
                 .endArray()
                 .endObject()
         );
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest("_id2", source, XContentType.JSON);
-        Exception e = expectThrows(ElasticsearchParseException.class, clusterAdmin().putPipeline(putPipelineRequest));
+        PutPipelineRequest putPipelineRequest = putJsonPipelineRequest("_id2", source);
+        Exception e = expectThrows(
+            ElasticsearchParseException.class,
+            client().execute(PutPipelineTransportAction.TYPE, putPipelineRequest)
+        );
         assertThat(e.getMessage(), equalTo("processor [test] doesn't support one or more provided configuration parameters [unused]"));
 
-        GetPipelineResponse response = clusterAdmin().prepareGetPipeline("_id2").get();
+        GetPipelineResponse response = getPipelines("_id2");
         assertFalse(response.isFound());
     }
 
     public void testWithDedicatedMaster() throws Exception {
         String masterOnlyNode = internalCluster().startMasterOnlyNode();
-        BytesReference source = BytesReference.bytes(
-            jsonBuilder().startObject()
-                .field("description", "my_pipeline")
+        putJsonPipeline(
+            "_id",
+            (builder, params) -> builder.field("description", "my_pipeline")
                 .startArray("processors")
                 .startObject()
                 .startObject("test")
                 .endObject()
                 .endObject()
                 .endArray()
-                .endObject()
         );
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest("_id", source, XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).get();
 
         BulkItemResponse item = client(masterOnlyNode).prepareBulk()
             .add(prepareIndex("test").setSource("field", "value2", "drop", true).setPipeline("_id"))
@@ -296,56 +280,38 @@ public void testWithDedicatedMaster() throws Exception {
     }
 
     public void testPipelineOriginHeader() throws Exception {
-        {
-            XContentBuilder source = jsonBuilder().startObject();
+        putJsonPipeline("1", (source, params) -> {
+            source.startArray("processors");
+            source.startObject();
             {
-                source.startArray("processors");
-                source.startObject();
-                {
-                    source.startObject("pipeline");
-                    source.field("name", "2");
-                    source.endObject();
-                }
+                source.startObject("pipeline");
+                source.field("name", "2");
                 source.endObject();
-                source.endArray();
             }
             source.endObject();
-            PutPipelineRequest putPipelineRequest = new PutPipelineRequest("1", BytesReference.bytes(source), XContentType.JSON);
-            clusterAdmin().putPipeline(putPipelineRequest).get();
-        }
-        {
-            XContentBuilder source = jsonBuilder().startObject();
+            return source.endArray();
+        });
+        putJsonPipeline("2", (source, params) -> {
+            source.startArray("processors");
+            source.startObject();
             {
-                source.startArray("processors");
-                source.startObject();
-                {
-                    source.startObject("pipeline");
-                    source.field("name", "3");
-                    source.endObject();
-                }
+                source.startObject("pipeline");
+                source.field("name", "3");
                 source.endObject();
-                source.endArray();
             }
             source.endObject();
-            PutPipelineRequest putPipelineRequest = new PutPipelineRequest("2", BytesReference.bytes(source), XContentType.JSON);
-            clusterAdmin().putPipeline(putPipelineRequest).get();
-        }
-        {
-            XContentBuilder source = jsonBuilder().startObject();
+            return source.endArray();
+        });
+        putJsonPipeline("3", (source, params) -> {
+            source.startArray("processors");
+            source.startObject();
             {
-                source.startArray("processors");
-                source.startObject();
-                {
-                    source.startObject("fail");
-                    source.endObject();
-                }
+                source.startObject("fail");
                 source.endObject();
-                source.endArray();
             }
             source.endObject();
-            PutPipelineRequest putPipelineRequest = new PutPipelineRequest("3", BytesReference.bytes(source), XContentType.JSON);
-            clusterAdmin().putPipeline(putPipelineRequest).get();
-        }
+            return source.endArray();
+        });
 
         Exception e = expectThrows(Exception.class, () -> {
             IndexRequest indexRequest = new IndexRequest("test");
@@ -359,8 +325,7 @@ public void testPipelineOriginHeader() throws Exception {
     }
 
     public void testPipelineProcessorOnFailure() throws Exception {
-        {
-            XContentBuilder source = jsonBuilder().startObject();
+        putJsonPipeline("1", (source, params) -> {
             {
                 source.startArray("processors");
                 source.startObject();
@@ -382,43 +347,29 @@ public void testPipelineProcessorOnFailure() throws Exception {
                 source.endObject();
                 source.endArray();
             }
-            source.endObject();
-            PutPipelineRequest putPipelineRequest = new PutPipelineRequest("1", BytesReference.bytes(source), XContentType.JSON);
-            clusterAdmin().putPipeline(putPipelineRequest).get();
-        }
-        {
-            XContentBuilder source = jsonBuilder().startObject();
+            return source;
+        });
+        putJsonPipeline("2", (source, params) -> {
+            source.startArray("processors");
+            source.startObject();
             {
-                source.startArray("processors");
-                source.startObject();
-                {
-                    source.startObject("pipeline");
-                    source.field("name", "3");
-                    source.endObject();
-                }
+                source.startObject("pipeline");
+                source.field("name", "3");
                 source.endObject();
-                source.endArray();
             }
             source.endObject();
-            PutPipelineRequest putPipelineRequest = new PutPipelineRequest("2", BytesReference.bytes(source), XContentType.JSON);
-            clusterAdmin().putPipeline(putPipelineRequest).get();
-        }
-        {
-            XContentBuilder source = jsonBuilder().startObject();
+            return source.endArray();
+        });
+        putJsonPipeline("3", (source, params) -> {
+            source.startArray("processors");
+            source.startObject();
             {
-                source.startArray("processors");
-                source.startObject();
-                {
-                    source.startObject("fail");
-                    source.endObject();
-                }
+                source.startObject("fail");
                 source.endObject();
-                source.endArray();
             }
             source.endObject();
-            PutPipelineRequest putPipelineRequest = new PutPipelineRequest("3", BytesReference.bytes(source), XContentType.JSON);
-            clusterAdmin().putPipeline(putPipelineRequest).get();
-        }
+            return source.endArray();
+        });
 
         prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).setPipeline("1").get();
         Map<String, Object> inserted = client().prepareGet("test", "1").get().getSourceAsMap();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java
index a3c43de39218..5ec3e18d124e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestFileSettingsIT.java
@@ -19,7 +19,6 @@
 import org.elasticsearch.cluster.metadata.ReservedStateHandlerMetadata;
 import org.elasticsearch.cluster.metadata.ReservedStateMetadata;
 import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.plugins.Plugin;
@@ -41,6 +40,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
+import static org.elasticsearch.common.bytes.BytesReference.bytes;
+import static org.elasticsearch.ingest.IngestPipelineTestUtils.putJsonPipelineRequest;
 import static org.elasticsearch.xcontent.XContentType.JSON;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -158,7 +159,7 @@ private void assertPipelinesSaveOK(CountDownLatch savedClusterState, AtomicLong
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).get();
 
         ReservedStateMetadata reservedState = clusterStateResponse.getState()
@@ -252,7 +253,7 @@ private PutPipelineRequest sampleRestRequest(String id) throws Exception {
             var builder = XContentFactory.contentBuilder(JSON)
         ) {
             builder.map(parser.map());
-            return new PutPipelineRequest(id, BytesReference.bytes(builder), JSON);
+            return putJsonPipelineRequest(id, bytes(builder));
         }
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java
index 5f036681f849..08c3d690ef47 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestProcessorNotInstalledOnAllNodesIT.java
@@ -9,12 +9,13 @@
 package org.elasticsearch.ingest;
 
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.node.NodeService;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -24,7 +25,6 @@
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 
 @ESIntegTestCase.ClusterScope(numDataNodes = 0, numClientNodes = 0, scope = ESIntegTestCase.Scope.TEST)
@@ -51,7 +51,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
         return installPlugin ? Arrays.asList(IngestTestPlugin.class) : Collections.emptyList();
     }
 
-    public void testFailPipelineCreation() throws Exception {
+    public void testFailPipelineCreation() {
         installPlugin = true;
         String node1 = internalCluster().startNode();
         installPlugin = false;
@@ -59,12 +59,22 @@ public void testFailPipelineCreation() throws Exception {
         ensureStableCluster(2, node1);
         ensureStableCluster(2, node2);
 
-        try {
-            clusterAdmin().preparePutPipeline("_id", pipelineSource, XContentType.JSON).get();
-            fail("exception expected");
-        } catch (ElasticsearchParseException e) {
-            assertThat(e.getMessage(), containsString("Processor type [test] is not installed on node"));
-        }
+        assertThat(
+            asInstanceOf(
+                ElasticsearchParseException.class,
+                ExceptionsHelper.unwrapCause(
+                    safeAwaitFailure(
+                        AcknowledgedResponse.class,
+                        l -> client().execute(
+                            PutPipelineTransportAction.TYPE,
+                            IngestPipelineTestUtils.putJsonPipelineRequest("id", pipelineSource),
+                            l
+                        )
+                    )
+                )
+            ).getMessage(),
+            containsString("Processor type [test] is not installed on node")
+        );
     }
 
     public void testFailPipelineCreationProcessorNotInstalledOnMasterNode() throws Exception {
@@ -72,12 +82,22 @@ public void testFailPipelineCreationProcessorNotInstalledOnMasterNode() throws E
         installPlugin = true;
         internalCluster().startNode();
 
-        try {
-            clusterAdmin().preparePutPipeline("_id", pipelineSource, XContentType.JSON).get();
-            fail("exception expected");
-        } catch (ElasticsearchParseException e) {
-            assertThat(e.getMessage(), equalTo("No processor type exists with name [test]"));
-        }
+        assertThat(
+            asInstanceOf(
+                ElasticsearchParseException.class,
+                ExceptionsHelper.unwrapCause(
+                    safeAwaitFailure(
+                        AcknowledgedResponse.class,
+                        l -> client().execute(
+                            PutPipelineTransportAction.TYPE,
+                            IngestPipelineTestUtils.putJsonPipelineRequest("id", pipelineSource),
+                            l
+                        )
+                    )
+                )
+            ).getMessage(),
+            equalTo("No processor type exists with name [test]")
+        );
     }
 
     // If there is pipeline defined and a node joins that doesn't have the processor installed then
@@ -86,8 +106,7 @@ public void testFailStartNode() throws Exception {
         installPlugin = true;
         String node1 = internalCluster().startNode();
 
-        AcknowledgedResponse response = clusterAdmin().preparePutPipeline("_id", pipelineSource, XContentType.JSON).get();
-        assertThat(response.isAcknowledged(), is(true));
+        putJsonPipeline("_id", pipelineSource);
         Pipeline pipeline = internalCluster().getInstance(NodeService.class, node1).getIngestService().getPipeline("_id");
         assertThat(pipeline, notNullValue());
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestStatsNamesAndTypesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestStatsNamesAndTypesIT.java
index 86e1d2e332f3..63a16eae6e1e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestStatsNamesAndTypesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestStatsNamesAndTypesIT.java
@@ -14,10 +14,7 @@
 import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.MockScriptEngine;
 import org.elasticsearch.script.MockScriptPlugin;
@@ -92,8 +89,7 @@ public void testIngestStatsNamesAndTypes() throws IOException {
               ]
             }
             """, MockScriptEngine.NAME, MockScriptEngine.NAME);
-        BytesReference pipeline1Reference = new BytesArray(pipeline1);
-        clusterAdmin().putPipeline(new PutPipelineRequest("pipeline1", pipeline1Reference, XContentType.JSON)).actionGet();
+        putJsonPipeline("pipeline1", pipeline1);
 
         // index a single document through the pipeline
         BulkRequest bulkRequest = new BulkRequest();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/nodescapabilities/SimpleNodesCapabilitiesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/nodescapabilities/SimpleNodesCapabilitiesIT.java
index 9b60044c94f7..eec90241fd90 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/nodescapabilities/SimpleNodesCapabilitiesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/nodescapabilities/SimpleNodesCapabilitiesIT.java
@@ -24,7 +24,10 @@ public class SimpleNodesCapabilitiesIT extends ESIntegTestCase {
     public void testNodesCapabilities() throws IOException {
         internalCluster().startNodes(2);
 
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").get();
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForGreenStatus()
+            .setWaitForNodes("2")
+            .get();
         logger.info("--> done cluster_health, status {}", clusterHealth.getStatus());
 
         // check we support the capabilities API itself. Which we do.
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java b/server/src/internalClusterTest/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java
index a5700c319aa5..e4c83c81a768 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/nodesinfo/SimpleNodesInfoIT.java
@@ -33,7 +33,10 @@ public void testNodesInfos() {
         final String node_1 = nodesNames.get(0);
         final String node_2 = nodesNames.get(1);
 
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").get();
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForGreenStatus()
+            .setWaitForNodes("2")
+            .get();
         logger.info("--> done cluster_health, status {}", clusterHealth.getStatus());
 
         String server1NodeId = getNodeId(node_1);
@@ -72,7 +75,10 @@ public void testNodesInfosTotalIndexingBuffer() {
         final String node_1 = nodesNames.get(0);
         final String node_2 = nodesNames.get(1);
 
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").get();
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForGreenStatus()
+            .setWaitForNodes("2")
+            .get();
         logger.info("--> done cluster_health, status {}", clusterHealth.getStatus());
 
         String server1NodeId = getNodeId(node_1);
@@ -110,7 +116,10 @@ public void testAllocatedProcessors() throws Exception {
         final String node_1 = nodeNames.get(0);
         final String node_2 = nodeNames.get(1);
 
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth().setWaitForGreenStatus().setWaitForNodes("2").get();
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForGreenStatus()
+            .setWaitForNodes("2")
+            .get();
         logger.info("--> done cluster_health, status {}", clusterHealth.getStatus());
 
         String server1NodeId = getNodeId(node_1);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java
index a49fadb0c4b5..a851ecb11c79 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIT.java
@@ -84,7 +84,7 @@ public void testCloseIndexDefaultBehaviour() throws Exception {
             assertAcked(indicesAdmin().prepareClose("*").get());
         }
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (Map.Entry<String, IndexMetadata> indexMetadataEntry : state.getMetadata().indices().entrySet()) {
             assertEquals(IndexMetadata.State.CLOSE, indexMetadataEntry.getValue().getState());
         }
@@ -117,7 +117,7 @@ public void testOpenIndexDefaultBehaviour() throws Exception {
             assertAcked(indicesAdmin().prepareOpen("*").get());
         }
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (Map.Entry<String, IndexMetadata> indexMetadataEntry : state.getMetadata().indices().entrySet()) {
             assertEquals(IndexMetadata.State.OPEN, indexMetadataEntry.getValue().getState());
         }
@@ -150,7 +150,7 @@ public void testAddIndexBlockDefaultBehaviour() throws Exception {
             assertAcked(indicesAdmin().prepareAddBlock(WRITE, "*").get());
         }
 
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertTrue("write block is set on index1", state.getBlocks().hasIndexBlock("index1", IndexMetadata.INDEX_WRITE_BLOCK));
         assertTrue("write block is set on 1index", state.getBlocks().hasIndexBlock("1index", IndexMetadata.INDEX_WRITE_BLOCK));
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/persistent/decider/EnableAssignmentDeciderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/persistent/decider/EnableAssignmentDeciderIT.java
index e7d23f97fc99..caaea0a8a384 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/persistent/decider/EnableAssignmentDeciderIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/persistent/decider/EnableAssignmentDeciderIT.java
@@ -110,7 +110,7 @@ public void testEnableAssignmentAfterRestart() throws Exception {
     }
 
     private void assertEnableAssignmentSetting(final Allocation expected) {
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().clear().setMetadata(true).get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setMetadata(true).get();
         Settings settings = clusterStateResponse.getState().getMetadata().settings();
 
         String value = settings.get(CLUSTER_TASKS_ALLOCATION_ENABLE_SETTING.getKey());
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/plugins/IndexFoldersDeletionListenerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/plugins/IndexFoldersDeletionListenerIT.java
index db26d630fefe..21aa8a877035 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/plugins/IndexFoldersDeletionListenerIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/plugins/IndexFoldersDeletionListenerIT.java
@@ -73,7 +73,7 @@ public void testListenersInvokedWhenIndexIsDeleted() throws Exception {
 
         final NumShards numShards = getNumShards(indexName);
         assertFalse(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setIndices(indexName)
                 .setWaitForGreenStatus()
                 .setWaitForEvents(Priority.LANGUID)
@@ -140,7 +140,7 @@ public void testListenersInvokedWhenIndexIsRelocated() throws Exception {
 
         final NumShards numShards = getNumShards(indexName);
         assertFalse(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setIndices(indexName)
                 .setWaitForGreenStatus()
                 .setWaitForEvents(Priority.LANGUID)
@@ -206,7 +206,7 @@ public void testListenersInvokedWhenIndexIsDangling() throws Exception {
 
         final NumShards numShards = getNumShards(indexName);
         assertFalse(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setIndices(indexName)
                 .setWaitForGreenStatus()
                 .setWaitForEvents(Priority.LANGUID)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java
index 8335b3c0c424..6be1612c32ad 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java
@@ -111,13 +111,16 @@ protected Collection<Class<? extends Plugin>> getMockPlugins() {
     }
 
     private void assertMasterNode(Client client, String node) {
-        assertThat(client.admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(), equalTo(node));
+        assertThat(
+            client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNode().getName(),
+            equalTo(node)
+        );
     }
 
     private void expectMasterNotFound() {
         expectThrows(
             MasterNotDiscoveredException.class,
-            clusterAdmin().prepareState().setMasterNodeTimeout(TimeValue.timeValueMillis(100))
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setMasterNodeTimeout(TimeValue.timeValueMillis(100))
         );
     }
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java
index da59d306d411..adc9db1cb3ed 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java
@@ -62,7 +62,7 @@ public void testFullRollingRestart() throws Exception {
 
         // make sure the cluster state is green, and all has been recovered
         assertTimeout(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(healthTimeout)
                 .setWaitForGreenStatus()
@@ -76,7 +76,7 @@ public void testFullRollingRestart() throws Exception {
 
         // make sure the cluster state is green, and all has been recovered
         assertTimeout(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(healthTimeout)
                 .setWaitForGreenStatus()
@@ -94,7 +94,7 @@ public void testFullRollingRestart() throws Exception {
         internalCluster().stopRandomDataNode();
         // make sure the cluster state is green, and all has been recovered
         assertTimeout(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(healthTimeout)
                 .setWaitForGreenStatus()
@@ -105,7 +105,7 @@ public void testFullRollingRestart() throws Exception {
         internalCluster().stopRandomDataNode();
         // make sure the cluster state is green, and all has been recovered
         assertTimeout(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(healthTimeout)
                 .setWaitForGreenStatus()
@@ -123,7 +123,7 @@ public void testFullRollingRestart() throws Exception {
         internalCluster().stopRandomDataNode();
         // make sure the cluster state is green, and all has been recovered
         assertTimeout(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(healthTimeout)
                 .setWaitForGreenStatus()
@@ -135,7 +135,7 @@ public void testFullRollingRestart() throws Exception {
 
         // make sure the cluster state is yellow, and all has been recovered
         assertTimeout(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(healthTimeout)
                 .setWaitForYellowStatus()
@@ -168,7 +168,7 @@ public void testNoRebalanceOnRollingRestart() throws Exception {
             prepareIndex("test").setId(Long.toString(i)).setSource(Map.<String, Object>of("test", "value" + i)).get();
         }
         ensureGreen();
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         RecoveryResponse recoveryResponse = indicesAdmin().prepareRecoveries("test").get();
         for (RecoveryState recoveryState : recoveryResponse.shardRecoveryStates().get("test")) {
             assertNotEquals(
@@ -186,7 +186,7 @@ public void testNoRebalanceOnRollingRestart() throws Exception {
         }
         internalCluster().restartRandomDataNode();
         ensureGreen();
-        clusterAdmin().prepareState().get();
+        clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
 
         recoveryResponse = indicesAdmin().prepareRecoveries("test").get();
         for (RecoveryState recoveryState : recoveryResponse.shardRecoveryStates().get("test")) {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java
index 70aabbc8c30d..c066e3098df6 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java
@@ -102,7 +102,7 @@ public void testRecoverWhileUnderLoadAllocateReplicasTest() throws Exception {
             logger.info("--> waiting for GREEN health status ...");
             // make sure the cluster state is green, and all has been recovered
             assertNoTimeout(
-                clusterAdmin().prepareHealth()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setTimeout(TimeValue.timeValueMinutes(5))
                     .setWaitForGreenStatus()
@@ -163,7 +163,7 @@ public void testRecoverWhileUnderLoadAllocateReplicasRelocatePrimariesTest() thr
 
             logger.info("--> waiting for GREEN health status ...");
             assertNoTimeout(
-                clusterAdmin().prepareHealth()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setTimeout(TimeValue.timeValueMinutes(5))
                     .setWaitForGreenStatus()
@@ -225,7 +225,7 @@ public void testRecoverWhileUnderLoadWithReducedAllowedNodes() throws Exception
 
             logger.info("--> waiting for GREEN health status ...");
             assertNoTimeout(
-                clusterAdmin().prepareHealth()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setTimeout(TimeValue.timeValueMinutes(5))
                     .setWaitForGreenStatus()
@@ -242,7 +242,7 @@ public void testRecoverWhileUnderLoadWithReducedAllowedNodes() throws Exception
             allowNodes("test", 3);
             logger.info("--> waiting for relocations ...");
             assertNoTimeout(
-                clusterAdmin().prepareHealth()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setTimeout(TimeValue.timeValueMinutes(5))
                     .setWaitForNoRelocatingShards(true)
@@ -252,7 +252,7 @@ public void testRecoverWhileUnderLoadWithReducedAllowedNodes() throws Exception
             allowNodes("test", 2);
             logger.info("--> waiting for relocations ...");
             assertNoTimeout(
-                clusterAdmin().prepareHealth()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setTimeout(TimeValue.timeValueMinutes(5))
                     .setWaitForNoRelocatingShards(true)
@@ -262,7 +262,7 @@ public void testRecoverWhileUnderLoadWithReducedAllowedNodes() throws Exception
             allowNodes("test", 1);
             logger.info("--> waiting for relocations ...");
             assertNoTimeout(
-                clusterAdmin().prepareHealth()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setTimeout(TimeValue.timeValueMinutes(5))
                     .setWaitForNoRelocatingShards(true)
@@ -273,7 +273,7 @@ public void testRecoverWhileUnderLoadWithReducedAllowedNodes() throws Exception
             logger.info("--> indexing threads stopped");
 
             assertNoTimeout(
-                clusterAdmin().prepareHealth()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setTimeout(TimeValue.timeValueMinutes(5))
                     .setWaitForNoRelocatingShards(true)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java
index 17daf403e056..52a95b206586 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java
@@ -140,7 +140,7 @@ public void testSimpleRelocationNoIndexing() {
 
         logger.info("--> start another node");
         final String node_2 = internalCluster().startNode();
-        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes("2")
             .get();
@@ -149,7 +149,7 @@ public void testSimpleRelocationNoIndexing() {
         logger.info("--> relocate the shard from node1 to node2");
         ClusterRerouteUtils.reroute(client(), new MoveAllocationCommand("test", 0, node_1, node_2));
 
-        clusterHealthResponse = clusterAdmin().prepareHealth()
+        clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNoRelocatingShards(true)
             .setTimeout(ACCEPTABLE_RELOCATION_TIME)
@@ -184,7 +184,7 @@ public void testRelocationWhileIndexingRandom() throws Exception {
             logger.info("--> starting [node{}] ...", i);
             nodes[i - 1] = internalCluster().startNode();
             if (i != numberOfNodes) {
-                ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth()
+                ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setWaitForNodes(Integer.toString(i))
                     .setWaitForGreenStatus()
@@ -215,7 +215,7 @@ public void testRelocationWhileIndexingRandom() throws Exception {
                     logger.debug("--> flushing");
                     indicesAdmin().prepareFlush().get();
                 }
-                ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+                ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setWaitForNoRelocatingShards(true)
                     .setTimeout(ACCEPTABLE_RELOCATION_TIME)
@@ -288,7 +288,7 @@ public void testRelocationWhileRefreshing() throws Exception {
             logger.info("--> starting [node_{}] ...", i);
             nodes[i] = internalCluster().startNode();
             if (i != numberOfNodes - 1) {
-                ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth()
+                ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForEvents(Priority.LANGUID)
                     .setWaitForNodes(Integer.toString(i + 1))
                     .setWaitForGreenStatus()
@@ -349,7 +349,7 @@ public void indexShardStateChanged(
 
             // verify cluster was finished.
             assertFalse(
-                clusterAdmin().prepareHealth()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                     .setWaitForNoRelocatingShards(true)
                     .setWaitForEvents(Priority.LANGUID)
                     .setTimeout(TimeValue.timeValueSeconds(30))
@@ -390,7 +390,7 @@ public void testCancellationCleansTempFiles() throws Exception {
             requests.add(prepareIndex(indexName).setSource("{}", XContentType.JSON));
         }
         indexRandom(true, requests);
-        assertFalse(clusterAdmin().prepareHealth().setWaitForNodes("3").setWaitForGreenStatus().get().isTimedOut());
+        assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes("3").setWaitForGreenStatus().get().isTimedOut());
         flush();
 
         int allowedFailures = randomIntBetween(3, 5); // the default of the `index.allocation.max_retries` is 5.
@@ -418,7 +418,7 @@ public void testCancellationCleansTempFiles() throws Exception {
                 if (node.equals(p_node)) {
                     continue;
                 }
-                ClusterState state = client(node).admin().cluster().prepareState().setLocal(true).get().getState();
+                ClusterState state = client(node).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
                 assertThat(
                     node + " indicates assigned replicas",
                     state.getRoutingTable().index(indexName).shardsWithState(ShardRoutingState.UNASSIGNED).size(),
@@ -551,7 +551,7 @@ public void testRelocateWhileWaitingForRefresh() {
 
         logger.info("--> start another node");
         final String node2 = internalCluster().startNode();
-        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes("2")
             .get();
@@ -560,7 +560,7 @@ public void testRelocateWhileWaitingForRefresh() {
         logger.info("--> relocate the shard from node1 to node2");
         ClusterRerouteUtils.reroute(client(), new MoveAllocationCommand("test", 0, node1, node2));
 
-        clusterHealthResponse = clusterAdmin().prepareHealth()
+        clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNoRelocatingShards(true)
             .setTimeout(ACCEPTABLE_RELOCATION_TIME)
@@ -602,7 +602,7 @@ public void testRelocateWhileContinuouslyIndexingAndWaitingForRefresh() throws E
 
         logger.info("--> start another node");
         final String node2 = internalCluster().startNode();
-        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth()
+        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes("2")
             .get();
@@ -623,7 +623,7 @@ public void testRelocateWhileContinuouslyIndexingAndWaitingForRefresh() throws E
             );
         }
         safeGet(relocationListener);
-        clusterHealthResponse = clusterAdmin().prepareHealth()
+        clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNoRelocatingShards(true)
             .setTimeout(ACCEPTABLE_RELOCATION_TIME)
@@ -670,7 +670,7 @@ public void testRelocationEstablishedPeerRecoveryRetentionLeases() throws Except
 
     private void assertActiveCopiesEstablishedPeerRecoveryRetentionLeases() throws Exception {
         assertBusy(() -> {
-            for (String index : clusterAdmin().prepareState().get().getState().metadata().indices().keySet()) {
+            for (String index : clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().indices().keySet()) {
                 Map<ShardId, List<ShardStats>> byShardId = Stream.of(indicesAdmin().prepareStats(index).get().getShards())
                     .collect(Collectors.groupingBy(l -> l.getShardRouting().shardId()));
                 for (List<ShardStats> shardStats : byShardId.values()) {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RestartInactiveAutoExpandReplicaNotStaleIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RestartInactiveAutoExpandReplicaNotStaleIT.java
index 0b56eb36c08e..a1aecab66bbf 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RestartInactiveAutoExpandReplicaNotStaleIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RestartInactiveAutoExpandReplicaNotStaleIT.java
@@ -28,7 +28,7 @@ public void testNotStale() throws Exception {
 
         ensureGreen();
 
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         IndexMetadata target = clusterStateResponse.getState().getMetadata().index("test");
 
         internalCluster().restartNode(replica, new InternalTestCluster.RestartCallback() {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/repositories/IndexSnapshotsServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/repositories/IndexSnapshotsServiceIT.java
index 6c7bcd17af1f..1e3a7d5a6b81 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/repositories/IndexSnapshotsServiceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/repositories/IndexSnapshotsServiceIT.java
@@ -18,6 +18,7 @@
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.core.Strings;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -107,6 +108,8 @@ public void testGetShardSnapshotOnEmptyRepositoriesListThrowsAnError() {
         expectThrows(IllegalArgumentException.class, () -> getLatestSnapshotForShardFuture(Collections.emptyList(), "idx", 0, false));
     }
 
+    @UpdateForV9
+    // below we were selecting an index version between current and 7.5.0, this has been updated to 8.0.0 now but that might need to change
     public void testGetShardSnapshotReturnsTheLatestSuccessfulSnapshot() throws Exception {
         final String repoName = "repo-name";
         final Path repoPath = randomRepoPath();
@@ -114,7 +117,7 @@ public void testGetShardSnapshotReturnsTheLatestSuccessfulSnapshot() throws Exce
 
         final boolean useBwCFormat = randomBoolean();
         if (useBwCFormat) {
-            final IndexVersion version = randomVersionBetween(random(), IndexVersions.V_7_5_0, IndexVersion.current());
+            final IndexVersion version = randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current());
             initWithSnapshotVersion(repoName, repoPath, version);
         }
 
@@ -137,7 +140,7 @@ public void testGetShardSnapshotReturnsTheLatestSuccessfulSnapshot() throws Exce
             final SnapshotInfo snapshotInfo = createSnapshot(repoName, Strings.format("snap-%03d", i), snapshotIndices);
             if (snapshotInfo.indices().contains(indexName)) {
                 lastSnapshot = snapshotInfo;
-                ClusterStateResponse clusterStateResponse = admin().cluster().prepareState().get();
+                ClusterStateResponse clusterStateResponse = admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get();
                 IndexMetadata indexMetadata = clusterStateResponse.getState().metadata().index(indexName);
                 expectedIndexMetadataId = IndexMetaDataGenerations.buildUniqueIdentifier(indexMetadata);
             }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreCorruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreCorruptionIT.java
index 4665dc486a90..702eba9b2bfb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreCorruptionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreCorruptionIT.java
@@ -8,6 +8,7 @@
 
 package org.elasticsearch.repositories.blobstore;
 
+import org.apache.logging.log4j.Level;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse;
@@ -22,9 +23,11 @@
 import org.elasticsearch.repositories.fs.FsRepository;
 import org.elasticsearch.snapshots.AbstractSnapshotIntegTestCase;
 import org.elasticsearch.snapshots.SnapshotState;
+import org.elasticsearch.test.MockLog;
 import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
 import org.junit.Before;
 
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -65,17 +68,51 @@ public void testCorruptionDetection() throws Exception {
 
         // detect corruption by taking another snapshot
         if (corruptedFileType == RepositoryFileType.SHARD_GENERATION) {
-            corruptionDetectors.add(exceptionListener -> {
-                logger.info("--> taking another snapshot");
-                client().admin()
-                    .cluster()
-                    .prepareCreateSnapshot(TEST_REQUEST_TIMEOUT, repositoryName, randomIdentifier())
-                    .setWaitForCompletion(true)
-                    .execute(exceptionListener.map(createSnapshotResponse -> {
-                        assertNotEquals(SnapshotState.SUCCESS, createSnapshotResponse.getSnapshotInfo().state());
-                        return new ElasticsearchException("create-snapshot failed as expected");
-                    }));
-            });
+            if (Files.exists(corruptedFile)) {
+                corruptionDetectors.add(exceptionListener -> {
+                    logger.info("--> taking another snapshot");
+                    client().admin()
+                        .cluster()
+                        .prepareCreateSnapshot(TEST_REQUEST_TIMEOUT, repositoryName, randomIdentifier())
+                        .setWaitForCompletion(true)
+                        .execute(exceptionListener.map(createSnapshotResponse -> {
+                            assertNotEquals(SnapshotState.SUCCESS, createSnapshotResponse.getSnapshotInfo().state());
+                            return new ElasticsearchException("create-snapshot failed as expected");
+                        }));
+                });
+            } else {
+                corruptionDetectors.add(exceptionListener -> {
+                    logger.info("--> taking another snapshot");
+                    final var mockLog = MockLog.capture(BlobStoreRepository.class);
+                    mockLog.addExpectation(
+                        new MockLog.SeenEventExpectation(
+                            "fallback message",
+                            "org.elasticsearch.repositories.blobstore.BlobStoreRepository",
+                            Level.ERROR,
+                            "index [*] shard generation [*] in ["
+                                + repositoryName
+                                + "][*] not found - falling back to reading all shard snapshots"
+                        )
+                    );
+                    mockLog.addExpectation(
+                        new MockLog.SeenEventExpectation(
+                            "shard blobs list",
+                            "org.elasticsearch.repositories.blobstore.BlobStoreRepository",
+                            Level.ERROR,
+                            "read shard snapshots [*] due to missing shard generation [*] for index [*] in [" + repositoryName + "][*]"
+                        )
+                    );
+                    client().admin()
+                        .cluster()
+                        .prepareCreateSnapshot(TEST_REQUEST_TIMEOUT, repositoryName, randomIdentifier())
+                        .setWaitForCompletion(true)
+                        .execute(ActionListener.releaseAfter(exceptionListener.map(createSnapshotResponse -> {
+                            assertEquals(SnapshotState.SUCCESS, createSnapshotResponse.getSnapshotInfo().state());
+                            mockLog.assertAllExpectationsMatched();
+                            return new ElasticsearchException("create-snapshot logged errors as expected");
+                        }), mockLog));
+                });
+            }
         }
 
         // detect corruption by restoring the snapshot
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryCleanupIT.java b/server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryCleanupIT.java
index 01b01fdf5fcd..b8ada92c9033 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryCleanupIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryCleanupIT.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.getRepositoryDataBlobName;
 import static org.elasticsearch.repositories.blobstore.BlobStoreTestUtil.randomNonDataPurpose;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFutureThrows;
 import static org.hamcrest.Matchers.containsString;
@@ -65,7 +66,10 @@ public void testRepeatCleanupsDontRemove() throws Exception {
         );
 
         logger.info("-->  ensure cleanup is still in progress");
-        final RepositoryCleanupInProgress cleanup = clusterAdmin().prepareState().get().getState().custom(RepositoryCleanupInProgress.TYPE);
+        final RepositoryCleanupInProgress cleanup = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .custom(RepositoryCleanupInProgress.TYPE);
         assertTrue(cleanup.hasCleanupInProgress());
 
         logger.info("-->  unblocking master node");
@@ -151,12 +155,7 @@ public void testCleanupOldIndexN() throws ExecutionException, InterruptedExcepti
                         createOldIndexNFuture,
                         () -> repository.blobStore()
                             .blobContainer(repository.basePath())
-                            .writeBlob(
-                                randomNonDataPurpose(),
-                                BlobStoreRepository.INDEX_FILE_PREFIX + generation,
-                                new BytesArray(new byte[1]),
-                                true
-                            )
+                            .writeBlob(randomNonDataPurpose(), getRepositoryDataBlobName(generation), new BytesArray(new byte[1]), true)
                     )
                 );
             createOldIndexNFuture.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java
index 4ce92610eff1..82b6ba15930b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/ComponentTemplatesFileSettingsIT.java
@@ -357,7 +357,10 @@ public class ComponentTemplatesFileSettingsIT extends ESIntegTestCase {
         }""";
 
     private void assertMasterNode(Client client, String node) throws ExecutionException, InterruptedException {
-        assertThat(client.admin().cluster().prepareState().execute().get().getState().nodes().getMasterNode().getName(), equalTo(node));
+        assertThat(
+            client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).execute().get().getState().nodes().getMasterNode().getName(),
+            equalTo(node)
+        );
     }
 
     private void writeJSONFile(String node, String json) throws Exception {
@@ -403,7 +406,7 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).actionGet();
 
         Map<String, ComposableIndexTemplate> allTemplates = clusterStateResponse.getState().metadata().templatesV2();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java
index 2fe808d813cc..049a58b63355 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/FileSettingsServiceIT.java
@@ -102,7 +102,10 @@ public class FileSettingsServiceIT extends ESIntegTestCase {
         }""";
 
     private void assertMasterNode(Client client, String node) {
-        assertThat(client.admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(), equalTo(node));
+        assertThat(
+            client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNode().getName(),
+            equalTo(node)
+        );
     }
 
     public static void writeJSONFile(String node, String json, AtomicLong versionCounter, Logger logger) throws Exception {
@@ -169,7 +172,7 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo
         assertTrue(savedClusterState.await(20, TimeUnit.SECONDS));
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).actionGet();
 
         assertThat(
@@ -177,7 +180,7 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo
             equalTo(expectedBytesPerSec)
         );
 
-        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest().persistentSettings(
+        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).persistentSettings(
             Settings.builder().put(INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey(), "1234kb")
         );
         assertThat(
@@ -257,7 +260,7 @@ public void testReservedStatePersistsOnRestart() throws Exception {
         logger.info("--> restart master");
         internalCluster().restartNode(masterNode);
 
-        final ClusterStateResponse clusterStateResponse = clusterAdmin().state(new ClusterStateRequest()).actionGet();
+        final ClusterStateResponse clusterStateResponse = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).actionGet();
         assertThat(
             clusterStateResponse.getState()
                 .metadata()
@@ -300,7 +303,7 @@ private void assertClusterStateNotSaved(CountDownLatch savedClusterState, Atomic
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).actionGet();
 
         assertThat(clusterStateResponse.getState().metadata().persistentSettings().get("search.allow_expensive_queries"), nullValue());
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/RepositoriesFileSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/RepositoriesFileSettingsIT.java
index 1ca2526b53df..7cec6e895a52 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/RepositoriesFileSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/RepositoriesFileSettingsIT.java
@@ -94,7 +94,10 @@ public class RepositoriesFileSettingsIT extends ESIntegTestCase {
         }""";
 
     private void assertMasterNode(Client client, String node) throws ExecutionException, InterruptedException {
-        assertThat(client.admin().cluster().prepareState().execute().get().getState().nodes().getMasterNode().getName(), equalTo(node));
+        assertThat(
+            client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).execute().get().getState().nodes().getMasterNode().getName(),
+            equalTo(node)
+        );
     }
 
     private void writeJSONFile(String node, String json) throws Exception {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/SnapshotsAndFileSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/SnapshotsAndFileSettingsIT.java
index 049260e14100..087274a86221 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/SnapshotsAndFileSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/reservedstate/service/SnapshotsAndFileSettingsIT.java
@@ -133,7 +133,7 @@ private ClusterStateResponse assertClusterStateSaveOK(CountDownLatch savedCluste
         boolean awaitSuccessful = savedClusterState.await(20, TimeUnit.SECONDS);
         assertTrue(awaitSuccessful);
 
-        return clusterAdmin().state(new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())).get();
+        return clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())).get();
     }
 
     public void testRestoreWithRemovedFileSettings() throws Exception {
@@ -180,14 +180,15 @@ public void testRestoreWithRemovedFileSettings() throws Exception {
 
         ensureGreen();
 
-        final ClusterStateResponse clusterStateResponse = clusterAdmin().state(new ClusterStateRequest().metadata(true)).actionGet();
+        final ClusterStateResponse clusterStateResponse = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).metadata(true))
+            .actionGet();
 
         // We expect no reserved metadata state for file based settings, the operator file was deleted.
         assertNull(clusterStateResponse.getState().metadata().reservedStateMetadata().get(FileSettingsService.NAMESPACE));
 
         final ClusterGetSettingsAction.Response getSettingsResponse = clusterAdmin().execute(
             ClusterGetSettingsAction.INSTANCE,
-            new ClusterGetSettingsAction.Request()
+            new ClusterGetSettingsAction.Request(TEST_REQUEST_TIMEOUT)
         ).actionGet();
 
         assertThat(
@@ -305,14 +306,14 @@ public void testRestoreWithPersistedFileSettings() throws Exception {
         logger.info("--> reserved state would be restored to non-zero version");
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().metadata(true).waitForMetadataVersion(removedReservedState.v2().get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).metadata(true).waitForMetadataVersion(removedReservedState.v2().get())
         ).actionGet();
 
         assertNotNull(clusterStateResponse.getState().metadata().reservedStateMetadata().get(FileSettingsService.NAMESPACE));
 
         final ClusterGetSettingsAction.Response getSettingsResponse = clusterAdmin().execute(
             ClusterGetSettingsAction.INSTANCE,
-            new ClusterGetSettingsAction.Request()
+            new ClusterGetSettingsAction.Request(TEST_REQUEST_TIMEOUT)
         ).actionGet();
 
         assertThat(
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java b/server/src/internalClusterTest/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java
index 502f02d9ce17..2ab77444f86b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java
@@ -51,7 +51,12 @@ public void testRollingRestartOfTwoNodeCluster() throws Exception {
         );
         ensureGreen("test");
 
-        final DiscoveryNodes discoveryNodes = clusterAdmin().prepareState().clear().setNodes(true).get().getState().nodes();
+        final DiscoveryNodes discoveryNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get()
+            .getState()
+            .nodes();
         final Map<String, String> nodeIdsByName = Maps.newMapWithExpectedSize(discoveryNodes.getSize());
         discoveryNodes.forEach(n -> nodeIdsByName.put(n.getName(), n.getId()));
 
@@ -98,7 +103,7 @@ public Settings onNodeStopped(String nodeName) throws IOException {
 
                     ClusterHealthResponse clusterHealthResponse = client(viaNode).admin()
                         .cluster()
-                        .prepareHealth()
+                        .prepareHealth(TEST_REQUEST_TIMEOUT)
                         .setWaitForEvents(Priority.LANGUID)
                         .setWaitForNodes(Integer.toString(1))
                         .setTimeout(TimeValue.timeValueSeconds(30L))
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
index 53001e30763a..1e18f156f1fc 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
@@ -51,7 +51,7 @@ public void testSearchClosedWildcardIndex() throws ExecutionException, Interrupt
     public void testResolveIndexRouting() {
         createIndex("test1");
         createIndex("test2");
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         indicesAdmin().prepareAliases()
             .addAliasAction(AliasActions.add().index("test1").alias("alias"))
@@ -93,7 +93,7 @@ public void testResolveSearchRouting() {
         createIndex("test1");
         createIndex("test2");
         createIndex("test3");
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         indicesAdmin().prepareAliases()
             .addAliasAction(AliasActions.add().index("test1").alias("alias"))
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java
index e25da54d7b21..20c197bf7389 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java
@@ -93,8 +93,13 @@ public void testShrinking() throws Exception {
                 Settings.builder()
                     .put(
                         "index.routing.allocation.require._name",
-                        clusterAdmin().prepareState().get().getState().nodes().getDataNodes().values().toArray(DiscoveryNode[]::new)[0]
-                            .getName()
+                        clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+                            .get()
+                            .getState()
+                            .nodes()
+                            .getDataNodes()
+                            .values()
+                            .toArray(DiscoveryNode[]::new)[0].getName()
                     )
                     .put("index.blocks.write", true),
                 index
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java
index f59ec4d42089..2eb37291d41c 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java
@@ -49,7 +49,7 @@ protected int minimumNumberOfShards() {
     }
 
     public String findNonMatchingRoutingValue(String index, String id) {
-        ClusterState state = clusterAdmin().prepareState().all().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState();
         IndexMetadata metadata = state.metadata().index(index);
         IndexMetadata withoutRoutingRequired = IndexMetadata.builder(metadata).putMapping("{}").build();
         IndexRouting indexRouting = IndexRouting.fromIndexMetadata(withoutRoutingRequired);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchServiceCleanupOnLostMasterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchServiceCleanupOnLostMasterIT.java
index 5625299890b7..b71dd4a39b19 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchServiceCleanupOnLostMasterIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchServiceCleanupOnLostMasterIT.java
@@ -56,7 +56,7 @@ public void testDroppedOutNode() throws Exception {
             assertBusy(() -> {
                 final ClusterHealthStatus indexHealthStatus = client(master).admin()
                     .cluster()
-                    .health(new ClusterHealthRequest("test"))
+                    .health(new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, "test"))
                     .actionGet()
                     .getStatus();
                 assertThat(indexHealthStatus, Matchers.is(ClusterHealthStatus.RED));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
index 0ed83f73e418..17b976bdd374 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
@@ -223,7 +223,7 @@ public void testSimpleWithCustomKeys() throws Exception {
     }
 
     public void testUnmapped() throws Exception {
-        clusterAdmin().prepareHealth("idx_unmapped").setWaitForYellowStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "idx_unmapped").setWaitForYellowStatus().get();
 
         assertNoFailuresAndResponse(
             prepareSearch("idx_unmapped").addAggregation(
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
index 6a60969e632e..0c39859856d5 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
@@ -761,7 +761,7 @@ public void testUnmapped() throws Exception {
     }
 
     public void testPartiallyUnmapped() throws Exception {
-        clusterAdmin().prepareHealth("idx_unmapped").setWaitForYellowStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "idx_unmapped").setWaitForYellowStatus().get();
 
         assertNoFailuresAndResponse(
             prepareSearch("idx", "idx_unmapped").addAggregation(
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java
index 152549617641..9e2139f832f1 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java
@@ -99,7 +99,9 @@ private void setClusterDefaultAllowPartialResults(boolean allowPartialResults) {
 
         Settings persistentSettings = Settings.builder().put(key, allowPartialResults).build();
 
-        ClusterUpdateSettingsResponse response1 = clusterAdmin().prepareUpdateSettings().setPersistentSettings(persistentSettings).get();
+        ClusterUpdateSettingsResponse response1 = clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .setPersistentSettings(persistentSettings)
+            .get();
 
         assertAcked(response1);
         assertEquals(response1.getPersistentSettings().getAsBoolean(key, null), allowPartialResults);
@@ -115,10 +117,10 @@ private void buildRedIndex(int numShards) throws Exception {
 
         internalCluster().stopRandomDataNode();
 
-        clusterAdmin().prepareHealth().setWaitForStatus(ClusterHealthStatus.RED).get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForStatus(ClusterHealthStatus.RED).get();
 
         assertBusy(() -> {
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             List<ShardRouting> unassigneds = RoutingNodesHelper.shardsWithState(state.getRoutingNodes(), ShardRoutingState.UNASSIGNED);
             assertThat(unassigneds.size(), greaterThan(0));
         });
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java
index 68d00321848e..df6994c57f42 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java
@@ -61,7 +61,7 @@ private void searchWhileCreatingIndex(boolean createIndex, int numberOfReplicas)
 
         logger.info("using preference {}", preference);
         // we want to make sure that while recovery happens, and a replica gets recovered, its properly refreshed
-        ClusterHealthStatus status = clusterAdmin().prepareHealth("test").get().getStatus();
+        ClusterHealthStatus status = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test").get().getStatus();
         while (status != ClusterHealthStatus.GREEN) {
             // first, verify that search normal search works
             assertHitCount(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "test")), 1);
@@ -97,7 +97,7 @@ private void searchWhileCreatingIndex(boolean createIndex, int numberOfReplicas)
                     assertHitCount(searchResponse, 1);
                 }
             );
-            status = clusterAdmin().prepareHealth("test").get().getStatus();
+            status = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test").get().getStatus();
             internalCluster().ensureAtLeastNumDataNodes(numberOfReplicas + 1);
         }
         cluster().wipeIndices("test");
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java
index 657158327bf0..a9b0f75fe45b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java
@@ -125,7 +125,7 @@ public void run() {
                 threads[j].join();
             }
             // this might time out on some machines if they are really busy and you hit lots of throttling
-            ClusterHealthResponse resp = clusterAdmin().prepareHealth()
+            ClusterHealthResponse resp = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForYellowStatus()
                 .setWaitForNoRelocatingShards(true)
                 .setWaitForEvents(Priority.LANGUID)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java
index 096f533a072b..3fe93f8d91be 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java
@@ -102,7 +102,7 @@ public void testRandomDirectoryIOExceptions() throws IOException, InterruptedExc
         ClusterHealthResponse clusterHealthResponse = clusterAdmin()
             // it's OK to timeout here
             .health(
-                new ClusterHealthRequest(new String[] {}).waitForYellowStatus()
+                new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForYellowStatus()
                     .masterNodeTimeout(TimeValue.timeValueSeconds(5))
                     .timeout(TimeValue.timeValueSeconds(5))
             )
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java
index 303030a52366..951ea29a09e8 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java
@@ -74,13 +74,13 @@ public void testFailedSearchWithWrongQuery() throws Exception {
 
         allowNodes("test", 2);
         assertThat(
-            clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes(">=2").get().isTimedOut(),
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForNodes(">=2").get().isTimedOut(),
             equalTo(false)
         );
 
         logger.info("Running Cluster Health");
         ClusterHealthResponse clusterHealth = clusterAdmin().health(
-            new ClusterHealthRequest("test").waitForYellowStatus()
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, "test").waitForYellowStatus()
                 .waitForNoRelocatingShards(true)
                 .waitForEvents(Priority.LANGUID)
                 .waitForActiveShards(test.totalNumShards)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CCSUsageTelemetryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CCSUsageTelemetryIT.java
index 8b7f69df9fcc..23146d190725 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CCSUsageTelemetryIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CCSUsageTelemetryIT.java
@@ -670,7 +670,7 @@ private Map<String, Object> setupClusters() {
             assertFalse(
                 client(clusterAlias).admin()
                     .cluster()
-                    .prepareHealth(remoteIndex)
+                    .prepareHealth(TEST_REQUEST_TIMEOUT, remoteIndex)
                     .setWaitForYellowStatus()
                     .setTimeout(TimeValue.timeValueSeconds(10))
                     .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterIT.java
index e96689ce2846..9cc359f40d32 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterIT.java
@@ -224,7 +224,7 @@ public void testCancel() throws Exception {
         assertFalse(
             client("cluster_a").admin()
                 .cluster()
-                .prepareHealth("prod")
+                .prepareHealth(TEST_REQUEST_TIMEOUT, "prod")
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchIT.java
index 89bc0e83351a..e772f94e868a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchIT.java
@@ -701,7 +701,7 @@ private Map<String, Object> setupTwoClusters() {
         assertFalse(
             client(REMOTE_CLUSTER).admin()
                 .cluster()
-                .prepareHealth(remoteIndex)
+                .prepareHealth(TEST_REQUEST_TIMEOUT, remoteIndex)
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchLeakIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchLeakIT.java
index a9ae215c1ab7..5c26899f2e3f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchLeakIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterSearchLeakIT.java
@@ -110,7 +110,7 @@ public void testSearch() throws Exception {
         assertFalse(
             client("cluster_a").admin()
                 .cluster()
-                .prepareHealth("prod")
+                .prepareHealth(TEST_REQUEST_TIMEOUT, "prod")
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
@@ -169,7 +169,11 @@ protected void configureRemoteCluster(String clusterAlias, Collection<String> se
 
             settings.put("cluster.remote." + clusterAlias + ".mode", "proxy");
             settings.put("cluster.remote." + clusterAlias + ".proxy_address", seedAddress);
-            client().admin().cluster().prepareUpdateSettings().setPersistentSettings(settings).get();
+            client().admin()
+                .cluster()
+                .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(settings)
+                .get();
         }
     }
 }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java
index cc272042d538..c89c7d8d749f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java
@@ -11,7 +11,6 @@
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.logging.log4j.Level;
-import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteUtils;
 import org.elasticsearch.action.fieldcaps.FieldCapabilities;
@@ -38,8 +37,6 @@
 import org.elasticsearch.index.mapper.DocumentParserContext;
 import org.elasticsearch.index.mapper.KeywordFieldMapper;
 import org.elasticsearch.index.mapper.MetadataFieldMapper;
-import org.elasticsearch.index.mapper.SourceLoader;
-import org.elasticsearch.index.mapper.StringStoredFieldFieldLoader;
 import org.elasticsearch.index.mapper.TimeSeriesParams;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -915,17 +912,6 @@ protected String contentType() {
             return CONTENT_TYPE;
         }
 
-        @Override
-        public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-            return new StringStoredFieldFieldLoader(fullPath(), leafName()) {
-                @Override
-                protected void write(XContentBuilder b, Object value) throws IOException {
-                    BytesRef ref = (BytesRef) value;
-                    b.utf8Value(ref.bytes, ref.offset, ref.length);
-                }
-            };
-        }
-
         private static final TypeParser PARSER = new FixedTypeParser(c -> new TestMetadataMapper());
     }
 }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java
index d42a84677a8f..d58e777b093a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java
@@ -65,7 +65,7 @@ public void testPlugin() throws Exception {
                     .endObject()
             )
             .get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForYellowStatus().get();
 
         client().index(
             new IndexRequest("test").id("1")
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/retriever/MinimalCompoundRetrieverIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/retriever/MinimalCompoundRetrieverIT.java
index 8c65d28711c1..32dc34045cc8 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/retriever/MinimalCompoundRetrieverIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/retriever/MinimalCompoundRetrieverIT.java
@@ -106,7 +106,7 @@ private Map<String, Object> setupTwoClusters() {
         assertFalse(
             client(REMOTE_CLUSTER).admin()
                 .cluster()
-                .prepareHealth(remoteIndex)
+                .prepareHealth(TEST_REQUEST_TIMEOUT, remoteIndex)
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/retriever/RetrieverRewriteIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/retriever/RetrieverRewriteIT.java
index e618a1b75cc4..e6ecd9f1e377 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/retriever/RetrieverRewriteIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/retriever/RetrieverRewriteIT.java
@@ -115,7 +115,7 @@ public void testRewriteCompoundRetrieverShouldThrowForPartialResults() throws Ex
                 throw new IllegalStateException("node did not stop");
             }
             assertBusy(() -> {
-                ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(testIndex)
+                ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, testIndex)
                     .setWaitForStatus(ClusterHealthStatus.RED) // we are now known red because the primary shard is missing
                     .setWaitForEvents(Priority.LANGUID) // ensures that the update has occurred
                     .execute()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java
index 433f004acdd7..17a0d6441ca4 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java
@@ -59,7 +59,7 @@ public void testStopOneNodePreferenceWithRedState() throws IOException {
         }
         refresh();
         internalCluster().stopRandomDataNode();
-        clusterAdmin().prepareHealth().setWaitForStatus(ClusterHealthStatus.RED).get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForStatus(ClusterHealthStatus.RED).get();
         String[] preferences = new String[] {
             "_local",
             "_prefer_nodes:somenode",
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchReplicaSelectionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchReplicaSelectionIT.java
index 816fe48e5d97..439534c3e174 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchReplicaSelectionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchReplicaSelectionIT.java
@@ -68,7 +68,7 @@ public void testNodeSelection() {
             client.prepareSearch().setQuery(matchAllQuery()).get().decRef();
         }
 
-        ClusterStateResponse clusterStateResponse = client.admin().cluster().prepareState().get();
+        ClusterStateResponse clusterStateResponse = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get();
         Map<String, DiscoveryNode> coordinatingNodes = clusterStateResponse.getState().nodes().getCoordinatingOnlyNodes();
         assertEquals(1, coordinatingNodes.size());
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java
index 03c217266d52..24a3d3ac422f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java
@@ -70,9 +70,9 @@ public void cleanup() throws Exception {
 
     public void testSimpleScrollQueryThenFetch() throws Exception {
         indicesAdmin().prepareCreate("test").setSettings(Settings.builder().put("index.number_of_shards", 3)).get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         for (int i = 0; i < 100; i++) {
             prepareIndex("test").setId(Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).get();
@@ -119,9 +119,9 @@ public void testSimpleScrollQueryThenFetch() throws Exception {
 
     public void testSimpleScrollQueryThenFetchSmallSizeUnevenDistribution() throws Exception {
         indicesAdmin().prepareCreate("test").setSettings(Settings.builder().put("index.number_of_shards", 3)).get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         for (int i = 0; i < 100; i++) {
             String routing = "0";
@@ -189,7 +189,7 @@ public void testSimpleScrollQueryThenFetchSmallSizeUnevenDistribution() throws E
 
     public void testScrollAndUpdateIndex() throws Exception {
         indicesAdmin().prepareCreate("test").setSettings(Settings.builder().put("index.number_of_shards", 5)).get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         for (int i = 0; i < 500; i++) {
             prepareIndex("test").setId(Integer.toString(i))
@@ -241,9 +241,9 @@ public void testScrollAndUpdateIndex() throws Exception {
 
     public void testSimpleScrollQueryThenFetch_clearScrollIds() throws Exception {
         indicesAdmin().prepareCreate("test").setSettings(Settings.builder().put("index.number_of_shards", 3)).get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         for (int i = 0; i < 100; i++) {
             prepareIndex("test").setId(Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).get();
@@ -360,9 +360,9 @@ public void testClearIllegalScrollId() throws Exception {
 
     public void testSimpleScrollQueryThenFetchClearAllScrollIds() throws Exception {
         indicesAdmin().prepareCreate("test").setSettings(Settings.builder().put("index.number_of_shards", 3)).get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         for (int i = 0; i < 100; i++) {
             prepareIndex("test").setId(Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).get();
@@ -553,7 +553,7 @@ public void testCloseAndReopenOrDeleteWithActiveScroll() {
     public void testScrollInvalidDefaultKeepAlive() throws IOException {
         IllegalArgumentException exc = expectThrows(
             IllegalArgumentException.class,
-            clusterAdmin().prepareUpdateSettings()
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setPersistentSettings(Settings.builder().put("search.max_keep_alive", "1m").put("search.default_keep_alive", "2m"))
         );
         assertThat(exc.getMessage(), containsString("was (2m > 1m)"));
@@ -564,7 +564,8 @@ public void testScrollInvalidDefaultKeepAlive() throws IOException {
 
         exc = expectThrows(
             IllegalArgumentException.class,
-            clusterAdmin().prepareUpdateSettings().setPersistentSettings(Settings.builder().put("search.default_keep_alive", "3m"))
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(Settings.builder().put("search.default_keep_alive", "3m"))
         );
         assertThat(exc.getMessage(), containsString("was (3m > 2m)"));
 
@@ -572,7 +573,8 @@ public void testScrollInvalidDefaultKeepAlive() throws IOException {
 
         exc = expectThrows(
             IllegalArgumentException.class,
-            clusterAdmin().prepareUpdateSettings().setPersistentSettings(Settings.builder().put("search.max_keep_alive", "30s"))
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(Settings.builder().put("search.max_keep_alive", "30s"))
         );
         assertThat(exc.getMessage(), containsString("was (1m > 30s)"));
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java
index 23384d1b199f..e5ca2c6968bb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java
@@ -156,7 +156,7 @@ public void testSimpleStats() throws Exception {
     }
 
     private Set<String> nodeIdsWithIndex(String... indices) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         GroupShardsIterator<ShardIterator> allAssignedShardsGrouped = state.routingTable().allAssignedShardsGrouped(indices, true);
         Set<String> nodes = new HashSet<>();
         for (ShardIterator shardIterator : allAssignedShardsGrouped) {
@@ -239,7 +239,7 @@ public void testOpenContexts() {
     }
 
     protected int numAssignedShards(String... indices) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         GroupShardsIterator<?> allAssignedShardsGrouped = state.routingTable().allAssignedShardsGrouped(indices, true);
         return allAssignedShardsGrouped.size();
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
index 71616abf0dcf..5bdf156e3999 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java
@@ -62,6 +62,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.getRepositoryDataBlobName;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFileExists;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
@@ -153,7 +154,10 @@ public void testRecreateCorruptedRepositoryDuringSnapshotsFails() throws Excepti
         Settings repoSettings = getRepositoryMetadata(repoName).settings();
 
         Path repo = PathUtils.get(repoSettings.get("location"));
-        Files.move(repo.resolve("index-" + repositoryData.getGenId()), repo.resolve("index-" + (repositoryData.getGenId() + 1)));
+        Files.move(
+            repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId())),
+            repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId() + 1))
+        );
 
         logger.info("--> trying to create another snapshot in order for repository to be marked as corrupt");
         final SnapshotException snapshotException = expectThrows(
@@ -967,7 +971,7 @@ public void testQueuedSnapshotsWaitingForShardReady() throws Exception {
 
         logger.info("--> wait for relocations to start");
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareHealth(testIndex).get().getRelocatingShards(), greaterThan(0)),
+            () -> assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, testIndex).get().getRelocatingShards(), greaterThan(0)),
             1L,
             TimeUnit.MINUTES
         );
@@ -2309,7 +2313,7 @@ private static boolean snapshotHasCompletedShard(String repoName, String snapsho
 
     private void corruptIndexN(Path repoPath, long generation) throws IOException {
         logger.info("--> corrupting [index-{}] in [{}]", generation, repoPath);
-        Path indexNBlob = repoPath.resolve(BlobStoreRepository.INDEX_FILE_PREFIX + generation);
+        Path indexNBlob = repoPath.resolve(getRepositoryDataBlobName(generation));
         assertFileExists(indexNBlob);
         Files.write(indexNBlob, randomByteArrayOfLength(1), StandardOpenOption.TRUNCATE_EXISTING);
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java
index abcac0cade45..5a82b4b1ab99 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java
@@ -7,6 +7,7 @@
  */
 package org.elasticsearch.snapshots;
 
+import org.apache.logging.log4j.Level;
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
 import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse;
@@ -14,8 +15,10 @@
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.SnapshotsInProgress;
 import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.metadata.RepositoriesMetadata;
+import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeUnit;
@@ -23,6 +26,7 @@
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.index.IndexVersion;
+import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshotsIntegritySuppressor;
 import org.elasticsearch.repositories.IndexId;
 import org.elasticsearch.repositories.IndexMetaDataGenerations;
 import org.elasticsearch.repositories.Repository;
@@ -32,6 +36,8 @@
 import org.elasticsearch.repositories.ShardGenerations;
 import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
 import org.elasticsearch.repositories.fs.FsRepository;
+import org.elasticsearch.test.ClusterServiceUtils;
+import org.elasticsearch.test.MockLog;
 import org.elasticsearch.xcontent.XContentFactory;
 
 import java.nio.channels.SeekableByteChannel;
@@ -45,9 +51,14 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.METADATA_NAME_FORMAT;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.SNAPSHOT_INDEX_NAME_FORMAT;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.SNAPSHOT_NAME_FORMAT;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.getRepositoryDataBlobName;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFileExists;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasSize;
@@ -80,7 +91,10 @@ public void testRecreateCorruptedRepositoryUnblocksIt() throws Exception {
 
         logger.info("--> move index-N blob to next generation");
         final RepositoryData repositoryData = getRepositoryData(repoName);
-        Files.move(repo.resolve("index-" + repositoryData.getGenId()), repo.resolve("index-" + (repositoryData.getGenId() + 1)));
+        Files.move(
+            repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId())),
+            repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId() + 1))
+        );
 
         assertRepositoryBlocked(repoName, snapshot);
 
@@ -133,13 +147,19 @@ public void testConcurrentlyChangeRepositoryContents() throws Exception {
 
         logger.info("--> move index-N blob to next generation");
         final RepositoryData repositoryData = getRepositoryData(repoName);
-        Files.move(repo.resolve("index-" + repositoryData.getGenId()), repo.resolve("index-" + (repositoryData.getGenId() + 1)));
+        Files.move(
+            repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId())),
+            repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId() + 1))
+        );
 
         assertRepositoryBlocked(repoName, snapshot);
 
         if (randomBoolean()) {
             logger.info("--> move index-N blob back to initial generation");
-            Files.move(repo.resolve("index-" + (repositoryData.getGenId() + 1)), repo.resolve("index-" + repositoryData.getGenId()));
+            Files.move(
+                repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId() + 1)),
+                repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId()))
+            );
 
             logger.info("--> verify repository remains blocked");
             assertRepositoryBlocked(repoName, snapshot);
@@ -205,7 +225,7 @@ public void testFindDanglingLatestGeneration() throws Exception {
         logger.info("--> move index-N blob to next generation");
         final RepositoryData repositoryData = getRepositoryData(repoName);
         final long beforeMoveGen = repositoryData.getGenId();
-        Files.move(repo.resolve("index-" + beforeMoveGen), repo.resolve("index-" + (beforeMoveGen + 1)));
+        Files.move(repo.resolve(getRepositoryDataBlobName(beforeMoveGen)), repo.resolve(getRepositoryDataBlobName(beforeMoveGen + 1)));
 
         logger.info("--> set next generation as pending in the cluster state");
         updateClusterState(
@@ -298,7 +318,7 @@ public void testHandlingMissingRootLevelSnapshotMetadata() throws Exception {
         ); // old-format repository has no cluster UUID
 
         Files.write(
-            repo.resolve(BlobStoreRepository.INDEX_FILE_PREFIX + withoutVersions.getGenId()),
+            repo.resolve(getRepositoryDataBlobName(withoutVersions.getGenId())),
             BytesReference.toBytes(
                 BytesReference.bytes(withoutVersions.snapshotsToXContent(XContentFactory.jsonBuilder(), IndexVersion.current(), true))
             ),
@@ -358,7 +378,7 @@ public void testMountCorruptedRepositoryData() throws Exception {
         logger.info("--> corrupt index-N blob");
         final Repository repository = getRepositoryOnMaster(repoName);
         final RepositoryData repositoryData = getRepositoryData(repoName);
-        Files.write(repo.resolve("index-" + repositoryData.getGenId()), randomByteArrayOfLength(randomIntBetween(1, 100)));
+        Files.write(repo.resolve(getRepositoryDataBlobName(repositoryData.getGenId())), randomByteArrayOfLength(randomIntBetween(1, 100)));
 
         logger.info("--> verify loading repository data throws RepositoryException");
         asInstanceOf(
@@ -398,9 +418,9 @@ public void testHandleSnapshotErrorWithBwCFormat() throws Exception {
         logger.info("--> move shard level metadata to new generation");
         final IndexId indexId = getRepositoryData(repoName).resolveIndexId(indexName);
         final Path shardPath = repoPath.resolve("indices").resolve(indexId.getId()).resolve("0");
-        final Path initialShardMetaPath = shardPath.resolve(BlobStoreRepository.INDEX_FILE_PREFIX + "0");
+        final Path initialShardMetaPath = shardPath.resolve(Strings.format(SNAPSHOT_INDEX_NAME_FORMAT, "0"));
         assertFileExists(initialShardMetaPath);
-        Files.move(initialShardMetaPath, shardPath.resolve(BlobStoreRepository.INDEX_FILE_PREFIX + "1"));
+        Files.move(initialShardMetaPath, shardPath.resolve(Strings.format(SNAPSHOT_INDEX_NAME_FORMAT, "1")));
 
         startDeleteSnapshot(repoName, oldVersionSnapshot).get();
 
@@ -423,9 +443,9 @@ public void testRepairBrokenShardGenerations() throws Exception {
         logger.info("--> move shard level metadata to new generation and make RepositoryData point at an older generation");
         final IndexId indexId = getRepositoryData(repoName).resolveIndexId(indexName);
         final Path shardPath = repoPath.resolve("indices").resolve(indexId.getId()).resolve("0");
-        final Path initialShardMetaPath = shardPath.resolve(BlobStoreRepository.INDEX_FILE_PREFIX + "0");
+        final Path initialShardMetaPath = shardPath.resolve(Strings.format(SNAPSHOT_INDEX_NAME_FORMAT, "0"));
         assertFileExists(initialShardMetaPath);
-        Files.move(initialShardMetaPath, shardPath.resolve(BlobStoreRepository.INDEX_FILE_PREFIX + randomIntBetween(1, 1000)));
+        Files.move(initialShardMetaPath, shardPath.resolve(Strings.format(SNAPSHOT_INDEX_NAME_FORMAT, randomIntBetween(1, 1000))));
 
         final RepositoryData repositoryData = getRepositoryData(repoName);
         final Map<String, SnapshotId> snapshotIds = repositoryData.getSnapshotIds()
@@ -442,7 +462,7 @@ public void testRepairBrokenShardGenerations() throws Exception {
             repositoryData.getClusterUUID()
         );
         Files.write(
-            repoPath.resolve(BlobStoreRepository.INDEX_FILE_PREFIX + repositoryData.getGenId()),
+            repoPath.resolve(getRepositoryDataBlobName(repositoryData.getGenId())),
             BytesReference.toBytes(
                 BytesReference.bytes(brokenRepoData.snapshotsToXContent(XContentFactory.jsonBuilder(), IndexVersion.current()))
             ),
@@ -491,7 +511,7 @@ public void testSnapshotWithCorruptedShardIndexFile() throws Exception {
         final Path shardIndexFile = repo.resolve("indices")
             .resolve(corruptedIndex.getId())
             .resolve("0")
-            .resolve("index-" + repositoryData.shardGenerations().getShardGen(corruptedIndex, 0));
+            .resolve(Strings.format(SNAPSHOT_INDEX_NAME_FORMAT, repositoryData.shardGenerations().getShardGen(corruptedIndex, 0)));
 
         logger.info("-->  truncating shard index file [{}]", shardIndexFile);
         try (SeekableByteChannel outChan = Files.newByteChannel(shardIndexFile, StandardOpenOption.WRITE)) {
@@ -564,10 +584,15 @@ public void testDeleteSnapshotWithMissingIndexAndShardMetadata() throws Exceptio
             Path shardZero = indicesPath.resolve(indexIds.get(index).getId()).resolve("0");
             if (randomBoolean()) {
                 Files.delete(
-                    shardZero.resolve("index-" + getRepositoryData("test-repo").shardGenerations().getShardGen(indexIds.get(index), 0))
+                    shardZero.resolve(
+                        Strings.format(
+                            BlobStoreRepository.SNAPSHOT_INDEX_NAME_FORMAT,
+                            getRepositoryData("test-repo").shardGenerations().getShardGen(indexIds.get(index), 0)
+                        )
+                    )
                 );
             }
-            Files.delete(shardZero.resolve("snap-" + snapshotInfo.snapshotId().getUUID() + ".dat"));
+            Files.delete(shardZero.resolve(Strings.format(SNAPSHOT_NAME_FORMAT, snapshotInfo.snapshotId().getUUID())));
         }
 
         startDeleteSnapshot("test-repo", "test-snap-1").get();
@@ -608,7 +633,7 @@ public void testDeleteSnapshotWithMissingMetadata() throws Exception {
         );
 
         logger.info("--> delete global state metadata");
-        Path metadata = repo.resolve("meta-" + createSnapshotResponse.getSnapshotInfo().snapshotId().getUUID() + ".dat");
+        Path metadata = repo.resolve(Strings.format(METADATA_NAME_FORMAT, createSnapshotResponse.getSnapshotInfo().snapshotId().getUUID()));
         Files.delete(metadata);
 
         startDeleteSnapshot("test-repo", "test-snap-1").get();
@@ -651,7 +676,9 @@ public void testDeleteSnapshotWithCorruptedSnapshotFile() throws Exception {
         );
 
         logger.info("--> truncate snapshot file to make it unreadable");
-        Path snapshotPath = repo.resolve("snap-" + createSnapshotResponse.getSnapshotInfo().snapshotId().getUUID() + ".dat");
+        Path snapshotPath = repo.resolve(
+            Strings.format(SNAPSHOT_NAME_FORMAT, createSnapshotResponse.getSnapshotInfo().snapshotId().getUUID())
+        );
         try (SeekableByteChannel outChan = Files.newByteChannel(snapshotPath, StandardOpenOption.WRITE)) {
             outChan.truncate(randomInt(10));
         }
@@ -698,7 +725,7 @@ public void testDeleteSnapshotWithCorruptedGlobalState() throws Exception {
 
         SnapshotInfo snapshotInfo = createFullSnapshot("test-repo", "test-snap");
 
-        final Path globalStatePath = repo.resolve("meta-" + snapshotInfo.snapshotId().getUUID() + ".dat");
+        final Path globalStatePath = repo.resolve(Strings.format(METADATA_NAME_FORMAT, snapshotInfo.snapshotId().getUUID()));
         if (randomBoolean()) {
             // Delete the global state metadata file
             IOUtils.deleteFilesIgnoringExceptions(globalStatePath);
@@ -747,41 +774,131 @@ public void testSnapshotWithMissingShardLevelIndexFile() throws Exception {
             .setWaitForCompletion(true)
             .setIndices("test-idx-*")
             .get();
+        final boolean repairWithDelete = randomBoolean();
+        if (repairWithDelete || randomBoolean()) {
+            clusterAdmin().prepareCreateSnapshot(TEST_REQUEST_TIMEOUT, "test-repo", "snap-for-deletion")
+                .setWaitForCompletion(true)
+                .setIndices("test-idx-1")
+                .get();
+        }
 
         logger.info("--> deleting shard level index file");
         final Path indicesPath = repo.resolve("indices");
         for (IndexId indexId : getRepositoryData("test-repo").getIndices().values()) {
             final Path shardGen;
             try (Stream<Path> shardFiles = Files.list(indicesPath.resolve(indexId.getId()).resolve("0"))) {
-                shardGen = shardFiles.filter(file -> file.getFileName().toString().startsWith(BlobStoreRepository.INDEX_FILE_PREFIX))
+                shardGen = shardFiles.filter(file -> file.getFileName().toString().startsWith(BlobStoreRepository.SNAPSHOT_INDEX_PREFIX))
                     .findFirst()
                     .orElseThrow(() -> new AssertionError("Failed to find shard index blob"));
             }
             Files.delete(shardGen);
         }
 
-        logger.info("--> creating another snapshot");
+        if (randomBoolean()) {
+            logger.info("""
+                --> restoring the snapshot, the repository should not have lost any shard data despite deleting index-*, \
+                because it uses snap-*.dat files and not the index-* to determine what files to restore""");
+            indicesAdmin().prepareDelete("test-idx-1", "test-idx-2").get();
+            RestoreSnapshotResponse restoreSnapshotResponse = clusterAdmin().prepareRestoreSnapshot(
+                TEST_REQUEST_TIMEOUT,
+                "test-repo",
+                "test-snap-1"
+            ).setWaitForCompletion(true).get();
+            assertEquals(0, restoreSnapshotResponse.getRestoreInfo().failedShards());
+            ensureGreen("test-idx-1", "test-idx-2");
+        }
+
+        logger.info("--> creating another snapshot, which should re-create the missing file");
+        try (
+            var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor();
+            var mockLog = MockLog.capture(BlobStoreRepository.class)
+        ) {
+            mockLog.addExpectation(
+                new MockLog.SeenEventExpectation(
+                    "fallback message",
+                    "org.elasticsearch.repositories.blobstore.BlobStoreRepository",
+                    Level.ERROR,
+                    "index [test-idx-1/*] shard generation [*] in [test-repo][*] not found - falling back to reading all shard snapshots"
+                )
+            );
+            mockLog.addExpectation(
+                new MockLog.SeenEventExpectation(
+                    "shard blobs list",
+                    "org.elasticsearch.repositories.blobstore.BlobStoreRepository",
+                    Level.ERROR,
+                    "read shard snapshots [*] due to missing shard generation [*] for index [test-idx-1/*] in [test-repo][*]"
+                )
+            );
+            if (repairWithDelete) {
+                clusterAdmin().prepareDeleteSnapshot(TEST_REQUEST_TIMEOUT, "test-repo", "snap-for-deletion").get();
+            } else if (randomBoolean()) {
+                CreateSnapshotResponse createSnapshotResponse = clusterAdmin().prepareCreateSnapshot(
+                    TEST_REQUEST_TIMEOUT,
+                    "test-repo",
+                    "test-snap-2"
+                ).setWaitForCompletion(true).setIndices("test-idx-1").get();
+                assertEquals(
+                    createSnapshotResponse.getSnapshotInfo().totalShards(),
+                    createSnapshotResponse.getSnapshotInfo().successfulShards()
+                );
+            } else {
+                clusterAdmin().prepareCloneSnapshot(TEST_REQUEST_TIMEOUT, "test-repo", "test-snap-1", "test-snap-2")
+                    .setIndices("test-idx-1")
+                    .get();
+                safeAwait(
+                    ClusterServiceUtils.addTemporaryStateListener(
+                        internalCluster().getInstance(ClusterService.class),
+                        cs -> SnapshotsInProgress.get(cs).isEmpty()
+                    )
+                );
+                assertThat(
+                    clusterAdmin().prepareGetSnapshots(TEST_REQUEST_TIMEOUT, "test-repo")
+                        .setSnapshots("test-snap-2")
+                        .get()
+                        .getSnapshots()
+                        .get(0)
+                        .shardFailures(),
+                    empty()
+                );
+            }
+            mockLog.assertAllExpectationsMatched();
+
+            try (
+                Stream<Path> shardFiles = Files.list(
+                    indicesPath.resolve(getRepositoryData("test-repo").resolveIndexId("test-idx-1").getId()).resolve("0")
+                )
+            ) {
+                assertTrue(shardFiles.anyMatch(file -> file.getFileName().toString().startsWith(BlobStoreRepository.INDEX_FILE_PREFIX)));
+            }
+        }
+
+        if (randomBoolean()) {
+            indicesAdmin().prepareDelete("test-idx-1").get();
+            RestoreSnapshotResponse restoreSnapshotResponse2 = clusterAdmin().prepareRestoreSnapshot(
+                TEST_REQUEST_TIMEOUT,
+                "test-repo",
+                repairWithDelete ? "test-snap-1" : randomFrom("test-snap-1", "test-snap-2")
+            ).setIndices("test-idx-1").setWaitForCompletion(true).get();
+            assertEquals(0, restoreSnapshotResponse2.getRestoreInfo().failedShards());
+            ensureGreen("test-idx-1", "test-idx-2");
+        }
+
+        logger.info("--> creating another snapshot, which should succeed since the shard gen file now exists again");
         CreateSnapshotResponse createSnapshotResponse = clusterAdmin().prepareCreateSnapshot(
             TEST_REQUEST_TIMEOUT,
             "test-repo",
-            "test-snap-2"
+            "test-snap-3"
         ).setWaitForCompletion(true).setIndices("test-idx-1").get();
-        assertEquals(
-            createSnapshotResponse.getSnapshotInfo().successfulShards(),
-            createSnapshotResponse.getSnapshotInfo().totalShards() - 1
-        );
+        assertEquals(createSnapshotResponse.getSnapshotInfo().totalShards(), createSnapshotResponse.getSnapshotInfo().successfulShards());
 
-        logger.info(
-            "--> restoring the first snapshot, the repository should not have lost any shard data despite deleting index-N, "
-                + "because it uses snap-*.data files and not the index-N to determine what files to restore"
-        );
-        indicesAdmin().prepareDelete("test-idx-1", "test-idx-2").get();
-        RestoreSnapshotResponse restoreSnapshotResponse = clusterAdmin().prepareRestoreSnapshot(
+        indicesAdmin().prepareDelete("test-idx-1").get();
+        RestoreSnapshotResponse restoreSnapshotResponse3 = clusterAdmin().prepareRestoreSnapshot(
             TEST_REQUEST_TIMEOUT,
             "test-repo",
-            "test-snap-1"
-        ).setWaitForCompletion(true).get();
-        assertEquals(0, restoreSnapshotResponse.getRestoreInfo().failedShards());
+            repairWithDelete ? randomFrom("test-snap-1", "test-snap-3") : randomFrom("test-snap-1", "test-snap-2", "test-snap-3")
+        ).setIndices("test-idx-1").setWaitForCompletion(true).get();
+        assertEquals(0, restoreSnapshotResponse3.getRestoreInfo().failedShards());
+        ensureGreen("test-idx-1", "test-idx-2");
     }
 
     public void testDeletesWithUnexpectedIndexBlob() throws Exception {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CustomMetadataContextIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CustomMetadataContextIT.java
index 041d72259139..08f9d74ab477 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CustomMetadataContextIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CustomMetadataContextIT.java
@@ -106,7 +106,7 @@ public void testShouldRestoreOnlySnapshotMetadata() throws Exception {
             .setWaitForCompletion(true)
             .get();
 
-        var metadata = clusterAdmin().prepareState().get().getState().getMetadata();
+        var metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getMetadata();
         logger.info("check that custom persistent metadata [{}] is correctly restored", metadata);
         if (isSnapshotMetadataSet) {
             assertThat(metadata.<SnapshotMetadata>custom(SnapshotMetadata.TYPE).getData(), equalTo("before_snapshot_s"));
@@ -127,7 +127,7 @@ public void testShouldKeepGatewayMetadataAfterRestart() throws Exception {
         internalCluster().fullRestart();
         ensureYellow();
 
-        var metadata = clusterAdmin().prepareState().get().getState().getMetadata();
+        var metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getMetadata();
         logger.info("check that gateway custom metadata [{}] survived full cluster restart", metadata);
         assertThat(metadata.<GatewayMetadata>custom(GatewayMetadata.TYPE).getData(), equalTo("before_restart_s_gw"));
         assertThat(metadata.<ApiMetadata>custom(ApiMetadata.TYPE), nullValue());
@@ -140,7 +140,7 @@ public void testShouldExposeApiMetadata() throws Exception {
             metadataBuilder.putCustom(NonApiMetadata.TYPE, new NonApiMetadata("before_restart_ns"));
         }));
 
-        var metadata = clusterAdmin().prepareState().get().getState().getMetadata();
+        var metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getMetadata();
         logger.info("check that api custom metadata [{}] is visible via api", metadata);
         assertThat(metadata.<ApiMetadata>custom(ApiMetadata.TYPE).getData(), equalTo("before_restart_s_gw"));
         assertThat(metadata.<NonApiMetadata>custom(NonApiMetadata.TYPE), nullValue());
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
index b2b3de51dd04..3788f2dd2cb6 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
@@ -86,6 +86,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.elasticsearch.index.seqno.RetentionLeaseActions.RETAIN_ALL;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.METADATA_BLOB_NAME_SUFFIX;
 import static org.elasticsearch.test.NodeRoles.nonMasterNode;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFutureThrows;
@@ -244,7 +245,7 @@ public void testRestoreIndexWithMissingShards() throws Exception {
         logger.info("--> shutdown one of the nodes");
         internalCluster().stopRandomDataNode();
         assertThat(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(TimeValue.timeValueMinutes(1))
                 .setWaitForNodes("<2")
@@ -431,7 +432,7 @@ public boolean clearData(String nodeName) {
         });
 
         assertThat(
-            clusterAdmin().prepareHealth()
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setTimeout(TimeValue.timeValueMinutes(1))
                 .setWaitForNodes("2")
@@ -665,7 +666,7 @@ public void testRestoreShrinkIndex() throws Exception {
         assertAcked(indicesAdmin().prepareDelete(sourceIdx).get());
         assertAcked(indicesAdmin().prepareDelete(shrunkIdx).get());
         internalCluster().stopRandomDataNode();
-        clusterAdmin().prepareHealth().setTimeout(TimeValue.timeValueSeconds(30)).setWaitForNodes("1");
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setTimeout(TimeValue.timeValueSeconds(30)).setWaitForNodes("1");
 
         logger.info("--> start a new data node");
         final Settings dataSettings = Settings.builder()
@@ -673,7 +674,7 @@ public void testRestoreShrinkIndex() throws Exception {
             .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) // to get a new node id
             .build();
         internalCluster().startDataOnlyNode(dataSettings);
-        clusterAdmin().prepareHealth().setTimeout(TimeValue.timeValueSeconds(30)).setWaitForNodes("2");
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setTimeout(TimeValue.timeValueSeconds(30)).setWaitForNodes("2");
 
         logger.info("--> restore the shrunk index and ensure all shards are allocated");
         RestoreSnapshotResponse restoreResponse = clusterAdmin().prepareRestoreSnapshot(TEST_REQUEST_TIMEOUT, repo, snapshot)
@@ -1126,7 +1127,7 @@ public void testSnapshotDeleteRelocatingPrimaryIndex() throws Exception {
         logger.info("--> wait for relocations to start");
 
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareHealth(indexName).get().getRelocatingShards(), greaterThan(0)),
+            () -> assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).get().getRelocatingShards(), greaterThan(0)),
             1L,
             TimeUnit.MINUTES
         );
@@ -1316,7 +1317,7 @@ private static List<Path> findRepoMetaBlobs(Path repoPath) throws IOException {
         List<Path> files = new ArrayList<>();
         forEachFileRecursively(repoPath.resolve("indices"), ((file, basicFileAttributes) -> {
             final String fileName = file.getFileName().toString();
-            if (fileName.startsWith(BlobStoreRepository.METADATA_PREFIX) && fileName.endsWith(".dat")) {
+            if (fileName.startsWith(BlobStoreRepository.METADATA_PREFIX) && fileName.endsWith(METADATA_BLOB_NAME_SUFFIX)) {
                 files.add(file);
             }
         }));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/GetSnapshotsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/GetSnapshotsIT.java
index 477fd9737394..6f02ac5c983a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/GetSnapshotsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/GetSnapshotsIT.java
@@ -40,7 +40,6 @@
 import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.repositories.RepositoryData;
 import org.elasticsearch.repositories.RepositoryMissingException;
-import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
 import org.elasticsearch.repositories.fs.FsRepository;
 import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.test.ESTestCase;
@@ -63,6 +62,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.getRepositoryDataBlobName;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.hasSize;
@@ -1042,7 +1042,7 @@ private static void removeDetailsForRandomSnapshots(String repositoryName, Actio
         final var repositoryMetadata = repository.getMetadata();
         final var repositorySettings = repositoryMetadata.settings();
         final var repositoryDataBlobPath = asInstanceOf(FsBlobStore.class, repository.blobStore()).path()
-            .resolve(BlobStoreRepository.INDEX_FILE_PREFIX + repositoryMetadata.generation());
+            .resolve(getRepositoryDataBlobName(repositoryMetadata.generation()));
 
         SubscribableListener
 
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/MultiClusterRepoAccessIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/MultiClusterRepoAccessIT.java
index fc727007724d..2daa36ee00a0 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/MultiClusterRepoAccessIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/MultiClusterRepoAccessIT.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.env.Environment;
+import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshotsIntegritySuppressor;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.repositories.RepositoryException;
 import org.elasticsearch.test.ESIntegTestCase;
@@ -98,7 +99,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
         return CollectionUtils.appendToCopy(super.nodePlugins(), getTestTransportPlugin());
     }
 
-    public void testConcurrentDeleteFromOtherCluster() throws InterruptedException {
+    public void testConcurrentDeleteFromOtherCluster() {
         internalCluster().startMasterOnlyNode();
         internalCluster().startDataOnlyNode();
         final String repoNameOnFirstCluster = "test-repo";
@@ -125,10 +126,13 @@ public void testConcurrentDeleteFromOtherCluster() throws InterruptedException {
         secondCluster.client().admin().cluster().prepareDeleteSnapshot(TEST_REQUEST_TIMEOUT, repoNameOnSecondCluster, "snap-1").get();
         secondCluster.client().admin().cluster().prepareDeleteSnapshot(TEST_REQUEST_TIMEOUT, repoNameOnSecondCluster, "snap-2").get();
 
-        final SnapshotException sne = expectThrows(
-            SnapshotException.class,
-            clusterAdmin().prepareCreateSnapshot(TEST_REQUEST_TIMEOUT, repoNameOnFirstCluster, "snap-4").setWaitForCompletion(true)
-        );
+        final SnapshotException sne;
+        try (var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor()) {
+            sne = expectThrows(
+                SnapshotException.class,
+                clusterAdmin().prepareCreateSnapshot(TEST_REQUEST_TIMEOUT, repoNameOnFirstCluster, "snap-4").setWaitForCompletion(true)
+            );
+        }
         assertThat(sne.getMessage(), containsString("failed to update snapshot in repository"));
         final RepositoryException cause = (RepositoryException) sne.getCause();
         assertThat(
@@ -138,7 +142,7 @@ public void testConcurrentDeleteFromOtherCluster() throws InterruptedException {
                     + repoNameOnFirstCluster
                     + "] concurrent modification of the index-N file, expected current generation [2] but it was not found in "
                     + "the repository. The last cluster to write to this repository was ["
-                    + secondCluster.client().admin().cluster().prepareState().get().getState().metadata().clusterUUID()
+                    + secondCluster.client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().clusterUUID()
                     + "] at generation [4]."
             )
         );
@@ -147,7 +151,7 @@ public void testConcurrentDeleteFromOtherCluster() throws InterruptedException {
         createFullSnapshot(repoNameOnFirstCluster, "snap-5");
     }
 
-    public void testConcurrentWipeAndRecreateFromOtherCluster() throws InterruptedException, IOException {
+    public void testConcurrentWipeAndRecreateFromOtherCluster() throws IOException {
         internalCluster().startMasterOnlyNode();
         internalCluster().startDataOnlyNode();
         final String repoName = "test-repo";
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoriesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoriesIT.java
index d4c0a4c80a3b..6870a1d6b264 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoriesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoriesIT.java
@@ -75,7 +75,12 @@ public void testRepositoryCreation() throws Exception {
         assertThat(FileSystemUtils.files(location).length, equalTo(numberOfFiles));
 
         logger.info("--> check that repository is really there");
-        ClusterStateResponse clusterStateResponse = client.admin().cluster().prepareState().clear().setMetadata(true).get();
+        ClusterStateResponse clusterStateResponse = client.admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setMetadata(true)
+            .get();
         Metadata metadata = clusterStateResponse.getState().getMetadata();
         RepositoriesMetadata repositoriesMetadata = metadata.custom(RepositoriesMetadata.TYPE);
         assertThat(repositoriesMetadata, notNullValue());
@@ -86,7 +91,7 @@ public void testRepositoryCreation() throws Exception {
         createRepository("test-repo-2", "fs");
 
         logger.info("--> check that both repositories are in cluster state");
-        clusterStateResponse = client.admin().cluster().prepareState().clear().setMetadata(true).get();
+        clusterStateResponse = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).clear().setMetadata(true).get();
         metadata = clusterStateResponse.getState().getMetadata();
         repositoriesMetadata = metadata.custom(RepositoriesMetadata.TYPE);
         assertThat(repositoriesMetadata, notNullValue());
@@ -117,7 +122,7 @@ public void testRepositoryCreation() throws Exception {
                 .isAcknowledged(),
             equalTo(true)
         );
-        assertEquals(beforeStateUuid, client.admin().cluster().prepareState().clear().get().getState().stateUUID());
+        assertEquals(beforeStateUuid, client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).clear().get().getState().stateUUID());
 
         logger.info("--> delete repository test-repo-1");
         client.admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "test-repo-1").get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoryIntegrityHealthIndicatorServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoryIntegrityHealthIndicatorServiceIT.java
index 1a54df1f85ed..8a0b74242ba9 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoryIntegrityHealthIndicatorServiceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoryIntegrityHealthIndicatorServiceIT.java
@@ -22,6 +22,7 @@
 
 import static org.elasticsearch.health.HealthStatus.GREEN;
 import static org.elasticsearch.health.HealthStatus.YELLOW;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.getRepositoryDataBlobName;
 import static org.elasticsearch.snapshots.RepositoryIntegrityHealthIndicatorService.NAME;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
@@ -73,6 +74,6 @@ private void assertSnapshotRepositoryHealth(String message, Client client, Healt
 
     private void corruptRepository(String name, Path location) throws IOException {
         final RepositoryData repositoryData = getRepositoryData(name);
-        Files.delete(location.resolve("index-" + repositoryData.getGenId()));
+        Files.delete(location.resolve(getRepositoryDataBlobName(repositoryData.getGenId())));
     }
 }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java
index 7626e59cd1b9..725fcbc1a584 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java
@@ -224,7 +224,7 @@ public void testRestoreIncreasesPrimaryTerms() {
             }
         }
 
-        final IndexMetadata indexMetadata = clusterAdmin().prepareState()
+        final IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setIndices(indexName)
             .setMetadata(true)
@@ -251,7 +251,7 @@ public void testRestoreIncreasesPrimaryTerms() {
         assertThat(restoreSnapshotResponse.getRestoreInfo().successfulShards(), equalTo(numPrimaries));
         assertThat(restoreSnapshotResponse.getRestoreInfo().failedShards(), equalTo(0));
 
-        final IndexMetadata restoredIndexMetadata = clusterAdmin().prepareState()
+        final IndexMetadata restoredIndexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setIndices(indexName)
             .setMetadata(true)
@@ -307,7 +307,13 @@ public void testRestoreWithDifferentMappingsAndSettings() throws Exception {
         assertThat(restoreSnapshotResponse.getRestoreInfo().totalShards(), greaterThan(0));
 
         logger.info("--> assert that old mapping is restored");
-        MappingMetadata mappings = clusterAdmin().prepareState().get().getState().getMetadata().getIndices().get("test-idx").mapping();
+        MappingMetadata mappings = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .getMetadata()
+            .getIndices()
+            .get("test-idx")
+            .mapping();
         assertThat(mappings.sourceAsMap().toString(), containsString("baz"));
         assertThat(mappings.sourceAsMap().toString(), not(containsString("foo")));
 
@@ -818,7 +824,14 @@ public void testRecreateBlocksOnRestore() throws Exception {
                 .get();
             assertThat(restoreSnapshotResponse.getRestoreInfo().totalShards(), greaterThan(0));
 
-            ClusterBlocks blocks = client.admin().cluster().prepareState().clear().setBlocks(true).get().getState().blocks();
+            ClusterBlocks blocks = client.admin()
+                .cluster()
+                .prepareState(TEST_REQUEST_TIMEOUT)
+                .clear()
+                .setBlocks(true)
+                .get()
+                .getState()
+                .blocks();
             // compute current index settings (as we cannot query them if they contain SETTING_BLOCKS_METADATA)
             Settings mergedSettings = Settings.builder().put(initialSettings).put(changedSettings).build();
             logger.info("--> merged block settings {}", mergedSettings);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java
index 531e9f4f45af..08daeaaec016 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java
@@ -86,7 +86,9 @@
 import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
 import static org.elasticsearch.cluster.routing.allocation.decider.MaxRetryAllocationDecider.SETTING_ALLOCATION_MAX_RETRY;
 import static org.elasticsearch.index.shard.IndexShardTests.getEngineFromShard;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.METADATA_NAME_FORMAT;
 import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.READONLY_SETTING_KEY;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.SNAPSHOT_NAME_FORMAT;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
@@ -226,7 +228,7 @@ public void testBasicWorkFlow() throws Exception {
 
         ensureGreen();
         assertDocCount("test-idx-1", 100);
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.getMetadata().hasIndex("test-idx-1"), equalTo(true));
         assertThat(clusterState.getMetadata().hasIndex("test-idx-2"), equalTo(false));
 
@@ -509,7 +511,7 @@ public void testDataFileFailureDuringRestore() throws Exception {
             // same node again during the same reroute operation. Then another reroute
             // operation is scheduled, but the RestoreInProgressAllocationDecider will
             // block the shard to be assigned again because it failed during restore.
-            final ClusterStateResponse clusterStateResponse = client.admin().cluster().prepareState().get();
+            final ClusterStateResponse clusterStateResponse = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get();
             assertEquals(1, clusterStateResponse.getState().getNodes().getDataNodes().size());
             assertEquals(
                 restoreInfo.failedShards(),
@@ -661,7 +663,10 @@ private void unrestorableUseCase(
         assertThat(restoreResponse.getRestoreInfo().totalShards(), equalTo(numShards.numPrimaries));
         assertThat(restoreResponse.getRestoreInfo().successfulShards(), equalTo(0));
 
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().setCustoms(true).setRoutingTable(true).get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .setCustoms(true)
+            .setRoutingTable(true)
+            .get();
 
         // check that there is no restore in progress
         RestoreInProgress restoreInProgress = clusterStateResponse.getState().custom(RestoreInProgress.TYPE);
@@ -865,7 +870,7 @@ public void testSnapshotClosedIndex() throws Exception {
         ensureGreen();
         logger.info("-->  closing index test-idx-closed");
         assertAcked(client.admin().indices().prepareClose("test-idx-closed"));
-        ClusterStateResponse stateResponse = client.admin().cluster().prepareState().get();
+        ClusterStateResponse stateResponse = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertThat(stateResponse.getState().metadata().index("test-idx-closed").getState(), equalTo(IndexMetadata.State.CLOSE));
         assertThat(stateResponse.getState().routingTable().index("test-idx-closed"), notNullValue());
 
@@ -1259,7 +1264,7 @@ public void testSnapshotRelocatingPrimary() throws Exception {
         logger.info("--> wait for relocations to start");
 
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareHealth("test-idx").get().getRelocatingShards(), greaterThan(0)),
+            () -> assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test-idx").get().getRelocatingShards(), greaterThan(0)),
             1L,
             TimeUnit.MINUTES
         );
@@ -1578,7 +1583,7 @@ public void testListCorruptedSnapshot() throws Exception {
         final SnapshotInfo snapshotInfo = createSnapshot("test-repo", "test-snap-2", Collections.singletonList("test-idx-*"));
 
         logger.info("--> truncate snapshot file to make it unreadable");
-        Path snapshotPath = repo.resolve("snap-" + snapshotInfo.snapshotId().getUUID() + ".dat");
+        Path snapshotPath = repo.resolve(Strings.format(SNAPSHOT_NAME_FORMAT, snapshotInfo.snapshotId().getUUID()));
         try (SeekableByteChannel outChan = Files.newByteChannel(snapshotPath, StandardOpenOption.WRITE)) {
             outChan.truncate(randomInt(10));
         }
@@ -1621,7 +1626,7 @@ public void testRestoreSnapshotWithCorruptedGlobalState() throws Exception {
         final String snapshotName = "test-snap";
         final SnapshotInfo snapshotInfo = createFullSnapshot(repoName, snapshotName);
 
-        final Path globalStatePath = repo.resolve("meta-" + snapshotInfo.snapshotId().getUUID() + ".dat");
+        final Path globalStatePath = repo.resolve(Strings.format(METADATA_NAME_FORMAT, snapshotInfo.snapshotId().getUUID()));
         try (SeekableByteChannel outChan = Files.newByteChannel(globalStatePath, StandardOpenOption.WRITE)) {
             outChan.truncate(randomInt(10));
         }
@@ -1701,7 +1706,10 @@ public void testRestoreSnapshotWithCorruptedIndexMetadata() throws Exception {
         final Path indexMetadataPath = repo.resolve("indices")
             .resolve(corruptedIndex.getId())
             .resolve(
-                "meta-" + repositoryData.indexMetaDataGenerations().indexMetaBlobId(snapshotInfo.snapshotId(), corruptedIndex) + ".dat"
+                Strings.format(
+                    METADATA_NAME_FORMAT,
+                    repositoryData.indexMetaDataGenerations().indexMetaBlobId(snapshotInfo.snapshotId(), corruptedIndex)
+                )
             );
 
         // Truncate the index metadata file
@@ -2180,7 +2188,7 @@ public void testHiddenIndicesIncludedInSnapshot() throws Exception {
                 equalTo(restoreSnapshotResponse.getRestoreInfo().totalShards())
             );
             assertThat(restoreSnapshotResponse.getRestoreInfo().indices(), containsInAnyOrder(normalIndex, hiddenIndex, dottedHiddenIndex));
-            ClusterState clusterState = client.admin().cluster().prepareState().get().getState();
+            ClusterState clusterState = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertThat(clusterState.getMetadata().hasIndex(normalIndex), equalTo(true));
             assertThat(clusterState.getMetadata().hasIndex(hiddenIndex), equalTo(true));
             assertThat(clusterState.getMetadata().hasIndex(dottedHiddenIndex), equalTo(true));
@@ -2200,7 +2208,7 @@ public void testHiddenIndicesIncludedInSnapshot() throws Exception {
                 equalTo(restoreSnapshotResponse.getRestoreInfo().totalShards())
             );
             assertThat(restoreSnapshotResponse.getRestoreInfo().indices(), containsInAnyOrder(normalIndex, hiddenIndex));
-            ClusterState clusterState = client.admin().cluster().prepareState().get().getState();
+            ClusterState clusterState = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertThat(clusterState.getMetadata().hasIndex(normalIndex), equalTo(true));
             assertThat(clusterState.getMetadata().hasIndex(hiddenIndex), equalTo(true));
             assertThat(clusterState.getMetadata().hasIndex(dottedHiddenIndex), equalTo(false));
@@ -2220,7 +2228,7 @@ public void testHiddenIndicesIncludedInSnapshot() throws Exception {
                 equalTo(restoreSnapshotResponse.getRestoreInfo().totalShards())
             );
             assertThat(restoreSnapshotResponse.getRestoreInfo().indices(), containsInAnyOrder(hiddenIndex));
-            ClusterState clusterState = client.admin().cluster().prepareState().get().getState();
+            ClusterState clusterState = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertThat(clusterState.getMetadata().hasIndex(normalIndex), equalTo(false));
             assertThat(clusterState.getMetadata().hasIndex(hiddenIndex), equalTo(true));
             assertThat(clusterState.getMetadata().hasIndex(dottedHiddenIndex), equalTo(false));
@@ -2240,7 +2248,7 @@ public void testHiddenIndicesIncludedInSnapshot() throws Exception {
                 equalTo(restoreSnapshotResponse.getRestoreInfo().totalShards())
             );
             assertThat(restoreSnapshotResponse.getRestoreInfo().indices(), containsInAnyOrder(dottedHiddenIndex));
-            ClusterState clusterState = client.admin().cluster().prepareState().get().getState();
+            ClusterState clusterState = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertThat(clusterState.getMetadata().hasIndex(normalIndex), equalTo(false));
             assertThat(clusterState.getMetadata().hasIndex(hiddenIndex), equalTo(false));
             assertThat(clusterState.getMetadata().hasIndex(dottedHiddenIndex), equalTo(true));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotBrokenSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotBrokenSettingsIT.java
index 6c91db0ad722..92e0b437cbeb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotBrokenSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotBrokenSettingsIT.java
@@ -36,14 +36,14 @@ public void testExceptionWhenRestoringPersistentSettings() {
         Client client = client();
         Consumer<String> setSettingValue = value -> client.admin()
             .cluster()
-            .prepareUpdateSettings()
+            .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().put(BrokenSettingPlugin.BROKEN_SETTING.getKey(), value))
             .get();
 
         Consumer<String> assertSettingValue = value -> assertThat(
             client.admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .setRoutingTable(false)
                 .setNodes(false)
                 .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotCustomPluginStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotCustomPluginStateIT.java
index 8f2702099c10..a3f1f0038a03 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotCustomPluginStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotCustomPluginStateIT.java
@@ -18,15 +18,12 @@
 import org.elasticsearch.action.admin.cluster.storedscripts.GetStoredScriptResponse;
 import org.elasticsearch.action.admin.cluster.storedscripts.TransportDeleteStoredScriptAction;
 import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
-import org.elasticsearch.action.ingest.DeletePipelineRequest;
 import org.elasticsearch.action.ingest.GetPipelineResponse;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.ingest.IngestTestPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.MockScriptEngine;
 import org.elasticsearch.script.StoredScriptsIT;
 import org.elasticsearch.xcontent.XContentFactory;
-import org.elasticsearch.xcontent.XContentType;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -36,7 +33,6 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertIndexTemplateExists;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertIndexTemplateMissing;
-import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 
@@ -84,18 +80,16 @@ public void testIncludeGlobalState() throws Exception {
 
         if (testPipeline) {
             logger.info("-->  creating test pipeline");
-            BytesReference pipelineSource = BytesReference.bytes(
-                jsonBuilder().startObject()
-                    .field("description", "my_pipeline")
+            putJsonPipeline(
+                "barbaz",
+                (builder, params) -> builder.field("description", "my_pipeline")
                     .startArray("processors")
                     .startObject()
                     .startObject("test")
                     .endObject()
                     .endObject()
                     .endArray()
-                    .endObject()
             );
-            assertAcked(clusterAdmin().preparePutPipeline("barbaz", pipelineSource, XContentType.JSON).get());
         }
 
         if (testScript) {
@@ -144,7 +138,7 @@ public void testIncludeGlobalState() throws Exception {
 
         if (testPipeline) {
             logger.info("-->  delete test pipeline");
-            assertAcked(clusterAdmin().deletePipeline(new DeletePipelineRequest("barbaz")).get());
+            deletePipeline("barbaz");
         }
 
         if (testScript) {
@@ -184,7 +178,7 @@ public void testIncludeGlobalState() throws Exception {
 
         if (testPipeline) {
             logger.info("--> check that pipeline is restored");
-            GetPipelineResponse getPipelineResponse = clusterAdmin().prepareGetPipeline("barbaz").get();
+            GetPipelineResponse getPipelineResponse = getPipelines("barbaz");
             assertTrue(getPipelineResponse.isFound());
         }
 
@@ -218,7 +212,7 @@ public void testIncludeGlobalState() throws Exception {
             cluster().wipeTemplates("test-template");
         }
         if (testPipeline) {
-            assertAcked(clusterAdmin().deletePipeline(new DeletePipelineRequest("barbaz")).get());
+            deletePipeline("barbaz");
         }
 
         if (testScript) {
@@ -245,7 +239,7 @@ public void testIncludeGlobalState() throws Exception {
         logger.info("--> check that global state wasn't restored but index was");
         getIndexTemplatesResponse = indicesAdmin().prepareGetTemplates().get();
         assertIndexTemplateMissing(getIndexTemplatesResponse, "test-template");
-        assertFalse(clusterAdmin().prepareGetPipeline("barbaz").get().isFound());
+        assertFalse(getPipelines("barbaz").isFound());
         assertNull(safeExecute(GetStoredScriptAction.INSTANCE, new GetStoredScriptRequest(TEST_REQUEST_TIMEOUT, "foobar")).getSource());
         assertDocCount("test-idx", 100L);
     }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotShutdownIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotShutdownIT.java
index 2d1e16dc6427..3d16293c1462 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotShutdownIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotShutdownIT.java
@@ -177,7 +177,12 @@ public void testRemoveNodeAndFailoverMasterDuringSnapshot() throws Exception {
             SubscribableListener.<ActionResponse.Empty>newForked(
                 l -> client().execute(
                     TransportAddVotingConfigExclusionsAction.TYPE,
-                    new AddVotingConfigExclusionsRequest(Strings.EMPTY_ARRAY, new String[] { masterName }, TimeValue.timeValueSeconds(10)),
+                    new AddVotingConfigExclusionsRequest(
+                        TEST_REQUEST_TIMEOUT,
+                        Strings.EMPTY_ARRAY,
+                        new String[] { masterName },
+                        TimeValue.timeValueSeconds(10)
+                    ),
                     l
                 )
             )
@@ -212,7 +217,7 @@ public void testRemoveNodeAndFailoverMasterDuringSnapshot() throws Exception {
         // flush master queue to ensure the completion is applied everywhere
         safeAwait(
             SubscribableListener.<ClusterHealthResponse>newForked(
-                l -> client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).execute(l)
+                l -> client().admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).execute(l)
             )
         );
 
@@ -230,7 +235,7 @@ public void testRemoveNodeAndFailoverMasterDuringSnapshot() throws Exception {
         }
 
         safeAwait(SubscribableListener.<ActionResponse.Empty>newForked(l -> {
-            final var clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest();
+            final var clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT);
             clearVotingConfigExclusionsRequest.setWaitForRemoval(false);
             client().execute(TransportClearVotingConfigExclusionsAction.TYPE, clearVotingConfigExclusionsRequest, l);
         }));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStatusApisIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStatusApisIT.java
index b155ef73783e..d4e27d5630c5 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStatusApisIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStatusApisIT.java
@@ -28,7 +28,6 @@
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
 import org.elasticsearch.threadpool.ThreadPool;
 
 import java.io.IOException;
@@ -45,6 +44,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.SNAPSHOT_NAME_FORMAT;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anEmptyMap;
@@ -142,7 +142,7 @@ public void testExceptionOnMissingSnapBlob() throws IOException {
 
         final SnapshotInfo snapshotInfo = createFullSnapshot("test-repo", "test-snap");
         logger.info("--> delete snap-${uuid}.dat file for this snapshot to simulate concurrent delete");
-        IOUtils.rm(repoPath.resolve(BlobStoreRepository.SNAPSHOT_PREFIX + snapshotInfo.snapshotId().getUUID() + ".dat"));
+        IOUtils.rm(repoPath.resolve(Strings.format(SNAPSHOT_NAME_FORMAT, snapshotInfo.snapshotId().getUUID())));
 
         expectThrows(
             SnapshotMissingException.class,
@@ -173,7 +173,7 @@ public void testExceptionOnMissingShardLevelSnapBlob() throws IOException {
             repoPath.resolve("indices")
                 .resolve(indexRepoId)
                 .resolve("0")
-                .resolve(BlobStoreRepository.SNAPSHOT_PREFIX + snapshotInfo.snapshotId().getUUID() + ".dat")
+                .resolve(Strings.format(SNAPSHOT_NAME_FORMAT, snapshotInfo.snapshotId().getUUID()))
         );
 
         expectThrows(
@@ -738,7 +738,7 @@ public void testInfiniteTimeout() throws Exception {
         try {
             waitForBlockOnAnyDataNode("test-repo");
             // Make sure that the create-snapshot task completes on master
-            assertFalse(clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get().isTimedOut());
+            assertFalse(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get().isTimedOut());
             final List<SnapshotStatus> snapshotStatus = clusterAdmin().prepareSnapshotStatus(TEST_REQUEST_TIMEOUT, "test-repo")
                 .setMasterNodeTimeout(TimeValue.MINUS_ONE)
                 .get()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStressTestsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStressTestsIT.java
index 9c9076dff00e..e8d61e4677c9 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStressTestsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SnapshotStressTestsIT.java
@@ -89,7 +89,12 @@
 public class SnapshotStressTestsIT extends AbstractSnapshotIntegTestCase {
 
     public void testRandomActivities() throws InterruptedException {
-        final DiscoveryNodes discoveryNodes = clusterAdmin().prepareState().clear().setNodes(true).get().getState().nodes();
+        final DiscoveryNodes discoveryNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get()
+            .getState()
+            .nodes();
         new TrackedCluster(internalCluster(), nodeNames(discoveryNodes.getMasterNodes()), nodeNames(discoveryNodes.getDataNodes())).run();
         disableRepoConsistencyCheck("have not necessarily written to all repositories");
     }
@@ -354,14 +359,20 @@ public void run() throws InterruptedException {
 
             if (failedPermitAcquisitions.isEmpty() == false) {
                 logger.warn("--> failed to acquire all permits: {}", failedPermitAcquisitions);
-                logger.info("--> current cluster state:\n{}", Strings.toString(clusterAdmin().prepareState().get().getState(), true, true));
+                logger.info(
+                    "--> current cluster state:\n{}",
+                    Strings.toString(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(), true, true)
+                );
                 fail("failed to acquire all permits: " + failedPermitAcquisitions);
             }
             logger.info("--> acquired all permits");
 
             if (ThreadPool.terminate(threadPool, 30, TimeUnit.SECONDS) == false) {
                 logger.warn("--> threadpool termination timed out");
-                logger.info("--> current cluster state:\n{}", Strings.toString(clusterAdmin().prepareState().get().getState(), true, true));
+                logger.info(
+                    "--> current cluster state:\n{}",
+                    Strings.toString(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(), true, true)
+                );
             }
         }
 
@@ -381,7 +392,7 @@ private void acquirePermitsAtEnd(
                         logger.warn("--> failed to acquire permit [{}]", label);
                         logger.info(
                             "--> current cluster state:\n{}",
-                            Strings.toString(clusterAdmin().prepareState().get().getState(), true, true)
+                            Strings.toString(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(), true, true)
                         );
                         HotThreads.logLocalHotThreads(
                             logger,
@@ -1604,7 +1615,7 @@ Releasable tryAcquirePartialSnapshottingPermit() {
     // Prepares a health request with twice the default (30s) timeout that waits for all cluster tasks to finish as well as all cluster
     // nodes before returning
     private static ClusterHealthRequestBuilder prepareClusterHealthRequest(String... targetIndexNames) {
-        return clusterAdmin().prepareHealth(targetIndexNames)
+        return clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, targetIndexNames)
             .setTimeout(TimeValue.timeValueSeconds(60))
             .setWaitForNodes(Integer.toString(internalCluster().getNodeNames().length))
             .setWaitForEvents(Priority.LANGUID);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SystemIndicesSnapshotIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SystemIndicesSnapshotIT.java
index 706ceaad7905..32f76bdcc61e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SystemIndicesSnapshotIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SystemIndicesSnapshotIT.java
@@ -704,7 +704,11 @@ public void testPartialSnapshotsOfSystemIndexRemovesFeatureState() throws Except
 
         // Stop a random data node so we lose a shard from the partial index
         internalCluster().stopRandomDataNode();
-        assertBusy(() -> assertEquals(ClusterHealthStatus.RED, clusterAdmin().prepareHealth().get().getStatus()), 30, TimeUnit.SECONDS);
+        assertBusy(
+            () -> assertEquals(ClusterHealthStatus.RED, clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getStatus()),
+            30,
+            TimeUnit.SECONDS
+        );
 
         // Get ready to block
         blockMasterFromFinalizingSnapshotOnIndexFile(REPO_NAME);
diff --git a/server/src/main/java/org/elasticsearch/ElasticsearchException.java b/server/src/main/java/org/elasticsearch/ElasticsearchException.java
index d7db8f4ec09d..c7f3e25b6a96 100644
--- a/server/src/main/java/org/elasticsearch/ElasticsearchException.java
+++ b/server/src/main/java/org/elasticsearch/ElasticsearchException.java
@@ -1646,12 +1646,7 @@ private enum ElasticsearchExceptionHandle {
             UNKNOWN_VERSION_ADDED
         ),
         // 127 used to be org.elasticsearch.search.SearchContextException
-        SEARCH_SOURCE_BUILDER_EXCEPTION(
-            org.elasticsearch.search.builder.SearchSourceBuilderException.class,
-            org.elasticsearch.search.builder.SearchSourceBuilderException::new,
-            128,
-            UNKNOWN_VERSION_ADDED
-        ),
+        // 128 used to be org.elasticsearch.search.builder.SearchSourceBuilderException
         // 129 was EngineClosedException
         NO_SHARD_AVAILABLE_ACTION_EXCEPTION(
             org.elasticsearch.action.NoShardAvailableActionException.class,
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
index 6640b8b5eac8..1699efb02dd1 100644
--- a/server/src/main/java/org/elasticsearch/TransportVersions.java
+++ b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -206,6 +206,9 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_ADD_INDEX_MODE_CONCRETE_INDICES = def(8_736_00_0);
     public static final TransportVersion UNASSIGNED_PRIMARY_COUNT_ON_CLUSTER_HEALTH = def(8_737_00_0);
     public static final TransportVersion ESQL_AGGREGATE_EXEC_TRACKS_INTERMEDIATE_ATTRS = def(8_738_00_0);
+    public static final TransportVersion CCS_TELEMETRY_STATS = def(8_739_00_0);
+    public static final TransportVersion GLOBAL_RETENTION_TELEMETRY = def(8_740_00_0);
+    public static final TransportVersion ROUTING_TABLE_VERSION_REMOVED = def(8_741_00_0);
 
     /*
      * STOP! READ THIS FIRST! No, really,
@@ -264,6 +267,8 @@ static TransportVersion def(int id) {
      * Reference to the earliest compatible transport version to this version of the codebase.
      * This should be the transport version used by the highest minor version of the previous major.
      */
+    @UpdateForV9
+    // This needs to be bumped to the 8.last
     public static final TransportVersion MINIMUM_COMPATIBLE = V_7_17_0;
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
index 54b6b1ef9c8c..1f3ab7388927 100644
--- a/server/src/main/java/org/elasticsearch/Version.java
+++ b/server/src/main/java/org/elasticsearch/Version.java
@@ -13,8 +13,8 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.Assertions;
-import org.elasticsearch.core.RestApiVersion;
 import org.elasticsearch.core.SuppressForbidden;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -124,6 +124,7 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_7_17_22 = new Version(7_17_22_99);
     public static final Version V_7_17_23 = new Version(7_17_23_99);
     public static final Version V_7_17_24 = new Version(7_17_24_99);
+    public static final Version V_7_17_25 = new Version(7_17_25_99);
 
     public static final Version V_8_0_0 = new Version(8_00_00_99);
     public static final Version V_8_0_1 = new Version(8_00_01_99);
@@ -184,7 +185,8 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_8_15_1 = new Version(8_15_01_99);
     public static final Version V_8_15_2 = new Version(8_15_02_99);
     public static final Version V_8_16_0 = new Version(8_16_00_99);
-    public static final Version CURRENT = V_8_16_0;
+    public static final Version V_9_0_0 = new Version(9_00_00_99);
+    public static final Version CURRENT = V_9_0_0;
 
     private static final NavigableMap<Integer, Version> VERSION_IDS;
     private static final Map<String, Version> VERSION_STRINGS;
@@ -220,14 +222,7 @@ public class Version implements VersionId<Version>, ToXContentFragment {
                 }
             }
         }
-        assert RestApiVersion.current().major == CURRENT.major && RestApiVersion.previous().major == CURRENT.major - 1
-            : "RestApiVersion must be upgraded "
-                + "to reflect major from Version.CURRENT ["
-                + CURRENT.major
-                + "]"
-                + " but is still set to ["
-                + RestApiVersion.current().major
-                + "]";
+        assertRestApiVersion();
         builder.put(V_EMPTY_ID, V_EMPTY);
         builderByString.put(V_EMPTY.toString(), V_EMPTY);
 
@@ -235,6 +230,19 @@ public class Version implements VersionId<Version>, ToXContentFragment {
         VERSION_STRINGS = Map.copyOf(builderByString);
     }
 
+    @UpdateForV9
+    // Re-enable this assertion once the rest api version is bumped
+    private static void assertRestApiVersion() {
+        // assert RestApiVersion.current().major == CURRENT.major && RestApiVersion.previous().major == CURRENT.major - 1
+        // : "RestApiVersion must be upgraded "
+        // + "to reflect major from Version.CURRENT ["
+        // + CURRENT.major
+        // + "]"
+        // + " but is still set to ["
+        // + RestApiVersion.current().major
+        // + "]";
+    }
+
     public static Version readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());
     }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
index 82e4e4123e4f..139ef58e4292 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
@@ -40,24 +40,28 @@ public class AddVotingConfigExclusionsRequest extends MasterNodeRequest<AddVotin
      * Construct a request to add voting config exclusions for master-eligible nodes matching the given node names, and wait for a
      * default 30 seconds for these exclusions to take effect, removing the nodes from the voting configuration.
      *
+     * @param masterNodeTimeout Specifies how long to wait when the master has not been discovered yet, or is disconnected, or is busy
+     *                          processing other tasks.
      * @param nodeNames Names of the nodes to add - see {@link AddVotingConfigExclusionsRequest#resolveVotingConfigExclusions(ClusterState)}
      */
-    public AddVotingConfigExclusionsRequest(String... nodeNames) {
-        this(Strings.EMPTY_ARRAY, nodeNames, TimeValue.timeValueSeconds(30));
+    public AddVotingConfigExclusionsRequest(TimeValue masterNodeTimeout, String... nodeNames) {
+        this(masterNodeTimeout, Strings.EMPTY_ARRAY, nodeNames, TimeValue.timeValueSeconds(30));
     }
 
     /**
      * Construct a request to add voting config exclusions for master-eligible nodes matching the given descriptions, and wait for these
      * nodes to be removed from the voting configuration.
      *
-     * @param nodeIds   Ids of the nodes whose exclusions to add - see
-     *                  {@link AddVotingConfigExclusionsRequest#resolveVotingConfigExclusions(ClusterState)}.
-     * @param nodeNames Names of the nodes whose exclusions to add - see
-     *                  {@link AddVotingConfigExclusionsRequest#resolveVotingConfigExclusions(ClusterState)}.
-     * @param timeout   How long to wait for the added exclusions to take effect and be removed from the voting configuration.
+     * @param masterNodeTimeout Specifies how long to wait when the master has not been discovered yet, or is disconnected, or is busy
+     *                          processing other tasks.
+     * @param nodeIds           Ids of the nodes whose exclusions to add - see
+     *                          {@link AddVotingConfigExclusionsRequest#resolveVotingConfigExclusions(ClusterState)}.
+     * @param nodeNames         Names of the nodes whose exclusions to add - see
+     *                          {@link AddVotingConfigExclusionsRequest#resolveVotingConfigExclusions(ClusterState)}.
+     * @param timeout           How long to wait for the added exclusions to take effect and be removed from the voting configuration.
      */
-    public AddVotingConfigExclusionsRequest(String[] nodeIds, String[] nodeNames, TimeValue timeout) {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    public AddVotingConfigExclusionsRequest(TimeValue masterNodeTimeout, String[] nodeIds, String[] nodeNames, TimeValue timeout) {
+        super(masterNodeTimeout);
         if (timeout.compareTo(TimeValue.ZERO) < 0) {
             throw new IllegalArgumentException("timeout [" + timeout + "] must be non-negative");
         }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java
index 2ddd27261db0..f63c383d67ca 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java
@@ -26,8 +26,8 @@ public class ClearVotingConfigExclusionsRequest extends MasterNodeRequest<ClearV
     /**
      * Construct a request to remove all the voting config exclusions from the cluster state.
      */
-    public ClearVotingConfigExclusionsRequest() {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    public ClearVotingConfigExclusionsRequest(TimeValue masterNodeTimeout) {
+        super(masterNodeTimeout);
     }
 
     public ClearVotingConfigExclusionsRequest(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/GetDesiredNodesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/GetDesiredNodesAction.java
index 7fbd17274728..4af2c64c67ee 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/GetDesiredNodesAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/GetDesiredNodesAction.java
@@ -15,6 +15,7 @@
 import org.elasticsearch.cluster.metadata.DesiredNodes;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -33,8 +34,8 @@ public class GetDesiredNodesAction extends ActionType<GetDesiredNodesAction.Resp
     }
 
     public static class Request extends MasterNodeReadRequest<Request> {
-        public Request() {
-            super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+        public Request(TimeValue masterNodeTimeout) {
+            super(masterNodeTimeout);
         }
 
         public Request(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java
index 11bdd41f458d..f71def58820a 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java
@@ -9,7 +9,6 @@
 package org.elasticsearch.action.admin.cluster.desirednodes;
 
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.support.ActionFilters;
@@ -27,6 +26,7 @@
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.tasks.Task;
@@ -102,17 +102,12 @@ public ClusterState afterBatchExecution(ClusterState clusterState, boolean clust
     }
 
     public static class Request extends AcknowledgedRequest<Request> {
-        public Request() {
-            super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, DEFAULT_ACK_TIMEOUT);
+        public Request(TimeValue masterNodeTimeout, TimeValue ackTimeout) {
+            super(masterNodeTimeout, ackTimeout);
         }
 
         public Request(StreamInput in) throws IOException {
             super(in);
         }
-
-        @Override
-        public ActionRequestValidationException validate() {
-            return null;
-        }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java
index 3d8cdb4b405f..550db4892a67 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequest.java
@@ -16,6 +16,7 @@
 import org.elasticsearch.cluster.metadata.DesiredNode;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.xcontent.ConstructingObjectParser;
 import org.elasticsearch.xcontent.ParseField;
@@ -47,8 +48,15 @@ public class UpdateDesiredNodesRequest extends AcknowledgedRequest<UpdateDesired
         PARSER.declareObjectArray(ConstructingObjectParser.constructorArg(), (p, c) -> DesiredNode.fromXContent(p), NODES_FIELD);
     }
 
-    public UpdateDesiredNodesRequest(String historyID, long version, List<DesiredNode> nodes, boolean dryRun) {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, DEFAULT_ACK_TIMEOUT);
+    public UpdateDesiredNodesRequest(
+        TimeValue masterNodeTimeout,
+        TimeValue ackTimeout,
+        String historyID,
+        long version,
+        List<DesiredNode> nodes,
+        boolean dryRun
+    ) {
+        super(masterNodeTimeout, ackTimeout);
         assert historyID != null;
         assert nodes != null;
         this.historyID = historyID;
@@ -80,10 +88,16 @@ public void writeTo(StreamOutput out) throws IOException {
         }
     }
 
-    public static UpdateDesiredNodesRequest fromXContent(String historyID, long version, boolean dryRun, XContentParser parser)
-        throws IOException {
+    public static UpdateDesiredNodesRequest fromXContent(
+        TimeValue masterNodeTimeout,
+        TimeValue ackTimeout,
+        String historyID,
+        long version,
+        boolean dryRun,
+        XContentParser parser
+    ) throws IOException {
         List<DesiredNode> nodes = PARSER.parse(parser, null);
-        return new UpdateDesiredNodesRequest(historyID, version, nodes, dryRun);
+        return new UpdateDesiredNodesRequest(masterNodeTimeout, ackTimeout, historyID, version, nodes, dryRun);
     }
 
     public String getHistoryID() {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
index 2b60e2d4a5ff..2344c8f99ced 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
@@ -37,12 +37,12 @@ public class ClusterHealthRequest extends MasterNodeReadRequest<ClusterHealthReq
     private String waitForNodes = "";
     private Priority waitForEvents = null;
 
-    public ClusterHealthRequest() {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    public ClusterHealthRequest(TimeValue masterNodeTimeout) {
+        super(masterNodeTimeout);
     }
 
-    public ClusterHealthRequest(String... indices) {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    public ClusterHealthRequest(TimeValue masterNodeTimeout, String... indices) {
+        super(masterNodeTimeout);
         this.indices = indices;
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java
index ac70049162e5..2b94b3f674a2 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java
@@ -21,8 +21,8 @@ public class ClusterHealthRequestBuilder extends MasterNodeReadOperationRequestB
     ClusterHealthResponse,
     ClusterHealthRequestBuilder> {
 
-    public ClusterHealthRequestBuilder(ElasticsearchClient client) {
-        super(client, TransportClusterHealthAction.TYPE, new ClusterHealthRequest());
+    public ClusterHealthRequestBuilder(ElasticsearchClient client, TimeValue masterNodeTimeout) {
+        super(client, TransportClusterHealthAction.TYPE, new ClusterHealthRequest(masterNodeTimeout));
     }
 
     public ClusterHealthRequestBuilder setIndices(String... indices) {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/GetFeatureUpgradeStatusRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/GetFeatureUpgradeStatusRequest.java
index ba2ad88917a9..dfb229c4d533 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/GetFeatureUpgradeStatusRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/GetFeatureUpgradeStatusRequest.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.core.TimeValue;
 
 import java.io.IOException;
 
@@ -19,8 +20,8 @@
  */
 public class GetFeatureUpgradeStatusRequest extends MasterNodeRequest<GetFeatureUpgradeStatusRequest> {
 
-    public GetFeatureUpgradeStatusRequest() {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    public GetFeatureUpgradeStatusRequest(TimeValue masterNodeTimeout) {
+        super(masterNodeTimeout);
     }
 
     public GetFeatureUpgradeStatusRequest(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/PostFeatureUpgradeRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/PostFeatureUpgradeRequest.java
index 36a90ae9afe3..84321de66a33 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/PostFeatureUpgradeRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/migration/PostFeatureUpgradeRequest.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.core.TimeValue;
 
 import java.io.IOException;
 
@@ -19,8 +20,8 @@
  */
 public class PostFeatureUpgradeRequest extends MasterNodeRequest<PostFeatureUpgradeRequest> {
 
-    public PostFeatureUpgradeRequest() {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    public PostFeatureUpgradeRequest(TimeValue masterNodeTimeout) {
+        super(masterNodeTimeout);
     }
 
     public PostFeatureUpgradeRequest(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java
index 5bde01195e35..1d70d25478b1 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequest.java
@@ -33,8 +33,8 @@ public class PrevalidateNodeRemovalRequest extends MasterNodeReadRequest<Prevali
     private final String[] externalIds;
     private TimeValue timeout = TimeValue.timeValueSeconds(30);
 
-    private PrevalidateNodeRemovalRequest(Builder builder) {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    private PrevalidateNodeRemovalRequest(TimeValue masterNodeTimeout, Builder builder) {
+        super(masterNodeTimeout);
         this.names = builder.names;
         this.ids = builder.ids;
         this.externalIds = builder.externalIds;
@@ -139,8 +139,8 @@ public Builder setExternalIds(String... externalIds) {
             return this;
         }
 
-        public PrevalidateNodeRemovalRequest build() {
-            return new PrevalidateNodeRemovalRequest(this);
+        public PrevalidateNodeRemovalRequest build(TimeValue masterNodeTimeout) {
+            return new PrevalidateNodeRemovalRequest(masterNodeTimeout, this);
         }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java
index 9527f8036a0d..40511641baea 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterGetSettingsAction.java
@@ -16,6 +16,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.TimeValue;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -33,8 +34,8 @@ public ClusterGetSettingsAction() {
      * Request to retrieve the cluster settings
      */
     public static class Request extends MasterNodeReadRequest<Request> {
-        public Request() {
-            super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+        public Request(TimeValue masterNodeTimeout) {
+            super(masterNodeTimeout);
         }
 
         public Request(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java
index c4e40f1b208b..bf874c3c3887 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java
@@ -14,6 +14,7 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.xcontent.ObjectParser;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.ToXContentObject;
@@ -35,10 +36,13 @@ public class ClusterUpdateSettingsRequest extends AcknowledgedRequest<ClusterUpd
     private static final ParseField PERSISTENT = new ParseField("persistent");
     private static final ParseField TRANSIENT = new ParseField("transient");
 
-    private static final ObjectParser<ClusterUpdateSettingsRequest, Void> PARSER = new ObjectParser<>(
+    public interface Factory {
+        ClusterUpdateSettingsRequest create();
+    }
+
+    private static final ObjectParser<ClusterUpdateSettingsRequest, Factory> PARSER = ObjectParser.fromBuilder(
         "cluster_update_settings_request",
-        false,
-        ClusterUpdateSettingsRequest::new
+        Factory::create
     );
 
     static {
@@ -55,8 +59,8 @@ public ClusterUpdateSettingsRequest(StreamInput in) throws IOException {
         persistentSettings = readSettingsFromStream(in);
     }
 
-    public ClusterUpdateSettingsRequest() {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, DEFAULT_ACK_TIMEOUT);
+    public ClusterUpdateSettingsRequest(TimeValue masterNodeTimeout, TimeValue ackTimeout) {
+        super(masterNodeTimeout, ackTimeout);
     }
 
     @Override
@@ -188,7 +192,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         return builder;
     }
 
-    public static ClusterUpdateSettingsRequest fromXContent(XContentParser parser) {
-        return PARSER.apply(parser, null);
+    public static ClusterUpdateSettingsRequest fromXContent(Factory factory, XContentParser parser) {
+        return PARSER.apply(parser, factory);
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java
index 31ab3223bbb4..a7682add8b09 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestBuilder.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder;
 import org.elasticsearch.client.internal.ElasticsearchClient;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.util.Map;
@@ -23,8 +24,8 @@ public class ClusterUpdateSettingsRequestBuilder extends AcknowledgedRequestBuil
     ClusterUpdateSettingsResponse,
     ClusterUpdateSettingsRequestBuilder> {
 
-    public ClusterUpdateSettingsRequestBuilder(ElasticsearchClient client) {
-        super(client, ClusterUpdateSettingsAction.INSTANCE, new ClusterUpdateSettingsRequest());
+    public ClusterUpdateSettingsRequestBuilder(ElasticsearchClient client, TimeValue masterNodeTimeout, TimeValue ackTimeout) {
+        super(client, ClusterUpdateSettingsAction.INSTANCE, new ClusterUpdateSettingsRequest(masterNodeTimeout, ackTimeout));
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
index 8990112a3057..d64de6e452e7 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequest.java
@@ -38,8 +38,8 @@ public class ClusterStateRequest extends MasterNodeReadRequest<ClusterStateReque
     private String[] indices = Strings.EMPTY_ARRAY;
     private IndicesOptions indicesOptions = IndicesOptions.lenientExpandOpen();
 
-    public ClusterStateRequest() {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    public ClusterStateRequest(TimeValue masterNodeTimeout) {
+        super(masterNodeTimeout);
     }
 
     public ClusterStateRequest(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java
index f8e49fbd4afc..d93c1a172171 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestBuilder.java
@@ -19,8 +19,8 @@ public class ClusterStateRequestBuilder extends MasterNodeReadOperationRequestBu
     ClusterStateResponse,
     ClusterStateRequestBuilder> {
 
-    public ClusterStateRequestBuilder(ElasticsearchClient client) {
-        super(client, ClusterStateAction.INSTANCE, new ClusterStateRequest());
+    public ClusterStateRequestBuilder(ElasticsearchClient client, TimeValue masterNodeTimeout) {
+        super(client, ClusterStateAction.INSTANCE, new ClusterStateRequest(masterNodeTimeout));
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSTelemetrySnapshot.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSTelemetrySnapshot.java
index fe1da86dd54c..68fd4c2a1529 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSTelemetrySnapshot.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSTelemetrySnapshot.java
@@ -277,7 +277,7 @@ public int hashCode() {
      */
     public void add(CCSTelemetrySnapshot stats) {
         // This should be called in ClusterStatsResponse ctor only, so we don't need to worry about concurrency
-        if (stats.totalCount == 0) {
+        if (stats == null || stats.totalCount == 0) {
             // Just ignore the empty stats.
             // This could happen if the node is brand new or if the stats are not available, e.g. because it runs an old version.
             return;
@@ -315,7 +315,7 @@ public void add(CCSTelemetrySnapshot stats) {
      *      "p90": 2570
      * }
      */
-    public static void publishLatency(XContentBuilder builder, String name, LongMetricValue took) throws IOException {
+    private static void publishLatency(XContentBuilder builder, String name, LongMetricValue took) throws IOException {
         builder.startObject(name);
         {
             builder.field("max", took.max());
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSUsageTelemetry.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSUsageTelemetry.java
index 60766bd4068e..6016378aa886 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSUsageTelemetry.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/CCSUsageTelemetry.java
@@ -175,7 +175,7 @@ public static class PerClusterCCSTelemetry {
         // The number of successful (not skipped) requests to this cluster.
         private final LongAdder count;
         private final LongAdder skippedCount;
-        // This is only over the successful requetss, skipped ones do not count here.
+        // This is only over the successful requests, skipped ones do not count here.
         private final LongMetric took;
 
         PerClusterCCSTelemetry(String clusterAlias) {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
index b48295dc8b3e..732eb2ec2dcc 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodeResponse.java
@@ -30,6 +30,7 @@ public class ClusterStatsNodeResponse extends BaseNodeResponse {
     private final ClusterHealthStatus clusterStatus;
     private final SearchUsageStats searchUsageStats;
     private final RepositoryUsageStats repositoryUsageStats;
+    private final CCSTelemetrySnapshot ccsMetrics;
 
     public ClusterStatsNodeResponse(StreamInput in) throws IOException {
         super(in);
@@ -47,6 +48,11 @@ public ClusterStatsNodeResponse(StreamInput in) throws IOException {
         } else {
             repositoryUsageStats = RepositoryUsageStats.EMPTY;
         }
+        if (in.getTransportVersion().onOrAfter(TransportVersions.CCS_TELEMETRY_STATS)) {
+            ccsMetrics = new CCSTelemetrySnapshot(in);
+        } else {
+            ccsMetrics = new CCSTelemetrySnapshot();
+        }
     }
 
     public ClusterStatsNodeResponse(
@@ -56,7 +62,8 @@ public ClusterStatsNodeResponse(
         NodeStats nodeStats,
         ShardStats[] shardsStats,
         SearchUsageStats searchUsageStats,
-        RepositoryUsageStats repositoryUsageStats
+        RepositoryUsageStats repositoryUsageStats,
+        CCSTelemetrySnapshot ccsTelemetrySnapshot
     ) {
         super(node);
         this.nodeInfo = nodeInfo;
@@ -65,6 +72,7 @@ public ClusterStatsNodeResponse(
         this.clusterStatus = clusterStatus;
         this.searchUsageStats = Objects.requireNonNull(searchUsageStats);
         this.repositoryUsageStats = Objects.requireNonNull(repositoryUsageStats);
+        this.ccsMetrics = ccsTelemetrySnapshot;
     }
 
     public NodeInfo nodeInfo() {
@@ -95,6 +103,10 @@ public RepositoryUsageStats repositoryUsageStats() {
         return repositoryUsageStats;
     }
 
+    public CCSTelemetrySnapshot getCcsMetrics() {
+        return ccsMetrics;
+    }
+
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
@@ -108,5 +120,9 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.REPOSITORIES_TELEMETRY)) {
             repositoryUsageStats.writeTo(out);
         } // else just drop these stats, ok for bwc
+        if (out.getTransportVersion().onOrAfter(TransportVersions.CCS_TELEMETRY_STATS)) {
+            ccsMetrics.writeTo(out);
+        }
     }
+
 }
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
index b6dd40e8c8b7..267db92496f7 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java
@@ -24,6 +24,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import static org.elasticsearch.action.search.TransportSearchAction.CCS_TELEMETRY_FEATURE_FLAG;
+
 public class ClusterStatsResponse extends BaseNodesResponse<ClusterStatsNodeResponse> implements ToXContentFragment {
 
     final ClusterStatsNodes nodesStats;
@@ -31,6 +33,8 @@ public class ClusterStatsResponse extends BaseNodesResponse<ClusterStatsNodeResp
     final ClusterHealthStatus status;
     final ClusterSnapshotStats clusterSnapshotStats;
     final RepositoryUsageStats repositoryUsageStats;
+
+    final CCSTelemetrySnapshot ccsMetrics;
     final long timestamp;
     final String clusterUUID;
 
@@ -50,6 +54,7 @@ public ClusterStatsResponse(
         this.timestamp = timestamp;
         nodesStats = new ClusterStatsNodes(nodes);
         indicesStats = new ClusterStatsIndices(nodes, mappingStats, analysisStats, versionStats);
+        ccsMetrics = new CCSTelemetrySnapshot();
         ClusterHealthStatus status = null;
         for (ClusterStatsNodeResponse response : nodes) {
             // only the master node populates the status
@@ -58,6 +63,7 @@ public ClusterStatsResponse(
                 break;
             }
         }
+        nodes.forEach(node -> ccsMetrics.add(node.getCcsMetrics()));
         this.status = status;
         this.clusterSnapshotStats = clusterSnapshotStats;
 
@@ -90,6 +96,10 @@ public ClusterStatsIndices getIndicesStats() {
         return indicesStats;
     }
 
+    public CCSTelemetrySnapshot getCcsMetrics() {
+        return ccsMetrics;
+    }
+
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         TransportAction.localOnly();
@@ -125,6 +135,12 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.field("repositories");
         repositoryUsageStats.toXContent(builder, params);
 
+        if (CCS_TELEMETRY_FEATURE_FLAG.isEnabled()) {
+            builder.startObject("ccs");
+            ccsMetrics.toXContent(builder, params);
+            builder.endObject();
+        }
+
         return builder;
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
index 1912de3cfa4d..66cf627ce066 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/TransportClusterStatsAction.java
@@ -81,6 +81,7 @@ public class TransportClusterStatsAction extends TransportNodesAction<
     private final IndicesService indicesService;
     private final RepositoriesService repositoriesService;
     private final SearchUsageHolder searchUsageHolder;
+    private final CCSUsageTelemetry ccsUsageHolder;
 
     private final MetadataStatsCache<MappingStats> mappingStatsCache;
     private final MetadataStatsCache<AnalysisStats> analysisStatsCache;
@@ -108,6 +109,7 @@ public TransportClusterStatsAction(
         this.indicesService = indicesService;
         this.repositoriesService = repositoriesService;
         this.searchUsageHolder = usageService.getSearchUsageHolder();
+        this.ccsUsageHolder = usageService.getCcsUsageHolder();
         this.mappingStatsCache = new MetadataStatsCache<>(threadPool.getThreadContext(), MappingStats::of);
         this.analysisStatsCache = new MetadataStatsCache<>(threadPool.getThreadContext(), AnalysisStats::of);
     }
@@ -249,6 +251,7 @@ protected ClusterStatsNodeResponse nodeOperation(ClusterStatsNodeRequest nodeReq
         final SearchUsageStats searchUsageStats = searchUsageHolder.getSearchUsageStats();
 
         final RepositoryUsageStats repositoryUsageStats = repositoriesService.getUsageStats();
+        final CCSTelemetrySnapshot ccsTelemetry = ccsUsageHolder.getCCSTelemetrySnapshot();
 
         return new ClusterStatsNodeResponse(
             nodeInfo.getNode(),
@@ -257,7 +260,8 @@ protected ClusterStatsNodeResponse nodeOperation(ClusterStatsNodeRequest nodeReq
             nodeStats,
             shardsStats.toArray(new ShardStats[shardsStats.size()]),
             searchUsageStats,
-            repositoryUsageStats
+            repositoryUsageStats,
+            ccsTelemetry
         );
     }
 
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
index b27a8d0aacb7..976948dc722f 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksRequest.java
@@ -11,13 +11,14 @@
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.MasterNodeReadRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.core.TimeValue;
 
 import java.io.IOException;
 
 public class PendingClusterTasksRequest extends MasterNodeReadRequest<PendingClusterTasksRequest> {
 
-    public PendingClusterTasksRequest() {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+    public PendingClusterTasksRequest(TimeValue masterNodeTimeout) {
+        super(masterNodeTimeout);
     }
 
     public PendingClusterTasksRequest(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
index 5d1b7264ebf8..152cd6a34196 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
@@ -67,8 +67,9 @@ public class CreateIndexRequest extends AcknowledgedRequest<CreateIndexRequest>
     private boolean initializeFailureStore;
 
     private Settings settings = Settings.EMPTY;
+    public static final String EMPTY_MAPPINGS = "{}";
 
-    private String mappings = "{}";
+    private String mappings = EMPTY_MAPPINGS;
 
     private final Set<Alias> aliases = new HashSet<>();
 
@@ -284,8 +285,11 @@ private CreateIndexRequest mapping(BytesReference source, XContentType xContentT
     }
 
     private CreateIndexRequest mapping(String type, Map<String, ?> source) {
-        // wrap it in a type map if its not
-        if (source.size() != 1 || source.containsKey(type) == false) {
+        if (source.isEmpty()) {
+            // If no source is provided we return empty mappings
+            return mapping(EMPTY_MAPPINGS);
+        } else if (source.size() != 1 || source.containsKey(type) == false) {
+            // wrap it in a type map if its not
             source = Map.of(MapperService.SINGLE_MAPPING_NAME, source);
         } else if (MapperService.SINGLE_MAPPING_NAME.equals(type) == false) {
             // if it has a different type name, then unwrap and rewrap with _doc
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java
index b8d975f82980..928948059df9 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java
@@ -660,7 +660,7 @@ static void validate(
             }
             if ((request.settings().equals(Settings.EMPTY) == false)
                 || (request.aliases().size() > 0)
-                || (request.mappings().equals("{}") == false)) {
+                || (request.mappings().equals(CreateIndexRequest.EMPTY_MAPPINGS) == false)) {
                 throw new IllegalArgumentException(
                     "aliases, mappings, and index settings may not be specified when rolling over a data stream"
                 );
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkOperation.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkOperation.java
index 813203afe42c..64e0b80aca74 100644
--- a/server/src/main/java/org/elasticsearch/action/bulk/BulkOperation.java
+++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkOperation.java
@@ -44,6 +44,7 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexNotFoundException;
+import org.elasticsearch.index.engine.VersionConflictEngineException;
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.indices.IndexClosedException;
 import org.elasticsearch.node.NodeClosedException;
@@ -478,7 +479,8 @@ private void completeShardOperation() {
             }
 
             private void processFailure(BulkItemRequest bulkItemRequest, Exception cause) {
-                var errorType = ElasticsearchException.getExceptionName(ExceptionsHelper.unwrapCause(cause));
+                var error = ExceptionsHelper.unwrapCause(cause);
+                var errorType = ElasticsearchException.getExceptionName(error);
                 DocWriteRequest<?> docWriteRequest = bulkItemRequest.request();
                 DataStream failureStoreCandidate = getRedirectTargetCandidate(docWriteRequest, getClusterState().metadata());
                 // If the candidate is not null, the BulkItemRequest targets a data stream, but we'll still have to check if
@@ -486,7 +488,9 @@ private void processFailure(BulkItemRequest bulkItemRequest, Exception cause) {
                 if (failureStoreCandidate != null) {
                     // Do not redirect documents to a failure store that were already headed to one.
                     var isFailureStoreDoc = docWriteRequest instanceof IndexRequest indexRequest && indexRequest.isWriteToFailureStore();
-                    if (isFailureStoreDoc == false && failureStoreCandidate.isFailureStoreEnabled()) {
+                    if (isFailureStoreDoc == false
+                        && failureStoreCandidate.isFailureStoreEnabled()
+                        && error instanceof VersionConflictEngineException == false) {
                         // Redirect to failure store.
                         maybeMarkFailureStoreForRollover(failureStoreCandidate);
                         addDocumentToRedirectRequests(bulkItemRequest, cause, failureStoreCandidate.getName());
diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java
index 7c788b10405f..30c6699ac902 100644
--- a/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java
+++ b/server/src/main/java/org/elasticsearch/action/datastreams/CreateDataStreamAction.java
@@ -14,7 +14,6 @@
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -49,11 +48,6 @@ public Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, String name, l
             this.startTime = startTime;
         }
 
-        @Deprecated(forRemoval = true) // temporary compatibility shim
-        public Request(String name) {
-            this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, name);
-        }
-
         public String getName() {
             return name;
         }
diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/DeleteDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/DeleteDataStreamAction.java
index 1a62e347012f..d95a8bbc4b46 100644
--- a/server/src/main/java/org/elasticsearch/action/datastreams/DeleteDataStreamAction.java
+++ b/server/src/main/java/org/elasticsearch/action/datastreams/DeleteDataStreamAction.java
@@ -53,11 +53,6 @@ public Request(TimeValue masterNodeTimeout, String... names) {
             this.wildcardExpressionsOriginallySpecified = Arrays.stream(names).anyMatch(Regex::isSimpleMatchPattern);
         }
 
-        @Deprecated(forRemoval = true) // temporary compatibility shim
-        public Request(String... names) {
-            this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, names);
-        }
-
         public String[] getNames() {
             return names;
         }
diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java
index 2bcd824dfea3..2f9ba9220fbc 100644
--- a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java
+++ b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java
@@ -15,7 +15,6 @@
 import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.MasterNodeReadRequest;
-import org.elasticsearch.action.support.master.MasterNodeRequest;
 import org.elasticsearch.cluster.SimpleDiffable;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.cluster.metadata.DataStream;
@@ -71,11 +70,6 @@ public Request(TimeValue masterNodeTimeout, String[] names, boolean includeDefau
             this.includeDefaults = includeDefaults;
         }
 
-        @Deprecated(forRemoval = true) // temporary compatibility shim
-        public Request(String[] names) {
-            this(MasterNodeRequest.TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT, names);
-        }
-
         public String[] getNames() {
             return names;
         }
diff --git a/server/src/main/java/org/elasticsearch/action/downsample/DownsampleAction.java b/server/src/main/java/org/elasticsearch/action/downsample/DownsampleAction.java
index 7d2b1be79731..8ccc190a0444 100644
--- a/server/src/main/java/org/elasticsearch/action/downsample/DownsampleAction.java
+++ b/server/src/main/java/org/elasticsearch/action/downsample/DownsampleAction.java
@@ -45,20 +45,21 @@ public static class Request extends MasterNodeRequest<Request> implements Indice
         private DownsampleConfig downsampleConfig;
 
         public Request(
+            TimeValue masterNodeTimeout,
             final String sourceIndex,
             final String targetIndex,
             final TimeValue waitTimeout,
             final DownsampleConfig downsampleConfig
         ) {
-            super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+            super(masterNodeTimeout);
             this.sourceIndex = sourceIndex;
             this.targetIndex = targetIndex;
             this.waitTimeout = waitTimeout == null ? DEFAULT_WAIT_TIMEOUT : waitTimeout;
             this.downsampleConfig = downsampleConfig;
         }
 
-        public Request() {
-            super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
+        public Request(TimeValue masterNodeTimeout) {
+            super(masterNodeTimeout);
         }
 
         public Request(StreamInput in) throws IOException {
diff --git a/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java
deleted file mode 100644
index ef08f64765f9..000000000000
--- a/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-package org.elasticsearch.action.ingest;
-
-import org.elasticsearch.action.ActionRequestBuilder;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.client.internal.ElasticsearchClient;
-
-public class DeletePipelineRequestBuilder extends ActionRequestBuilder<DeletePipelineRequest, AcknowledgedResponse> {
-
-    public DeletePipelineRequestBuilder(ElasticsearchClient client, String id) {
-        super(client, DeletePipelineTransportAction.TYPE, new DeletePipelineRequest(id));
-    }
-
-    /**
-     * Sets the id of the pipeline to delete.
-     */
-    public DeletePipelineRequestBuilder setId(String id) {
-        request.setId(id);
-        return this;
-    }
-
-}
diff --git a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java
deleted file mode 100644
index ca873c5aa384..000000000000
--- a/server/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-package org.elasticsearch.action.ingest;
-
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
-import org.elasticsearch.client.internal.ElasticsearchClient;
-
-public class GetPipelineRequestBuilder extends MasterNodeReadOperationRequestBuilder<
-    GetPipelineRequest,
-    GetPipelineResponse,
-    GetPipelineRequestBuilder> {
-
-    public GetPipelineRequestBuilder(ElasticsearchClient client, String[] ids) {
-        super(client, GetPipelineAction.INSTANCE, new GetPipelineRequest(ids));
-    }
-
-}
diff --git a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java
deleted file mode 100644
index 2fce285d83f0..000000000000
--- a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-package org.elasticsearch.action.ingest;
-
-import org.elasticsearch.action.ActionRequestBuilder;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.client.internal.ElasticsearchClient;
-import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.xcontent.XContentType;
-
-public class PutPipelineRequestBuilder extends ActionRequestBuilder<PutPipelineRequest, AcknowledgedResponse> {
-
-    public PutPipelineRequestBuilder(ElasticsearchClient client, String id, BytesReference source, XContentType xContentType) {
-        super(client, PutPipelineTransportAction.TYPE, new PutPipelineRequest(id, source, xContentType));
-    }
-}
diff --git a/server/src/main/java/org/elasticsearch/action/ingest/ReservedPipelineAction.java b/server/src/main/java/org/elasticsearch/action/ingest/ReservedPipelineAction.java
index aca9bb81fb53..ba0c06db968e 100644
--- a/server/src/main/java/org/elasticsearch/action/ingest/ReservedPipelineAction.java
+++ b/server/src/main/java/org/elasticsearch/action/ingest/ReservedPipelineAction.java
@@ -100,7 +100,7 @@ public TransformState transform(Object source, TransformState prevState) throws
         toDelete.removeAll(entities);
 
         for (var pipelineToDelete : toDelete) {
-            var task = new IngestService.DeletePipelineClusterStateUpdateTask(pipelineToDelete);
+            var task = new IngestService.DeletePipelineClusterStateUpdateTask(null, new DeletePipelineRequest(pipelineToDelete));
             state = wrapIngestTaskExecute(task, state);
         }
 
diff --git a/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
index 23ff692da488..30faae9c1a5f 100644
--- a/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
+++ b/server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
@@ -127,7 +127,7 @@ public class TransportSearchAction extends HandledTransportAction<SearchRequest,
     public static final String FROZEN_INDICES_DEPRECATION_MESSAGE = "Searching frozen indices [{}] is deprecated."
         + " Consider cold or frozen tiers in place of frozen indices. The frozen feature will be removed in a feature release.";
 
-    private static final FeatureFlag CCS_TELEMETRY_FEATURE_FLAG = new FeatureFlag("ccs_telemetry");
+    public static final FeatureFlag CCS_TELEMETRY_FEATURE_FLAG = new FeatureFlag("ccs_telemetry");
 
     /** The maximum number of shards for a single search request. */
     public static final Setting<Long> SHARD_COUNT_LIMIT_SETTING = Setting.longSetting(
diff --git a/server/src/main/java/org/elasticsearch/client/internal/ClusterAdminClient.java b/server/src/main/java/org/elasticsearch/client/internal/ClusterAdminClient.java
index 4d5a670925b5..95dd1ccdf86d 100644
--- a/server/src/main/java/org/elasticsearch/client/internal/ClusterAdminClient.java
+++ b/server/src/main/java/org/elasticsearch/client/internal/ClusterAdminClient.java
@@ -94,16 +94,6 @@
 import org.elasticsearch.action.admin.cluster.stats.ClusterStatsRequestBuilder;
 import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse;
 import org.elasticsearch.action.admin.cluster.stats.TransportClusterStatsAction;
-import org.elasticsearch.action.ingest.DeletePipelineRequest;
-import org.elasticsearch.action.ingest.DeletePipelineRequestBuilder;
-import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
-import org.elasticsearch.action.ingest.GetPipelineAction;
-import org.elasticsearch.action.ingest.GetPipelineRequest;
-import org.elasticsearch.action.ingest.GetPipelineRequestBuilder;
-import org.elasticsearch.action.ingest.GetPipelineResponse;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequestBuilder;
-import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.action.ingest.SimulatePipelineAction;
 import org.elasticsearch.action.ingest.SimulatePipelineRequest;
 import org.elasticsearch.action.ingest.SimulatePipelineRequestBuilder;
@@ -158,8 +148,8 @@ public void health(final ClusterHealthRequest request, final ActionListener<Clus
         execute(TransportClusterHealthAction.TYPE, request, listener);
     }
 
-    public ClusterHealthRequestBuilder prepareHealth(String... indices) {
-        return new ClusterHealthRequestBuilder(this).setIndices(indices);
+    public ClusterHealthRequestBuilder prepareHealth(TimeValue masterNodeTimeout, String... indices) {
+        return new ClusterHealthRequestBuilder(this, masterNodeTimeout).setIndices(indices);
     }
 
     public ActionFuture<ClusterStateResponse> state(final ClusterStateRequest request) {
@@ -170,8 +160,8 @@ public void state(final ClusterStateRequest request, final ActionListener<Cluste
         execute(ClusterStateAction.INSTANCE, request, listener);
     }
 
-    public ClusterStateRequestBuilder prepareState() {
-        return new ClusterStateRequestBuilder(this);
+    public ClusterStateRequestBuilder prepareState(TimeValue masterNodeTimeout) {
+        return new ClusterStateRequestBuilder(this, masterNodeTimeout);
     }
 
     public ActionFuture<ClusterUpdateSettingsResponse> updateSettings(final ClusterUpdateSettingsRequest request) {
@@ -182,8 +172,8 @@ public void updateSettings(final ClusterUpdateSettingsRequest request, final Act
         execute(ClusterUpdateSettingsAction.INSTANCE, request, listener);
     }
 
-    public ClusterUpdateSettingsRequestBuilder prepareUpdateSettings() {
-        return new ClusterUpdateSettingsRequestBuilder(this);
+    public ClusterUpdateSettingsRequestBuilder prepareUpdateSettings(TimeValue masterNodeTimeout, TimeValue ackTimeout) {
+        return new ClusterUpdateSettingsRequestBuilder(this, masterNodeTimeout, ackTimeout);
     }
 
     public ActionFuture<NodesInfoResponse> nodesInfo(final NodesInfoRequest request) {
@@ -370,38 +360,6 @@ public SnapshotsStatusRequestBuilder prepareSnapshotStatus(TimeValue masterNodeT
         return new SnapshotsStatusRequestBuilder(this, masterNodeTimeout);
     }
 
-    public void putPipeline(PutPipelineRequest request, ActionListener<AcknowledgedResponse> listener) {
-        execute(PutPipelineTransportAction.TYPE, request, listener);
-    }
-
-    public ActionFuture<AcknowledgedResponse> putPipeline(PutPipelineRequest request) {
-        return execute(PutPipelineTransportAction.TYPE, request);
-    }
-
-    public PutPipelineRequestBuilder preparePutPipeline(String id, BytesReference source, XContentType xContentType) {
-        return new PutPipelineRequestBuilder(this, id, source, xContentType);
-    }
-
-    public void deletePipeline(DeletePipelineRequest request, ActionListener<AcknowledgedResponse> listener) {
-        execute(DeletePipelineTransportAction.TYPE, request, listener);
-    }
-
-    public ActionFuture<AcknowledgedResponse> deletePipeline(DeletePipelineRequest request) {
-        return execute(DeletePipelineTransportAction.TYPE, request);
-    }
-
-    public DeletePipelineRequestBuilder prepareDeletePipeline(String id) {
-        return new DeletePipelineRequestBuilder(this, id);
-    }
-
-    public void getPipeline(GetPipelineRequest request, ActionListener<GetPipelineResponse> listener) {
-        execute(GetPipelineAction.INSTANCE, request, listener);
-    }
-
-    public GetPipelineRequestBuilder prepareGetPipeline(String... ids) {
-        return new GetPipelineRequestBuilder(this, ids);
-    }
-
     public void simulatePipeline(SimulatePipelineRequest request, ActionListener<SimulatePipelineResponse> listener) {
         execute(SimulatePipelineAction.INSTANCE, request, listener);
     }
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStore.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStore.java
new file mode 100644
index 000000000000..d647956e752a
--- /dev/null
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStore.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.cluster.metadata;
+
+import org.elasticsearch.cluster.Diff;
+import org.elasticsearch.cluster.SimpleDiffable;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.xcontent.ConstructingObjectParser;
+import org.elasticsearch.xcontent.ParseField;
+import org.elasticsearch.xcontent.ToXContentObject;
+import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentParser;
+
+import java.io.IOException;
+
+/**
+ * Holds the data stream failure store metadata that enable or disable the failure store of a data stream. Currently, it
+ * supports the following configurations:
+ * - enabled
+ */
+public record DataStreamFailureStore(boolean enabled) implements SimpleDiffable<DataStreamFailureStore>, ToXContentObject {
+
+    public static final ParseField ENABLED_FIELD = new ParseField("enabled");
+
+    public static final ConstructingObjectParser<DataStreamFailureStore, Void> PARSER = new ConstructingObjectParser<>(
+        "failure_store",
+        false,
+        (args, unused) -> new DataStreamFailureStore(args[0] == null || (Boolean) args[0])
+    );
+
+    static {
+        PARSER.declareBoolean(ConstructingObjectParser.constructorArg(), ENABLED_FIELD);
+    }
+
+    public DataStreamFailureStore() {
+        this(true);
+    }
+
+    public DataStreamFailureStore(StreamInput in) throws IOException {
+        this(in.readBoolean());
+    }
+
+    public static Diff<DataStreamFailureStore> readDiffFrom(StreamInput in) throws IOException {
+        return SimpleDiffable.readDiffFrom(DataStreamFailureStore::new, in);
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeBoolean(enabled);
+    }
+
+    @Override
+    public String toString() {
+        return Strings.toString(this, true, true);
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject();
+        builder.field(ENABLED_FIELD.getPreferredName(), enabled);
+        builder.endObject();
+        return builder;
+    }
+
+    public static DataStreamFailureStore fromXContent(XContentParser parser) throws IOException {
+        return PARSER.parse(parser, null);
+    }
+}
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamOptions.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamOptions.java
new file mode 100644
index 000000000000..9c7d2a986fa4
--- /dev/null
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamOptions.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.cluster.metadata;
+
+import org.elasticsearch.cluster.Diff;
+import org.elasticsearch.cluster.SimpleDiffable;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.xcontent.ConstructingObjectParser;
+import org.elasticsearch.xcontent.ObjectParser;
+import org.elasticsearch.xcontent.ParseField;
+import org.elasticsearch.xcontent.ToXContentObject;
+import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentParser;
+
+import java.io.IOException;
+
+/**
+ * Holds data stream dedicated configuration options such as failure store, (in the future lifecycle). Currently, it
+ * supports the following configurations:
+ * - failure store
+ */
+public record DataStreamOptions(@Nullable DataStreamFailureStore failureStore)
+    implements
+        SimpleDiffable<DataStreamOptions>,
+        ToXContentObject {
+
+    public static final ParseField FAILURE_STORE_FIELD = new ParseField("failure_store");
+
+    public static final ConstructingObjectParser<DataStreamOptions, Void> PARSER = new ConstructingObjectParser<>(
+        "options",
+        false,
+        (args, unused) -> new DataStreamOptions((DataStreamFailureStore) args[0])
+    );
+
+    static {
+        PARSER.declareField(
+            ConstructingObjectParser.optionalConstructorArg(),
+            (p, c) -> DataStreamFailureStore.fromXContent(p),
+            FAILURE_STORE_FIELD,
+            ObjectParser.ValueType.OBJECT_OR_NULL
+        );
+    }
+
+    public DataStreamOptions() {
+        this(null);
+    }
+
+    public static DataStreamOptions read(StreamInput in) throws IOException {
+        return new DataStreamOptions(in.readOptionalWriteable(DataStreamFailureStore::new));
+    }
+
+    @Nullable
+    public DataStreamFailureStore getFailureStore() {
+        return failureStore;
+    }
+
+    public static Diff<DataStreamOptions> readDiffFrom(StreamInput in) throws IOException {
+        return SimpleDiffable.readDiffFrom(DataStreamOptions::read, in);
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeOptionalWriteable(failureStore);
+    }
+
+    @Override
+    public String toString() {
+        return Strings.toString(this, true, true);
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject();
+        if (failureStore != null) {
+            builder.field(FAILURE_STORE_FIELD.getPreferredName(), failureStore);
+        }
+        builder.endObject();
+        return builder;
+    }
+
+    public static DataStreamOptions fromXContent(XContentParser parser) throws IOException {
+        return PARSER.parse(parser, null);
+    }
+}
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java
index 459c6c6ec733..b945fe7e510f 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java
@@ -567,17 +567,14 @@ private static boolean shouldTrackConcreteIndex(Context context, IndicesOptions
             // Exclude this one as it's a net-new system index, and we explicitly don't want those.
             return false;
         }
-        if (DataStream.isFailureStoreFeatureFlagEnabled()) {
-            IndexAbstraction indexAbstraction = context.getState().metadata().getIndicesLookup().get(index.getName());
-            if (context.options.allowFailureIndices() == false) {
-                DataStream parentDataStream = indexAbstraction.getParentDataStream();
-                if (parentDataStream != null && parentDataStream.isFailureStoreEnabled()) {
-                    if (parentDataStream.isFailureStoreIndex(index.getName())) {
-                        if (options.ignoreUnavailable()) {
-                            return false;
-                        } else {
-                            throw new FailureIndexNotSupportedException(index);
-                        }
+        if (DataStream.isFailureStoreFeatureFlagEnabled() && context.options.allowFailureIndices() == false) {
+            DataStream parentDataStream = context.getState().metadata().getIndicesLookup().get(index.getName()).getParentDataStream();
+            if (parentDataStream != null && parentDataStream.isFailureStoreEnabled()) {
+                if (parentDataStream.isFailureStoreIndex(index.getName())) {
+                    if (options.ignoreUnavailable()) {
+                        return false;
+                    } else {
+                        throw new FailureIndexNotSupportedException(index);
                     }
                 }
             }
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java
index 13c2fabd6b3d..7f0840ca8bb2 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetadataMigrateToDataStreamService.java
@@ -224,7 +224,7 @@ static void prepareBackingIndex(
         Settings nodeSettings
     ) throws IOException {
         MappingMetadata mm = im.mapping();
-        if (mm == null) {
+        if (mm == null || mm.equals(MappingMetadata.EMPTY_MAPPINGS)) {
             throw new IllegalArgumentException("backing index [" + im.getIndex().getName() + "] must have mappings for a timestamp field");
         }
 
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java
index 855793e9e978..92e7058bc79d 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java
@@ -8,6 +8,7 @@
 
 package org.elasticsearch.cluster.routing;
 
+import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.Diff;
 import org.elasticsearch.cluster.Diffable;
 import org.elasticsearch.cluster.DiffableUtils;
@@ -45,22 +46,15 @@
  */
 public class RoutingTable implements Iterable<IndexRoutingTable>, Diffable<RoutingTable> {
 
-    public static final RoutingTable EMPTY_ROUTING_TABLE = new RoutingTable(0, ImmutableOpenMap.of());
-
-    private final long version;
+    public static final RoutingTable EMPTY_ROUTING_TABLE = new RoutingTable(ImmutableOpenMap.of());
 
     // index to IndexRoutingTable map
     private final ImmutableOpenMap<String, IndexRoutingTable> indicesRouting;
 
-    private RoutingTable(long version, ImmutableOpenMap<String, IndexRoutingTable> indicesRouting) {
-        this.version = version;
+    private RoutingTable(ImmutableOpenMap<String, IndexRoutingTable> indicesRouting) {
         this.indicesRouting = indicesRouting;
     }
 
-    public RoutingTable withIncrementedVersion() {
-        return new RoutingTable(version + 1, indicesRouting);
-    }
-
     /**
      * Get's the {@link IndexShardRoutingTable} for the given shard id from the given {@link IndexRoutingTable}
      * or throws a {@link ShardNotFoundException} if no shard by the given id is found in the IndexRoutingTable.
@@ -77,15 +71,6 @@ public static IndexShardRoutingTable shardRoutingTable(IndexRoutingTable indexRo
         return indexShard;
     }
 
-    /**
-     * Returns the version of the {@link RoutingTable}.
-     *
-     * @return version of the {@link RoutingTable}
-     */
-    public long version() {
-        return this.version;
-    }
-
     @Override
     public Iterator<IndexRoutingTable> iterator() {
         return indicesRouting.values().iterator();
@@ -331,7 +316,9 @@ public static Diff<RoutingTable> readDiffFrom(StreamInput in) throws IOException
 
     public static RoutingTable readFrom(StreamInput in) throws IOException {
         Builder builder = new Builder();
-        builder.version = in.readLong();
+        if (in.getTransportVersion().before(TransportVersions.ROUTING_TABLE_VERSION_REMOVED)) {
+            in.readLong(); // previously 'version', unused in all applicable versions so any number will do
+        }
         int size = in.readVInt();
         for (int i = 0; i < size; i++) {
             IndexRoutingTable index = IndexRoutingTable.readFrom(in);
@@ -343,18 +330,17 @@ public static RoutingTable readFrom(StreamInput in) throws IOException {
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
-        out.writeLong(version);
+        if (out.getTransportVersion().before(TransportVersions.ROUTING_TABLE_VERSION_REMOVED)) {
+            out.writeLong(0); // previously 'version', unused in all applicable versions so any number will do
+        }
         out.writeCollection(indicesRouting.values());
     }
 
     private static class RoutingTableDiff implements Diff<RoutingTable> {
 
-        private final long version;
-
         private final Diff<ImmutableOpenMap<String, IndexRoutingTable>> indicesRouting;
 
         RoutingTableDiff(RoutingTable before, RoutingTable after) {
-            version = after.version;
             indicesRouting = DiffableUtils.diff(before.indicesRouting, after.indicesRouting, DiffableUtils.getStringKeySerializer());
         }
 
@@ -362,27 +348,31 @@ private static class RoutingTableDiff implements Diff<RoutingTable> {
             new DiffableUtils.DiffableValueReader<>(IndexRoutingTable::readFrom, IndexRoutingTable::readDiffFrom);
 
         RoutingTableDiff(StreamInput in) throws IOException {
-            version = in.readLong();
+            if (in.getTransportVersion().before(TransportVersions.ROUTING_TABLE_VERSION_REMOVED)) {
+                in.readLong(); // previously 'version', unused in all applicable versions so any number will do
+            }
             indicesRouting = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), DIFF_VALUE_READER);
         }
 
         @Override
         public RoutingTable apply(RoutingTable part) {
             final ImmutableOpenMap<String, IndexRoutingTable> updatedRouting = indicesRouting.apply(part.indicesRouting);
-            if (part.version == version && updatedRouting == part.indicesRouting) {
+            if (updatedRouting == part.indicesRouting) {
                 return part;
             }
-            return new RoutingTable(version, updatedRouting);
+            return new RoutingTable(updatedRouting);
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            out.writeLong(version);
+            if (out.getTransportVersion().before(TransportVersions.ROUTING_TABLE_VERSION_REMOVED)) {
+                out.writeLong(0); // previously 'version', unused in all applicable versions so any number will do
+            }
             indicesRouting.writeTo(out);
         }
     }
 
-    public static RoutingTable of(long version, RoutingNodes routingNodes) {
+    public static RoutingTable of(RoutingNodes routingNodes) {
         Map<String, IndexRoutingTable.Builder> indexRoutingTableBuilders = new HashMap<>();
         for (RoutingNode routingNode : routingNodes) {
             for (ShardRouting shardRoutingEntry : routingNode) {
@@ -404,7 +394,7 @@ public static RoutingTable of(long version, RoutingNodes routingNodes) {
             IndexRoutingTable indexRoutingTable = indexBuilder.build();
             indicesRouting.put(indexRoutingTable.getIndex().getName(), indexRoutingTable);
         }
-        return new RoutingTable(version, indicesRouting.build());
+        return new RoutingTable(indicesRouting.build());
     }
 
     public static Builder builder() {
@@ -429,7 +419,6 @@ public static Builder builder(ShardRoutingRoleStrategy shardRoutingRoleStrategy,
     public static class Builder {
 
         private final ShardRoutingRoleStrategy shardRoutingRoleStrategy;
-        private long version;
         private ImmutableOpenMap.Builder<String, IndexRoutingTable> indicesRouting;
 
         public Builder() {
@@ -447,7 +436,6 @@ public Builder(ShardRoutingRoleStrategy shardRoutingRoleStrategy) {
 
         public Builder(ShardRoutingRoleStrategy shardRoutingRoleStrategy, RoutingTable routingTable) {
             this.shardRoutingRoleStrategy = shardRoutingRoleStrategy;
-            this.version = routingTable.version;
             this.indicesRouting = ImmutableOpenMap.builder(routingTable.indicesRouting);
         }
 
@@ -591,16 +579,6 @@ public Builder remove(String index) {
             return this;
         }
 
-        public Builder version(long version) {
-            this.version = version;
-            return this;
-        }
-
-        public Builder incrementVersion() {
-            this.version++;
-            return this;
-        }
-
         /**
          * Builds the routing table. Note that once this is called the builder
          * must be thrown away. If you need to build a new RoutingTable as a
@@ -610,7 +588,7 @@ public RoutingTable build() {
             if (indicesRouting == null) {
                 throw new IllegalStateException("once build is called the builder cannot be reused");
             }
-            RoutingTable table = new RoutingTable(version, indicesRouting.build());
+            RoutingTable table = new RoutingTable(indicesRouting.build());
             indicesRouting = null;
             return table;
         }
@@ -618,7 +596,7 @@ public RoutingTable build() {
 
     @Override
     public String toString() {
-        StringBuilder sb = new StringBuilder("routing_table (version ").append(version).append("):\n");
+        StringBuilder sb = new StringBuilder("routing_table:\n");
         for (IndexRoutingTable entry : indicesRouting.values()) {
             sb.append(entry.prettyPrint()).append('\n');
         }
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
index 17bbc8f20793..cc8f8442f2ec 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/AllocationService.java
@@ -159,7 +159,7 @@ public ClusterState applyStartedShards(ClusterState clusterState, List<ShardRout
     private static ClusterState buildResultAndLogHealthChange(ClusterState oldState, RoutingAllocation allocation, String reason) {
         final RoutingTable oldRoutingTable = oldState.routingTable();
         final RoutingNodes newRoutingNodes = allocation.routingNodes();
-        final RoutingTable newRoutingTable = RoutingTable.of(oldRoutingTable.version(), newRoutingNodes);
+        final RoutingTable newRoutingTable = RoutingTable.of(newRoutingNodes);
         final Metadata newMetadata = allocation.updateMetadataWithRoutingChanges(newRoutingTable);
         assert newRoutingTable.validate(newMetadata); // validates the routing table is coherent with the cluster state metadata
 
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java
index af5f8cd7bd8c..08be0a4e9010 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/RoutingAllocation.java
@@ -429,11 +429,7 @@ public void setSimulatedClusterInfo(ClusterInfo clusterInfo) {
     public RoutingAllocation immutableClone() {
         return new RoutingAllocation(
             deciders,
-            routingNodesChanged()
-                ? ClusterState.builder(clusterState)
-                    .routingTable(RoutingTable.of(clusterState.routingTable().version(), routingNodes))
-                    .build()
-                : clusterState,
+            routingNodesChanged() ? ClusterState.builder(clusterState).routingTable(RoutingTable.of(routingNodes)).build() : clusterState,
             clusterInfo,
             shardSizeInfo,
             currentNanoTime
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
index 991aa66d07ff..6ef1d6dd86b3 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
@@ -413,6 +413,11 @@ private float getShardWriteLoad(String index) {
 
         private float maxShardSizeBytes(String index) {
             final var indexMetadata = metadata.index(index);
+            if (indexMetadata.ignoreDiskWatermarks()) {
+                // disk watermarks are ignored for partial searchable snapshots
+                // and is equivalent to indexMetadata.isPartialSearchableSnapshot()
+                return 0;
+            }
             var maxShardSizeBytes = indexMetadata.getForecastedShardSizeInBytes().orElse(0L);
             for (int shard = 0; shard < indexMetadata.getNumberOfShards(); shard++) {
                 final var shardId = new ShardId(indexMetadata.getIndex(), shard);
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorService.java b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorService.java
index b6c19f331c71..79e0feaa7da0 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorService.java
@@ -132,7 +132,7 @@ public class ShardsAvailabilityHealthIndicatorService implements HealthIndicator
 
     private final SystemIndices systemIndices;
 
-    private volatile TimeValue replicaUnassignedBufferTime = TimeValue.timeValueSeconds(0);
+    private volatile TimeValue replicaUnassignedBufferTime;
 
     public ShardsAvailabilityHealthIndicatorService(
         ClusterService clusterService,
@@ -142,6 +142,7 @@ public ShardsAvailabilityHealthIndicatorService(
         this.clusterService = clusterService;
         this.allocationService = allocationService;
         this.systemIndices = systemIndices;
+        this.replicaUnassignedBufferTime = REPLICA_UNASSIGNED_BUFFER_TIME.get(clusterService.getSettings());
         clusterService.getClusterSettings().addSettingsUpdateConsumer(REPLICA_UNASSIGNED_BUFFER_TIME, this::setReplicaUnassignedBufferTime);
     }
 
diff --git a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
index 296acc30a83f..2e409fbf2c3e 100644
--- a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
@@ -505,9 +505,6 @@ private ClusterState patchVersions(ClusterState previousClusterState, ClusterSta
         if (previousClusterState != newClusterState) {
             // only the master controls the version numbers
             Builder builder = incrementVersion(newClusterState);
-            if (previousClusterState.routingTable() != newClusterState.routingTable()) {
-                builder.routingTable(newClusterState.routingTable().withIncrementedVersion());
-            }
             if (previousClusterState.metadata() != newClusterState.metadata()) {
                 builder.metadata(newClusterState.metadata().withIncrementedVersion());
             }
@@ -535,10 +532,6 @@ private static boolean versionNumbersPreserved(ClusterState oldState, ClusterSta
         if (oldState.metadata().version() != newState.metadata().version()) {
             return false;
         }
-        if (oldState.routingTable().version() != newState.routingTable().version()) {
-            // GatewayService is special and for odd legacy reasons gets to do this:
-            return oldState.clusterRecovered() == false && newState.clusterRecovered() && newState.routingTable().version() == 0;
-        }
         return true;
     }
 
diff --git a/server/src/main/java/org/elasticsearch/common/ReferenceDocs.java b/server/src/main/java/org/elasticsearch/common/ReferenceDocs.java
index 59c55fb7b624..f73425c42a1c 100644
--- a/server/src/main/java/org/elasticsearch/common/ReferenceDocs.java
+++ b/server/src/main/java/org/elasticsearch/common/ReferenceDocs.java
@@ -43,6 +43,7 @@ public enum ReferenceDocs {
     UNSTABLE_CLUSTER_TROUBLESHOOTING,
     LAGGING_NODE_TROUBLESHOOTING,
     SHARD_LOCK_TROUBLESHOOTING,
+    NETWORK_DISCONNECT_TROUBLESHOOTING,
     CONCURRENT_REPOSITORY_WRITERS,
     ARCHIVE_INDICES,
     HTTP_TRACER,
diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java b/server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java
index 4b3683edf730..8140649c9fb4 100644
--- a/server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java
+++ b/server/src/main/java/org/elasticsearch/common/io/stream/DelayableWriteable.java
@@ -15,6 +15,8 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A holder for {@link Writeable}s that delays reading the underlying object
@@ -230,11 +232,72 @@ private static <T> T deserialize(
     ) throws IOException {
         try (
             StreamInput in = registry == null
-                ? serialized.streamInput()
-                : new NamedWriteableAwareStreamInput(serialized.streamInput(), registry)
+                ? new DeduplicateStreamInput(serialized.streamInput(), new DeduplicatorCache())
+                : new DeduplicateNamedWriteableAwareStreamInput(serialized.streamInput(), registry, new DeduplicatorCache())
         ) {
             in.setTransportVersion(serializedAtVersion);
             return reader.read(in);
         }
     }
+
+    /** An object implementing this interface can deduplicate instance of the provided objects.*/
+    public interface Deduplicator {
+        <T> T deduplicate(T object);
+    }
+
+    private static class DeduplicateStreamInput extends FilterStreamInput implements Deduplicator {
+
+        private final Deduplicator deduplicator;
+
+        private DeduplicateStreamInput(StreamInput delegate, Deduplicator deduplicator) {
+            super(delegate);
+            this.deduplicator = deduplicator;
+        }
+
+        @Override
+        public <T> T deduplicate(T object) {
+            return deduplicator.deduplicate(object);
+        }
+    }
+
+    private static class DeduplicateNamedWriteableAwareStreamInput extends NamedWriteableAwareStreamInput implements Deduplicator {
+
+        private final Deduplicator deduplicator;
+
+        private DeduplicateNamedWriteableAwareStreamInput(
+            StreamInput delegate,
+            NamedWriteableRegistry registry,
+            Deduplicator deduplicator
+        ) {
+            super(delegate, registry);
+            this.deduplicator = deduplicator;
+        }
+
+        @Override
+        public <T> T deduplicate(T object) {
+            return deduplicator.deduplicate(object);
+        }
+    }
+
+    /**
+     * Implementation of a {@link Deduplicator} cache. It can hold up to 1024 instances.
+     */
+    private static class DeduplicatorCache implements Deduplicator {
+
+        private static final int MAX_SIZE = 1024;
+        // lazily init
+        private Map<Object, Object> cache = null;
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> T deduplicate(T object) {
+            if (cache == null) {
+                cache = new HashMap<>();
+                cache.put(object, object);
+            } else if (cache.size() < MAX_SIZE) {
+                object = (T) cache.computeIfAbsent(object, o -> o);
+            }
+            return object;
+        }
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java
index acdc3e32ea31..95552fa508f7 100644
--- a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java
@@ -884,24 +884,26 @@ protected StoredFieldsReader doGetSequentialStoredFieldsReader(StoredFieldsReade
             }
         }
 
-        DirectoryReaderWithAllLiveDocs(DirectoryReader in) throws IOException {
-            super(in, new SubReaderWrapper() {
-                @Override
-                public LeafReader wrap(LeafReader leaf) {
-                    final SegmentReader segmentReader = segmentReader(leaf);
-                    final Bits hardLiveDocs = segmentReader.getHardLiveDocs();
-                    if (hardLiveDocs == null) {
-                        return new LeafReaderWithLiveDocs(leaf, null, leaf.maxDoc());
-                    }
-                    // Once soft-deletes is enabled, we no longer hard-update or hard-delete documents directly.
-                    // Two scenarios that we have hard-deletes: (1) from old segments where soft-deletes was disabled,
-                    // (2) when IndexWriter hits non-aborted exceptions. These two cases, IW flushes SegmentInfos
-                    // before exposing the hard-deletes, thus we can use the hard-delete count of SegmentInfos.
-                    final int numDocs = segmentReader.maxDoc() - segmentReader.getSegmentInfo().getDelCount();
-                    assert numDocs == popCount(hardLiveDocs) : numDocs + " != " + popCount(hardLiveDocs);
-                    return new LeafReaderWithLiveDocs(segmentReader, hardLiveDocs, numDocs);
+        private static final SubReaderWrapper ALL_LIVE_DOCS_SUB_READER_WRAPPER = new SubReaderWrapper() {
+            @Override
+            public LeafReader wrap(LeafReader leaf) {
+                final SegmentReader segmentReader = segmentReader(leaf);
+                final Bits hardLiveDocs = segmentReader.getHardLiveDocs();
+                if (hardLiveDocs == null) {
+                    return new LeafReaderWithLiveDocs(leaf, null, leaf.maxDoc());
                 }
-            });
+                // Once soft-deletes is enabled, we no longer hard-update or hard-delete documents directly.
+                // Two scenarios that we have hard-deletes: (1) from old segments where soft-deletes was disabled,
+                // (2) when IndexWriter hits non-aborted exceptions. These two cases, IW flushes SegmentInfos
+                // before exposing the hard-deletes, thus we can use the hard-delete count of SegmentInfos.
+                final int numDocs = segmentReader.maxDoc() - segmentReader.getSegmentInfo().getDelCount();
+                assert numDocs == popCount(hardLiveDocs) : numDocs + " != " + popCount(hardLiveDocs);
+                return new LeafReaderWithLiveDocs(segmentReader, hardLiveDocs, numDocs);
+            }
+        };
+
+        DirectoryReaderWithAllLiveDocs(DirectoryReader in) throws IOException {
+            super(in, ALL_LIVE_DOCS_SUB_READER_WRAPPER);
         }
 
         @Override
diff --git a/server/src/main/java/org/elasticsearch/common/time/DateFormatters.java b/server/src/main/java/org/elasticsearch/common/time/DateFormatters.java
index ae8f8cb28da1..c1081f3d6285 100644
--- a/server/src/main/java/org/elasticsearch/common/time/DateFormatters.java
+++ b/server/src/main/java/org/elasticsearch/common/time/DateFormatters.java
@@ -2323,6 +2323,8 @@ static DateFormatter forPattern(String input) {
         } else if (FormatNames.STRICT_YEAR_MONTH_DAY.matches(input)) {
             return STRICT_YEAR_MONTH_DAY;
         } else {
+            DateUtils.checkTextualDateFormats(input);
+
             try {
                 return newDateFormatter(
                     input,
diff --git a/server/src/main/java/org/elasticsearch/common/time/DateUtils.java b/server/src/main/java/org/elasticsearch/common/time/DateUtils.java
index 8e98adc18336..e312ce78ea15 100644
--- a/server/src/main/java/org/elasticsearch/common/time/DateUtils.java
+++ b/server/src/main/java/org/elasticsearch/common/time/DateUtils.java
@@ -10,6 +10,9 @@
 
 import org.elasticsearch.common.logging.DeprecationCategory;
 import org.elasticsearch.common.logging.DeprecationLogger;
+import org.elasticsearch.core.Predicates;
+import org.elasticsearch.core.UpdateForV9;
+import org.elasticsearch.logging.LogManager;
 
 import java.time.Clock;
 import java.time.Duration;
@@ -19,6 +22,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
 
 import static java.util.Map.entry;
 import static org.elasticsearch.common.time.DateUtilsRounding.getMonthOfYear;
@@ -382,4 +387,16 @@ public static ZonedDateTime nowWithMillisResolution(Clock clock) {
         Clock millisResolutionClock = Clock.tick(clock, Duration.ofMillis(1));
         return ZonedDateTime.now(millisResolutionClock);
     }
+
+    // check for all textual fields, and localized zone offset
+    private static final Predicate<String> CONTAINS_CHANGING_TEXT_SPECIFIERS = System.getProperty("java.locale.providers", "")
+        .contains("COMPAT") ? Pattern.compile("[EcGaO]|MMM|LLL|eee|ccc|QQQ|ZZZZ").asPredicate() : Predicates.never();
+
+    @UpdateForV9    // this can be removed, we will only use CLDR on v9
+    static void checkTextualDateFormats(String format) {
+        if (CONTAINS_CHANGING_TEXT_SPECIFIERS.test(format)) {
+            LogManager.getLogger(DateFormatter.class)
+                .warn("Date format [{}] contains textual field specifiers that could change in JDK 23", format);
+        }
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/gateway/ClusterStateUpdaters.java b/server/src/main/java/org/elasticsearch/gateway/ClusterStateUpdaters.java
index b7826ad17add..143d24373e71 100644
--- a/server/src/main/java/org/elasticsearch/gateway/ClusterStateUpdaters.java
+++ b/server/src/main/java/org/elasticsearch/gateway/ClusterStateUpdaters.java
@@ -98,8 +98,6 @@ static ClusterState updateRoutingTable(final ClusterState state, ShardRoutingRol
         for (final IndexMetadata indexMetadata : state.metadata().indices().values()) {
             routingTableBuilder.addAsRecovery(indexMetadata);
         }
-        // start with 0 based versions for routing table
-        routingTableBuilder.version(0);
         return ClusterState.builder(state).routingTable(routingTableBuilder.build()).build();
     }
 
diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersions.java b/server/src/main/java/org/elasticsearch/index/IndexVersions.java
index 608d88fdef66..7bc8273eef52 100644
--- a/server/src/main/java/org/elasticsearch/index/IndexVersions.java
+++ b/server/src/main/java/org/elasticsearch/index/IndexVersions.java
@@ -166,7 +166,7 @@ private static IndexVersion def(int id, Version luceneVersion) {
      * In branches 8.7-8.11 see server/src/main/java/org/elasticsearch/index/IndexVersion.java for the equivalent definitions.
      */
 
-    public static final IndexVersion MINIMUM_COMPATIBLE = V_7_0_0;
+    public static final IndexVersion MINIMUM_COMPATIBLE = V_8_0_0;
 
     static final NavigableMap<Integer, IndexVersion> VERSION_IDS = getAllVersionIds(IndexVersions.class);
     static final IndexVersion LATEST_DEFINED;
@@ -217,8 +217,10 @@ static NavigableMap<Integer, IndexVersion> getAllVersionIds(Class<?> cls) {
         return Collections.unmodifiableNavigableMap(builder);
     }
 
+    @UpdateForV9
+    // We can simplify this once we've removed all references to index versions earlier than MINIMUM_COMPATIBLE
     static Collection<IndexVersion> getAllVersions() {
-        return VERSION_IDS.values();
+        return VERSION_IDS.values().stream().filter(v -> v.onOrAfter(MINIMUM_COMPATIBLE)).toList();
     }
 
     static final IntFunction<String> VERSION_LOOKUP = ReleaseVersions.generateVersionsLookup(IndexVersions.class, LATEST_DEFINED.id());
diff --git a/server/src/main/java/org/elasticsearch/index/codec/DeduplicatingFieldInfosFormat.java b/server/src/main/java/org/elasticsearch/index/codec/DeduplicatingFieldInfosFormat.java
index 75ec265a6839..67d98bf30d6e 100644
--- a/server/src/main/java/org/elasticsearch/index/codec/DeduplicatingFieldInfosFormat.java
+++ b/server/src/main/java/org/elasticsearch/index/codec/DeduplicatingFieldInfosFormat.java
@@ -65,7 +65,7 @@ public FieldInfos read(Directory directory, SegmentInfo segmentInfo, String segm
                 fi.isParentField()
             );
         }
-        return new FieldInfos(deduplicated);
+        return new FieldInfosWithUsages(deduplicated);
     }
 
     private static Map<String, String> internStringStringMap(Map<String, String> m) {
diff --git a/server/src/main/java/org/elasticsearch/index/codec/FieldInfosWithUsages.java b/server/src/main/java/org/elasticsearch/index/codec/FieldInfosWithUsages.java
new file mode 100644
index 000000000000..e0d4a94ee28a
--- /dev/null
+++ b/server/src/main/java/org/elasticsearch/index/codec/FieldInfosWithUsages.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.index.codec;
+
+import org.apache.lucene.index.DocValuesType;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FieldInfos;
+import org.apache.lucene.index.IndexOptions;
+
+public class FieldInfosWithUsages extends FieldInfos {
+    private final int totalUsages;
+
+    public FieldInfosWithUsages(FieldInfo[] infos) {
+        super(infos);
+        this.totalUsages = computeUsages(infos);
+    }
+
+    public static int computeUsages(FieldInfo[] infos) {
+        int usages = 0;
+        for (FieldInfo fi : infos) {
+            if (fi.getIndexOptions() != IndexOptions.NONE) {
+                usages++;
+            }
+            if (fi.hasNorms()) {
+                usages++;
+            }
+            if (fi.getDocValuesType() != DocValuesType.NONE) {
+                usages++;
+            }
+            if (fi.getPointDimensionCount() > 0) {
+                usages++;
+            }
+            if (fi.getVectorDimension() > 0) {
+                usages++;
+            }
+        }
+        return usages;
+    }
+
+    public int getTotalUsages() {
+        return totalUsages;
+    }
+}
diff --git a/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java b/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java
index 22bab1742589..43b0c27d3058 100644
--- a/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java
+++ b/server/src/main/java/org/elasticsearch/index/engine/CombinedDeletionPolicy.java
@@ -43,6 +43,9 @@ public class CombinedDeletionPolicy extends IndexDeletionPolicy {
     private final SoftDeletesPolicy softDeletesPolicy;
     private final LongSupplier globalCheckpointSupplier;
     private final Map<IndexCommit, Integer> acquiredIndexCommits; // Number of references held against each commit point.
+    // Index commits internally acquired by the commits listener. We want to track them separately to be able to disregard them
+    // when checking for externally acquired index commits that haven't been released
+    private final Set<IndexCommit> internallyAcquiredIndexCommits;
 
     interface CommitsListener {
 
@@ -72,6 +75,7 @@ interface CommitsListener {
         this.globalCheckpointSupplier = globalCheckpointSupplier;
         this.commitsListener = commitsListener;
         this.acquiredIndexCommits = new HashMap<>();
+        this.internallyAcquiredIndexCommits = new HashSet<>();
     }
 
     @Override
@@ -114,7 +118,7 @@ public void onCommit(List<? extends IndexCommit> commits) throws IOException {
                 this.maxSeqNoOfNextSafeCommit = Long.parseLong(commits.get(keptPosition + 1).getUserData().get(SequenceNumbers.MAX_SEQ_NO));
             }
             if (commitsListener != null && previousLastCommit != this.lastCommit) {
-                newCommit = acquireIndexCommit(false);
+                newCommit = acquireIndexCommit(false, true);
             } else {
                 newCommit = null;
             }
@@ -210,15 +214,25 @@ SafeCommitInfo getSafeCommitInfo() {
      * @param acquiringSafeCommit captures the most recent safe commit point if true; otherwise captures the most recent commit point.
      */
     synchronized IndexCommit acquireIndexCommit(boolean acquiringSafeCommit) {
+        return acquireIndexCommit(acquiringSafeCommit, false);
+    }
+
+    private synchronized IndexCommit acquireIndexCommit(boolean acquiringSafeCommit, boolean acquiredInternally) {
         assert safeCommit != null : "Safe commit is not initialized yet";
         assert lastCommit != null : "Last commit is not initialized yet";
         final IndexCommit snapshotting = acquiringSafeCommit ? safeCommit : lastCommit;
         acquiredIndexCommits.merge(snapshotting, 1, Integer::sum); // increase refCount
-        return wrapCommit(snapshotting);
+        assert acquiredInternally == false || internallyAcquiredIndexCommits.add(snapshotting)
+            : "commit [" + snapshotting + "] already added";
+        return wrapCommit(snapshotting, acquiredInternally);
     }
 
     protected IndexCommit wrapCommit(IndexCommit indexCommit) {
-        return new SnapshotIndexCommit(indexCommit);
+        return wrapCommit(indexCommit, false);
+    }
+
+    protected IndexCommit wrapCommit(IndexCommit indexCommit, boolean acquiredInternally) {
+        return new SnapshotIndexCommit(indexCommit, acquiredInternally);
     }
 
     /**
@@ -227,7 +241,8 @@ protected IndexCommit wrapCommit(IndexCommit indexCommit) {
      * @return true if the acquired commit can be clean up.
      */
     synchronized boolean releaseCommit(final IndexCommit acquiredCommit) {
-        final IndexCommit releasingCommit = ((SnapshotIndexCommit) acquiredCommit).getIndexCommit();
+        final SnapshotIndexCommit snapshotIndexCommit = (SnapshotIndexCommit) acquiredCommit;
+        final IndexCommit releasingCommit = snapshotIndexCommit.getIndexCommit();
         assert acquiredIndexCommits.containsKey(releasingCommit)
             : "Release non-acquired commit;"
                 + "acquired commits ["
@@ -242,6 +257,8 @@ synchronized boolean releaseCommit(final IndexCommit acquiredCommit) {
             }
             return count - 1;
         });
+        assert snapshotIndexCommit.acquiredInternally == false || internallyAcquiredIndexCommits.remove(releasingCommit)
+            : "Trying to release a commit [" + releasingCommit + "] that hasn't been previously acquired internally";
 
         assert refCount == null || refCount > 0 : "Number of references for acquired commit can not be negative [" + refCount + "]";
         // The commit can be clean up only if no refCount and it is neither the safe commit nor last commit.
@@ -296,10 +313,16 @@ private static Set<String> listOfNewFileNames(IndexCommit previous, IndexCommit
     }
 
     /**
-     * Checks whether the deletion policy is holding on to acquired index commits
+     * Checks whether the deletion policy is holding on to externally acquired index commits
      */
-    synchronized boolean hasAcquiredIndexCommits() {
-        return acquiredIndexCommits.isEmpty() == false;
+    synchronized boolean hasAcquiredIndexCommitsForTesting() {
+        // We explicitly check only external commits and disregard internal commits acquired by the commits listener
+        for (var e : acquiredIndexCommits.entrySet()) {
+            if (internallyAcquiredIndexCommits.contains(e.getKey()) == false || e.getValue() > 1) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -320,8 +343,12 @@ public static String commitDescription(IndexCommit commit) throws IOException {
      * A wrapper of an index commit that prevents it from being deleted.
      */
     private static class SnapshotIndexCommit extends FilterIndexCommit {
-        SnapshotIndexCommit(IndexCommit delegate) {
+
+        private final boolean acquiredInternally;
+
+        SnapshotIndexCommit(IndexCommit delegate, boolean acquiredInternally) {
             super(delegate);
+            this.acquiredInternally = acquiredInternally;
         }
 
         @Override
diff --git a/server/src/main/java/org/elasticsearch/index/engine/Engine.java b/server/src/main/java/org/elasticsearch/index/engine/Engine.java
index b07132eea75e..8dec3fadd8a0 100644
--- a/server/src/main/java/org/elasticsearch/index/engine/Engine.java
+++ b/server/src/main/java/org/elasticsearch/index/engine/Engine.java
@@ -81,6 +81,7 @@
 import org.elasticsearch.index.store.Store;
 import org.elasticsearch.index.translog.Translog;
 import org.elasticsearch.index.translog.TranslogStats;
+import org.elasticsearch.indices.recovery.RecoverySettings;
 import org.elasticsearch.search.suggest.completion.CompletionStats;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.Transports;
@@ -139,6 +140,7 @@ public abstract class Engine implements Closeable {
     protected final EventListener eventListener;
     protected final ReentrantLock failEngineLock = new ReentrantLock();
     protected final SetOnce<Exception> failedEngine = new SetOnce<>();
+    protected final boolean enableRecoverySource;
 
     private final AtomicBoolean isClosing = new AtomicBoolean();
     private final SubscribableListener<Void> drainOnCloseListener = new SubscribableListener<>();
@@ -167,6 +169,9 @@ protected Engine(EngineConfig engineConfig) {
         // we use the engine class directly here to make sure all subclasses have the same logger name
         this.logger = Loggers.getLogger(Engine.class, engineConfig.getShardId());
         this.eventListener = engineConfig.getEventListener();
+        this.enableRecoverySource = RecoverySettings.INDICES_RECOVERY_SOURCE_ENABLED_SETTING.get(
+            engineConfig.getIndexSettings().getSettings()
+        );
     }
 
     /**
@@ -279,7 +284,7 @@ private long getDenseVectorValueCount(final LeafReader atomicReader, List<String
         long count = 0;
         for (var field : fields) {
             var info = atomicReader.getFieldInfos().fieldInfo(field);
-            if (info.getVectorDimension() > 0) {
+            if (info != null && info.getVectorDimension() > 0) {
                 switch (info.getVectorEncoding()) {
                     case FLOAT32 -> {
                         FloatVectorValues values = atomicReader.getFloatVectorValues(info.name);
diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
index 9e0fbd0bb691..7c456f55ac8a 100644
--- a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
+++ b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -98,6 +98,7 @@
 import org.elasticsearch.index.translog.TranslogCorruptedException;
 import org.elasticsearch.index.translog.TranslogDeletionPolicy;
 import org.elasticsearch.index.translog.TranslogStats;
+import org.elasticsearch.indices.recovery.RecoverySettings;
 import org.elasticsearch.search.suggest.completion.CompletionStats;
 import org.elasticsearch.threadpool.ThreadPool;
 
@@ -668,8 +669,8 @@ Translog getTranslog() {
     }
 
     // Package private for testing purposes only
-    boolean hasAcquiredIndexCommits() {
-        return combinedDeletionPolicy.hasAcquiredIndexCommits();
+    boolean hasAcquiredIndexCommitsForTesting() {
+        return combinedDeletionPolicy.hasAcquiredIndexCommitsForTesting();
     }
 
     @Override
@@ -3130,6 +3131,13 @@ public Translog.Snapshot newChangesSnapshot(
         boolean singleConsumer,
         boolean accessStats
     ) throws IOException {
+        if (enableRecoverySource == false) {
+            throw new IllegalStateException(
+                "Changes snapshot are unavailable when the "
+                    + RecoverySettings.INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey()
+                    + " setting is disabled."
+            );
+        }
         ensureOpen();
         refreshIfNeeded(source, toSeqNo);
         Searcher searcher = acquireSearcher(source, SearcherScope.INTERNAL);
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java
index 39f4a3a82c5c..1065e67dccf4 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractGeometryFieldMapper.java
@@ -201,32 +201,17 @@ protected BlockLoader blockLoaderFromSource(BlockLoaderContext blContext) {
     protected AbstractGeometryFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
+        BuilderParams builderParams,
         Explicit<Boolean> ignoreMalformed,
         Explicit<Boolean> ignoreZValue,
-        MultiFields multiFields,
-        CopyTo copyTo,
         Parser<T> parser
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, false, null);
+        super(simpleName, mappedFieldType, builderParams);
         this.ignoreMalformed = ignoreMalformed;
         this.ignoreZValue = ignoreZValue;
         this.parser = parser;
     }
 
-    protected AbstractGeometryFieldMapper(
-        String simpleName,
-        MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
-        Parser<T> parser,
-        OnScriptError onScriptError
-    ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, true, onScriptError);
-        this.ignoreMalformed = Explicit.EXPLICIT_FALSE;
-        this.ignoreZValue = Explicit.EXPLICIT_FALSE;
-        this.parser = parser;
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public AbstractGeometryFieldType<T> fieldType() {
@@ -252,7 +237,7 @@ protected boolean supportsParsingObject() {
 
     @Override
     public final void parse(DocumentParserContext context) throws IOException {
-        if (hasScript) {
+        if (builderParams.hasScript()) {
             throw new DocumentParsingException(
                 context.parser().getTokenLocation(),
                 "failed to parse field [" + fieldType().name() + "] of type + " + contentType() + "]",
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java
index 2b4ecc8f0a89..23005289e729 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractPointGeometryFieldMapper.java
@@ -40,29 +40,16 @@ public static <T> Parameter<T> nullValueParam(
     protected AbstractPointGeometryFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
+        BuilderParams builderParams,
         Explicit<Boolean> ignoreMalformed,
         Explicit<Boolean> ignoreZValue,
         T nullValue,
-        CopyTo copyTo,
         Parser<T> parser
     ) {
-        super(simpleName, mappedFieldType, ignoreMalformed, ignoreZValue, multiFields, copyTo, parser);
+        super(simpleName, mappedFieldType, builderParams, ignoreMalformed, ignoreZValue, parser);
         this.nullValue = nullValue;
     }
 
-    protected AbstractPointGeometryFieldMapper(
-        String simpleName,
-        MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
-        Parser<T> parser,
-        OnScriptError onScriptError
-    ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, parser, onScriptError);
-        this.nullValue = null;
-    }
-
     public T getNullValue() {
         return nullValue;
     }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractScriptFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractScriptFieldType.java
index cf453bd1571b..92cb1a0d85d8 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractScriptFieldType.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractScriptFieldType.java
@@ -244,7 +244,7 @@ protected abstract static class Builder<Factory> extends RuntimeField.Builder {
         ).setSerializerCheck((id, ic, v) -> ic);
 
         private final FieldMapper.Parameter<OnScriptError> onScriptError = FieldMapper.Parameter.onScriptErrorParam(
-            m -> m.onScriptError,
+            m -> m.builderParams.onScriptError(),
             script
         );
 
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java
index 619c6c6613d5..ef20a40f6e9d 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java
@@ -76,30 +76,14 @@ protected Object nullValueAsSource(T nullValue) {
     protected AbstractShapeGeometryFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
+        BuilderParams builderParams,
         Explicit<Boolean> ignoreMalformed,
         Explicit<Boolean> coerce,
         Explicit<Boolean> ignoreZValue,
         Explicit<Orientation> orientation,
-        MultiFields multiFields,
-        CopyTo copyTo,
         Parser<T> parser
     ) {
-        super(simpleName, mappedFieldType, ignoreMalformed, ignoreZValue, multiFields, copyTo, parser);
-        this.coerce = coerce;
-        this.orientation = orientation;
-    }
-
-    protected AbstractShapeGeometryFieldMapper(
-        String simpleName,
-        MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        Explicit<Boolean> coerce,
-        Explicit<Orientation> orientation,
-        CopyTo copyTo,
-        Parser<T> parser,
-        OnScriptError onScriptError
-    ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, parser, onScriptError);
+        super(simpleName, mappedFieldType, builderParams, ignoreMalformed, ignoreZValue, parser);
         this.coerce = coerce;
         this.orientation = orientation;
     }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java
index 1891e19b6d03..8d9dd99092a0 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/BinaryFieldMapper.java
@@ -72,8 +72,7 @@ public BinaryFieldMapper build(MapperBuilderContext context) {
             return new BinaryFieldMapper(
                 leafName(),
                 new BinaryFieldType(context.buildFullName(leafName()), stored.getValue(), hasDocValues.getValue(), meta.getValue()),
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 this
             );
         }
@@ -142,14 +141,8 @@ public Query termQuery(Object value, SearchExecutionContext context) {
     private final boolean hasDocValues;
     private final boolean isSyntheticSourceEnabledViaIndexMode;
 
-    protected BinaryFieldMapper(
-        String simpleName,
-        MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
-        Builder builder
-    ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+    protected BinaryFieldMapper(String simpleName, MappedFieldType mappedFieldType, BuilderParams builderParams, Builder builder) {
+        super(simpleName, mappedFieldType, builderParams);
         this.stored = builder.stored.getValue();
         this.hasDocValues = builder.hasDocValues.getValue();
         this.isSyntheticSourceEnabledViaIndexMode = builder.isSyntheticSourceEnabledViaIndexMode;
@@ -201,54 +194,40 @@ protected String contentType() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-        if (hasDocValues == false) {
-            throw new IllegalArgumentException(
-                "field ["
-                    + fullPath()
-                    + "] of type ["
-                    + typeName()
-                    + "] doesn't support synthetic source because it doesn't have doc values"
-            );
-        }
-
-        return new BinaryDocValuesSyntheticFieldLoader(fullPath()) {
-            @Override
-            protected void writeValue(XContentBuilder b, BytesRef value) throws IOException {
-                var in = new ByteArrayStreamInput();
-                in.reset(value.bytes, value.offset, value.length);
-
-                int count = in.readVInt();
-                switch (count) {
-                    case 0:
-                        return;
-                    case 1:
-                        b.field(leafName());
-                        break;
-                    default:
-                        b.startArray(leafName());
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        if (hasDocValues) {
+            var loader = new BinaryDocValuesSyntheticFieldLoader(fullPath()) {
+                @Override
+                protected void writeValue(XContentBuilder b, BytesRef value) throws IOException {
+                    var in = new ByteArrayStreamInput();
+                    in.reset(value.bytes, value.offset, value.length);
+
+                    int count = in.readVInt();
+                    switch (count) {
+                        case 0:
+                            return;
+                        case 1:
+                            b.field(leafName());
+                            break;
+                        default:
+                            b.startArray(leafName());
+                    }
+
+                    for (int i = 0; i < count; i++) {
+                        byte[] bytes = in.readByteArray();
+                        b.value(Base64.getEncoder().encodeToString(bytes));
+                    }
+
+                    if (count > 1) {
+                        b.endArray();
+                    }
                 }
+            };
 
-                for (int i = 0; i < count; i++) {
-                    byte[] bytes = in.readByteArray();
-                    b.value(Base64.getEncoder().encodeToString(bytes));
-                }
+            return new SyntheticSourceSupport.Native(loader);
+        }
 
-                if (count > 1) {
-                    b.endArray();
-                }
-            }
-        };
+        return super.syntheticSourceSupport();
     }
 
     public static final class CustomBinaryDocValuesField extends CustomDocValuesField {
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java
index 1f0088ec9647..e450d3916fc6 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/BooleanFieldMapper.java
@@ -89,7 +89,10 @@ public static final class Builder extends FieldMapper.DimensionBuilder {
         ).acceptsNull();
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
-        private final Parameter<OnScriptError> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
+        private final Parameter<OnScriptError> onScriptErrorParam = Parameter.onScriptErrorParam(
+            m -> toType(m).builderParams.onScriptError(),
+            script
+        );
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
@@ -133,7 +136,16 @@ public Builder dimension(boolean dimension) {
 
         @Override
         protected Parameter<?>[] getParameters() {
-            return new Parameter<?>[] { meta, docValues, indexed, nullValue, stored, script, onScriptError, ignoreMalformed, dimension };
+            return new Parameter<?>[] {
+                meta,
+                docValues,
+                indexed,
+                nullValue,
+                stored,
+                script,
+                onScriptErrorParam,
+                ignoreMalformed,
+                dimension };
         }
 
         @Override
@@ -151,14 +163,9 @@ public BooleanFieldMapper build(MapperBuilderContext context) {
                 meta.getValue(),
                 dimension.getValue()
             );
-            return new BooleanFieldMapper(
-                leafName(),
-                ft,
-                multiFieldsBuilder.build(this, context),
-                copyTo,
-                context.isSourceSynthetic(),
-                this
-            );
+            hasScript = script.get() != null;
+            onScriptError = onScriptErrorParam.getValue();
+            return new BooleanFieldMapper(leafName(), ft, builderParams(this, context), context.isSourceSynthetic(), this);
         }
 
         private FieldValues<Boolean> scriptValues() {
@@ -427,12 +434,11 @@ public Query rangeQuery(
     protected BooleanFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean storeMalformedFields,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, builder.script.get() != null, builder.onScriptError.getValue());
+        super(simpleName, mappedFieldType, builderParams);
         this.nullValue = builder.nullValue.getValue();
         this.stored = builder.stored.getValue();
         this.indexed = builder.indexed.getValue();
@@ -543,34 +549,18 @@ protected String contentType() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        if (hasDocValues) {
+            var loader = new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed.value()) {
+                @Override
+                protected void writeValue(XContentBuilder b, long value) throws IOException {
+                    b.value(value == 1);
+                }
+            };
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasScript()) {
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
+            return new SyntheticSourceSupport.Native(loader);
         }
-        if (hasDocValues == false) {
-            throw new IllegalArgumentException(
-                "field ["
-                    + fullPath()
-                    + "] of type ["
-                    + typeName()
-                    + "] doesn't support synthetic source because it doesn't have doc values"
-            );
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-        return new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed.value()) {
-            @Override
-            protected void writeValue(XContentBuilder b, long value) throws IOException {
-                b.value(value == 1);
-            }
-        };
+
+        return super.syntheticSourceSupport();
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java
index 23272fbd354f..8576e227d706 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java
@@ -207,7 +207,7 @@ public CompletionFieldMapper build(MapperBuilderContext context) {
 
             CompletionFieldType ft = new CompletionFieldType(context.buildFullName(leafName()), completionAnalyzer, meta.getValue());
             ft.setContextMappings(contexts.getValue());
-            return new CompletionFieldMapper(leafName(), ft, multiFieldsBuilder.build(this, context), copyTo, this);
+            return new CompletionFieldMapper(leafName(), ft, builderParams(this, context), this);
         }
 
         private void checkCompletionContextsLimit() {
@@ -346,14 +346,8 @@ protected List<?> parseSourceValue(Object value) {
 
     private final NamedAnalyzer indexAnalyzer;
 
-    public CompletionFieldMapper(
-        String simpleName,
-        MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
-        Builder builder
-    ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+    public CompletionFieldMapper(String simpleName, MappedFieldType mappedFieldType, BuilderParams builderParams, Builder builder) {
+        super(simpleName, mappedFieldType, builderParams);
         this.builder = builder;
         this.maxInputLength = builder.maxInputLength.getValue();
         this.indexAnalyzer = builder.buildAnalyzer();
@@ -443,7 +437,7 @@ public void parse(DocumentParserContext context) throws IOException {
 
         context.addToFieldNames(fieldType().name());
         for (CompletionInputMetadata metadata : inputMap.values()) {
-            multiFields.parse(
+            multiFields().parse(
                 this,
                 context,
                 () -> context.switchParser(new MultiFieldParser(metadata, fieldType().name(), context.parser().getTokenLocation()))
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/CompositeRuntimeField.java b/server/src/main/java/org/elasticsearch/index/mapper/CompositeRuntimeField.java
index d7b039dde1c2..35d6d7f01fb8 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/CompositeRuntimeField.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/CompositeRuntimeField.java
@@ -48,7 +48,7 @@ public class CompositeRuntimeField implements RuntimeField {
         });
 
         private final FieldMapper.Parameter<OnScriptError> onScriptError = FieldMapper.Parameter.onScriptErrorParam(
-            m -> m.onScriptError,
+            m -> m.builderParams.onScriptError(),
             script
         );
 
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DataStreamTimestampFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DataStreamTimestampFieldMapper.java
index 6f4a8ffa92cb..a6048c22c282 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/DataStreamTimestampFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/DataStreamTimestampFieldMapper.java
@@ -270,9 +270,4 @@ protected String contentType() {
     public boolean isEnabled() {
         return enabled;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
index c70414807cdc..5bd79ca21128 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java
@@ -247,7 +247,10 @@ public static final class Builder extends FieldMapper.Builder {
         private final Parameter<Boolean> ignoreMalformed;
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
-        private final Parameter<OnScriptError> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
+        private final Parameter<OnScriptError> onScriptErrorParam = Parameter.onScriptErrorParam(
+            m -> toType(m).builderParams.onScriptError(),
+            script
+        );
 
         private final Resolution resolution;
         private final IndexVersion indexCreatedVersion;
@@ -316,7 +319,17 @@ private FieldValues<Long> scriptValues() {
 
         @Override
         protected Parameter<?>[] getParameters() {
-            return new Parameter<?>[] { index, docValues, store, format, locale, nullValue, ignoreMalformed, script, onScriptError, meta };
+            return new Parameter<?>[] {
+                index,
+                docValues,
+                store,
+                format,
+                locale,
+                nullValue,
+                ignoreMalformed,
+                script,
+                onScriptErrorParam,
+                meta };
         }
 
         private Long parseNullValue(DateFieldType fieldType) {
@@ -364,12 +377,12 @@ public DateFieldMapper build(MapperBuilderContext context) {
                 && ignoreMalformed.isConfigured() == false) {
                 ignoreMalformed.setValue(false);
             }
-
+            hasScript = script.get() != null;
+            onScriptError = onScriptErrorParam.get();
             return new DateFieldMapper(
                 leafName(),
                 ft,
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 nullTimestamp,
                 resolution,
                 context.isSourceSynthetic(),
@@ -874,14 +887,13 @@ public DocValueFormat docValueFormat(@Nullable String format, ZoneId timeZone) {
     private DateFieldMapper(
         String leafName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Long nullValue,
         Resolution resolution,
         boolean isSourceSynthetic,
         Builder builder
     ) {
-        super(leafName, mappedFieldType, multiFields, copyTo, builder.script.get() != null, builder.onScriptError.get());
+        super(leafName, mappedFieldType, builderParams);
         this.store = builder.store.getValue();
         this.indexed = builder.index.getValue();
         this.hasDocValues = builder.docValues.getValue();
@@ -992,34 +1004,18 @@ public Long getNullValue() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        if (hasDocValues) {
+            var loader = new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed) {
+                @Override
+                protected void writeValue(XContentBuilder b, long value) throws IOException {
+                    b.value(fieldType().format(value, fieldType().dateTimeFormatter()));
+                }
+            };
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasScript) {
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
+            return new SyntheticSourceSupport.Native(loader);
         }
-        if (hasDocValues == false) {
-            throw new IllegalArgumentException(
-                "field ["
-                    + fullPath()
-                    + "] of type ["
-                    + typeName()
-                    + "] doesn't support synthetic source because it doesn't have doc values"
-            );
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-        return new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed) {
-            @Override
-            protected void writeValue(XContentBuilder b, long value) throws IOException {
-                b.value(fieldType().format(value, fieldType().dateTimeFormatter()));
-            }
-        };
+
+        return super.syntheticSourceSupport();
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocCountFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/DocCountFieldMapper.java
index 6326e23c59b9..7a94df40daf7 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/DocCountFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/DocCountFieldMapper.java
@@ -126,8 +126,8 @@ public static IndexableField field(int count) {
     }
 
     @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return new SyntheticFieldLoader();
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        return new SyntheticSourceSupport.Native(new SyntheticFieldLoader());
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
index f020b8128bb1..e2143aca0fd1 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java
@@ -646,7 +646,7 @@ private static void parseArrayDynamic(DocumentParserContext context, String curr
                         context.addIgnoredField(
                             IgnoredSourceFieldMapper.NameValue.fromContext(
                                 context,
-                                currentFieldName,
+                                context.path().pathAsText(currentFieldName),
                                 XContentDataHelper.encodeToken(context.parser())
                             )
                         );
@@ -925,8 +925,7 @@ public Query termQuery(Object value, SearchExecutionContext context) {
                 throw new UnsupportedOperationException();
             }
         },
-        FieldMapper.MultiFields.empty(),
-        FieldMapper.CopyTo.empty()
+        FieldMapper.BuilderParams.empty()
     ) {
 
         @Override
@@ -999,16 +998,10 @@ protected String contentType() {
         }
 
         @Override
-        protected SyntheticSourceMode syntheticSourceMode() {
+        protected SyntheticSourceSupport syntheticSourceSupport() {
             // Opt out of fallback synthetic source implementation
-            // since there is custom logic in #parseCreateField()
-            return SyntheticSourceMode.NATIVE;
-        }
-
-        @Override
-        public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-            // Handled via IgnoredSourceFieldMapper infrastructure
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
+            // since there is custom logic in #parseCreateField().
+            return new SyntheticSourceSupport.Native(SourceLoader.SyntheticFieldLoader.NOTHING);
         }
     };
 
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
index 9e6b3132e849..e2616832b7b1 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
@@ -45,6 +45,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
@@ -75,46 +76,42 @@ public abstract class FieldMapper extends Mapper {
     @SuppressWarnings("rawtypes")
     static final Parameter<?>[] EMPTY_PARAMETERS = new Parameter[0];
 
-    protected final MappedFieldType mappedFieldType;
-    protected final MultiFields multiFields;
-    protected final CopyTo copyTo;
-    protected final boolean hasScript;
-    protected final OnScriptError onScriptError;
-
     /**
-     * @param simpleName        the leaf name of the mapper
-     * @param mappedFieldType   the MappedFieldType associated with this mapper
-     * @param multiFields       sub fields of this mapper
-     * @param copyTo            copyTo fields of this mapper
-     */
-    protected FieldMapper(String simpleName, MappedFieldType mappedFieldType, MultiFields multiFields, CopyTo copyTo) {
-        this(simpleName, mappedFieldType, multiFields, copyTo, false, null);
-    }
-
-    /**
-     * @param simpleName        the leaf name of the mapper
-     * @param mappedFieldType   the MappedFieldType associated with this mapper
      * @param multiFields       sub fields of this mapper
      * @param copyTo            copyTo fields of this mapper
+     * @param sourceKeepMode   mode for storing the field source in synthetic source mode
      * @param hasScript         whether a script is defined for the field
      * @param onScriptError     the behaviour for when the defined script fails at runtime
      */
-    protected FieldMapper(
-        String simpleName,
-        MappedFieldType mappedFieldType,
+    protected record BuilderParams(
         MultiFields multiFields,
         CopyTo copyTo,
+        Optional<SourceKeepMode> sourceKeepMode,
         boolean hasScript,
         OnScriptError onScriptError
     ) {
+        public static BuilderParams empty() {
+            return empty;
+        }
+
+        private static final BuilderParams empty = new BuilderParams(MultiFields.empty(), CopyTo.empty(), Optional.empty(), false, null);
+    }
+
+    protected final MappedFieldType mappedFieldType;
+    protected final BuilderParams builderParams;
+
+    /**
+     * @param simpleName        the leaf name of the mapper
+     * @param params            initialization params for this field mapper
+     */
+    protected FieldMapper(String simpleName, MappedFieldType mappedFieldType, BuilderParams params) {
         super(simpleName);
+        this.mappedFieldType = mappedFieldType;
+        this.builderParams = params;
+
         // could be blank but not empty on indices created < 8.6.0
         assert mappedFieldType.name().isEmpty() == false;
-        this.mappedFieldType = mappedFieldType;
-        this.multiFields = multiFields;
-        this.copyTo = Objects.requireNonNull(copyTo);
-        this.hasScript = hasScript;
-        this.onScriptError = onScriptError;
+        assert params.copyTo != null;
     }
 
     @Override
@@ -135,11 +132,15 @@ public MappedFieldType fieldType() {
      * List of fields where this field should be copied to
      */
     public CopyTo copyTo() {
-        return copyTo;
+        return builderParams.copyTo;
     }
 
     public MultiFields multiFields() {
-        return multiFields;
+        return builderParams.multiFields;
+    }
+
+    public Optional<SourceKeepMode> sourceKeepMode() {
+        return builderParams.sourceKeepMode;
     }
 
     /**
@@ -178,7 +179,7 @@ protected boolean supportsParsingObject() {
      */
     public void parse(DocumentParserContext context) throws IOException {
         try {
-            if (hasScript) {
+            if (builderParams.hasScript) {
                 throwIndexingWithScriptParam();
             }
 
@@ -188,14 +189,14 @@ public void parse(DocumentParserContext context) throws IOException {
         }
         // TODO: multi fields are really just copy fields, we just need to expose "sub fields" or something that can be part
         // of the mappings
-        if (multiFields.mappers.length != 0) {
+        if (builderParams.multiFields.mappers.length != 0) {
             doParseMultiFields(context);
         }
     }
 
     private void doParseMultiFields(DocumentParserContext context) throws IOException {
         context.path().add(leafName());
-        for (FieldMapper mapper : multiFields.mappers) {
+        for (FieldMapper mapper : builderParams.multiFields.mappers) {
             mapper.parse(context);
         }
         context.path().remove();
@@ -255,7 +256,7 @@ private void rethrowAsDocumentParsingException(DocumentParserContext context, Ex
      * @return whether this field mapper uses a script to generate its values
      */
     public final boolean hasScript() {
-        return hasScript;
+        return builderParams.hasScript;
     }
 
     /**
@@ -276,7 +277,7 @@ public final void executeScript(
         try {
             indexScriptValues(searchLookup, readerContext, doc, documentParserContext);
         } catch (Exception e) {
-            if (onScriptError == OnScriptError.CONTINUE) {
+            if (builderParams.onScriptError == OnScriptError.CONTINUE) {
                 documentParserContext.addIgnoredField(fullPath());
             } else {
                 throw new DocumentParsingException(XContentLocation.UNKNOWN, "Error executing script on field [" + fullPath() + "]", e);
@@ -308,7 +309,7 @@ public Iterator<Mapper> iterator() {
     }
 
     protected Iterator<Mapper> multiFieldsIterator() {
-        return Iterators.forArray(multiFields.mappers);
+        return Iterators.forArray(builderParams.multiFields.mappers);
     }
 
     /**
@@ -424,36 +425,24 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     protected void doXContentBody(XContentBuilder builder, Params params) throws IOException {
         builder.field("type", contentType());
         getMergeBuilder().toXContent(builder, params);
-        multiFields.toXContent(builder, params);
-        copyTo.toXContent(builder);
+        builderParams.multiFields.toXContent(builder, params);
+        builderParams.copyTo.toXContent(builder);
+        if (builderParams.sourceKeepMode.isPresent()) {
+            builderParams.sourceKeepMode.get().toXContent(builder);
+        }
     }
 
     protected abstract String contentType();
 
     @Override
     public int getTotalFieldsCount() {
-        return 1 + Stream.of(multiFields.mappers).mapToInt(FieldMapper::getTotalFieldsCount).sum();
+        return 1 + Stream.of(builderParams.multiFields.mappers).mapToInt(FieldMapper::getTotalFieldsCount).sum();
     }
 
     public Map<String, NamedAnalyzer> indexAnalyzers() {
         return Map.of();
     }
 
-    /**
-     * Specifies the mode of synthetic source support by the mapper.
-     *
-     * <pre>
-     * {@link SyntheticSourceMode#NATIVE} - mapper natively supports synthetic source, f.e. by constructing it from doc values.
-     *
-     * {@link SyntheticSourceMode#FALLBACK} - mapper does not have native support and uses generic fallback implementation
-     * that stores raw input source data as is.
-     * </pre>
-     */
-    protected enum SyntheticSourceMode {
-        NATIVE,
-        FALLBACK
-    }
-
     /**
      * <p>
      * Specifies the mode of synthetic source support by the mapper.
@@ -465,38 +454,112 @@ protected enum SyntheticSourceMode {
      * and then use it for synthetic source.
      * </p>
      * <p>
-     * Field mappers must override this method if they provide
-     * a custom implementation of {@link #syntheticFieldLoader()}
-     * in order to use a more efficient field-specific implementation.
+     * This method is final in order to support common use cases like fallback synthetic source and copy_to.
+     * Mappers that need custom support of synthetic source should override {@link #syntheticSourceSupport()}.
      * </p>
      * @return {@link SyntheticSourceMode}
      */
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.FALLBACK;
+    final SyntheticSourceMode syntheticSourceMode() {
+        if (hasScript()) {
+            return SyntheticSourceMode.NATIVE;
+        }
+
+        if (builderParams.copyTo.copyToFields().isEmpty() == false) {
+            // When copy_to is used, we need to use fallback logic to store source of the field exactly.
+            // Otherwise, due to possible differences between synthetic source and stored source,
+            // values of fields that are destinations of copy_to would be different after reindexing.
+            return SyntheticSourceMode.FALLBACK;
+        }
+
+        return syntheticSourceSupport().mode();
     }
 
     /**
-     * Mappers override this method with native synthetic source support.
-     * If mapper does not support synthetic source, it is generated using generic implementation
+     * Returns synthetic field loader for the mapper.
+     * If mapper does not support synthetic source, it is handled using generic implementation
      * in {@link DocumentParser#parseObjectOrField} and {@link ObjectMapper#syntheticFieldLoader()}.
+     * <br>
+     *
+     * This method is final in order to support common use cases like fallback synthetic source.
+     * Mappers that need custom support of synthetic source should override {@link #syntheticSourceSupport()}.
      *
      * @return implementation of {@link SourceLoader.SyntheticFieldLoader}
      */
     @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        // If mapper supports synthetic source natively, it overrides this method,
-        // so we won't see those here.
+    public final SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
+        if (hasScript()) {
+            return SourceLoader.SyntheticFieldLoader.NOTHING;
+        }
+
         if (syntheticSourceMode() == SyntheticSourceMode.FALLBACK) {
-            if (copyTo.copyToFields().isEmpty() != true) {
-                throw new IllegalArgumentException(
-                    "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-                );
-            }
-            // Nothing because it is handled at `ObjectMapper` level.
+            // Nothing because it is handled at `DocumentParser/ObjectMapper` level.
             return SourceLoader.SyntheticFieldLoader.NOTHING;
         }
 
-        return super.syntheticFieldLoader();
+        return syntheticSourceSupport().loader();
+    }
+
+    /**
+     * <p>
+     * Returns implementation of synthetic source support for the mapper.
+     * <br>
+     * By default (meaning {@link SyntheticSourceSupport.Fallback}),
+     * an exact full copy of parsed field value is stored separately
+     * and used for synthetic source.
+     * </p>
+     * <p>
+     * Field mappers must override this method if they provide
+     * a more efficient field-specific implementation of synthetic source.
+     * </p>
+     * @return {@link SyntheticSourceMode}
+     */
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        return SyntheticSourceSupport.FALLBACK;
+    }
+
+    /**
+     * Specifies the mode of synthetic source support by the mapper.
+     *
+     * <pre>
+     * {@link SyntheticSourceMode#NATIVE} - mapper natively supports synthetic source, f.e. by constructing it from doc values.
+     *
+     * {@link SyntheticSourceMode#FALLBACK} - mapper does not have native support and uses generic fallback implementation
+     * that stores raw input source data as is.
+     * </pre>
+     */
+    protected enum SyntheticSourceMode {
+        NATIVE,
+        FALLBACK
+    }
+
+    /**
+     * Interface that defines how a field supports synthetic source.
+     */
+    protected sealed interface SyntheticSourceSupport permits SyntheticSourceSupport.Fallback, SyntheticSourceSupport.Native {
+        final class Fallback implements SyntheticSourceSupport {
+            @Override
+            public SyntheticSourceMode mode() {
+                return SyntheticSourceMode.FALLBACK;
+            }
+
+            @Override
+            public SourceLoader.SyntheticFieldLoader loader() {
+                return null;
+            }
+        }
+
+        SyntheticSourceSupport FALLBACK = new Fallback();
+
+        record Native(SourceLoader.SyntheticFieldLoader loader) implements SyntheticSourceSupport {
+            @Override
+            public SyntheticSourceMode mode() {
+                return SyntheticSourceMode.NATIVE;
+            }
+        }
+
+        SyntheticSourceMode mode();
+
+        SourceLoader.SyntheticFieldLoader loader();
     }
 
     public static final class MultiFields implements Iterable<FieldMapper>, ToXContent {
@@ -1289,6 +1352,9 @@ public abstract static class Builder extends Mapper.Builder implements ToXConten
 
         protected final MultiFields.Builder multiFieldsBuilder = new MultiFields.Builder();
         protected CopyTo copyTo = CopyTo.EMPTY;
+        protected Optional<SourceKeepMode> sourceKeepMode = Optional.empty();
+        protected boolean hasScript = false;
+        protected OnScriptError onScriptError = null;
 
         /**
          * Creates a new Builder with a field name
@@ -1304,21 +1370,26 @@ public Builder init(FieldMapper initializer) {
             for (Parameter<?> param : getParameters()) {
                 param.init(initializer);
             }
-            for (FieldMapper subField : initializer.multiFields.mappers) {
+            for (FieldMapper subField : initializer.builderParams.multiFields.mappers) {
                 multiFieldsBuilder.add(subField);
             }
             return this;
         }
 
+        protected BuilderParams builderParams(Mapper.Builder mainFieldBuilder, MapperBuilderContext context) {
+            return new BuilderParams(multiFieldsBuilder.build(mainFieldBuilder, context), copyTo, sourceKeepMode, hasScript, onScriptError);
+        }
+
         protected void merge(FieldMapper in, Conflicts conflicts, MapperMergeContext mapperMergeContext) {
             for (Parameter<?> param : getParameters()) {
                 param.merge(in, conflicts);
             }
             MapperMergeContext childContext = mapperMergeContext.createChildContext(in.leafName(), null);
-            for (FieldMapper newSubField : in.multiFields.mappers) {
+            for (FieldMapper newSubField : in.builderParams.multiFields.mappers) {
                 multiFieldsBuilder.update(newSubField, childContext);
             }
-            this.copyTo = in.copyTo;
+            this.copyTo = in.builderParams.copyTo;
+            this.sourceKeepMode = in.builderParams.sourceKeepMode;
             validate();
         }
 
@@ -1413,6 +1484,11 @@ public final void parse(String name, MappingParserContext parserContext, Map<Str
                         iterator.remove();
                         continue;
                     }
+                    case SYNTHETIC_SOURCE_KEEP_PARAM -> {
+                        sourceKeepMode = Optional.of(SourceKeepMode.from(XContentMapValues.nodeStringValue(propNode)));
+                        iterator.remove();
+                        continue;
+                    }
                 }
                 Parameter<?> parameter = deprecatedParamsMap.get(propName);
                 if (parameter != null) {
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java
index 57a4885d44d5..1229cce59ace 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java
@@ -187,9 +187,4 @@ private static boolean noDocValues(String field, DocumentParserContext context)
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java
index b34b94191f91..0719d4ad7e48 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java
@@ -87,7 +87,10 @@ public static final class Builder extends FieldMapper.Builder {
         final Parameter<Boolean> hasDocValues = Parameter.docValuesParam(m -> builder(m).hasDocValues.get(), true);
         final Parameter<Boolean> stored = Parameter.storeParam(m -> builder(m).stored.get(), false);
         private final Parameter<Script> script = Parameter.scriptParam(m -> builder(m).script.get());
-        private final Parameter<OnScriptError> onScriptError = Parameter.onScriptErrorParam(m -> builder(m).onScriptError.get(), script);
+        private final Parameter<OnScriptError> onScriptErrorParam = Parameter.onScriptErrorParam(
+            m -> builder(m).onScriptErrorParam.get(),
+            script
+        );
         final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
         private final ScriptCompiler scriptCompiler;
@@ -152,7 +155,7 @@ protected Parameter<?>[] getParameters() {
                 ignoreZValue,
                 nullValue,
                 script,
-                onScriptError,
+                onScriptErrorParam,
                 meta,
                 dimension,
                 metric };
@@ -217,10 +220,9 @@ public FieldMapper build(MapperBuilderContext context) {
                 metric.get(),
                 indexMode
             );
-            if (this.script.get() == null) {
-                return new GeoPointFieldMapper(leafName(), ft, multiFieldsBuilder.build(this, context), copyTo, geoParser, this);
-            }
-            return new GeoPointFieldMapper(leafName(), ft, geoParser, this);
+            hasScript = script.get() != null;
+            onScriptError = onScriptErrorParam.get();
+            return new GeoPointFieldMapper(leafName(), ft, builderParams(this, context), geoParser, this);
         }
 
     }
@@ -248,32 +250,20 @@ public FieldMapper build(MapperBuilderContext context) {
     public GeoPointFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Parser<GeoPoint> parser,
         Builder builder
     ) {
         super(
             simpleName,
             mappedFieldType,
-            multiFields,
+            builderParams,
             builder.ignoreMalformed.get(),
             builder.ignoreZValue.get(),
             builder.nullValue.get(),
-            copyTo,
             parser
         );
         this.builder = builder;
-        this.scriptValues = null;
-        this.indexCreatedVersion = builder.indexCreatedVersion;
-        this.metricType = builder.metric.get();
-        this.indexMode = builder.indexMode;
-        this.indexed = builder.indexed.get();
-    }
-
-    public GeoPointFieldMapper(String simpleName, MappedFieldType mappedFieldType, Parser<GeoPoint> parser, Builder builder) {
-        super(simpleName, mappedFieldType, MultiFields.empty(), CopyTo.empty(), parser, builder.onScriptError.get());
-        this.builder = builder;
         this.scriptValues = builder.scriptValues();
         this.indexCreatedVersion = builder.indexCreatedVersion;
         this.metricType = builder.metric.get();
@@ -308,7 +298,7 @@ protected void index(DocumentParserContext context, GeoPoint geometry) throws IO
         // TODO phase out geohash (which is currently used in the CompletionSuggester)
         // we only expose the geohash value and disallow advancing tokens, hence we can reuse the same parser throughout multiple sub-fields
         DocumentParserContext parserContext = context.switchParser(new GeoHashMultiFieldParser(context.parser(), geometry.geohash()));
-        multiFields.parse(this, context, () -> parserContext);
+        multiFields().parse(this, context, () -> parserContext);
     }
 
     /**
@@ -617,37 +607,21 @@ protected void onMalformedValue(DocumentParserContext context, XContentBuilder m
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        if (fieldType().hasDocValues()) {
+            var loader = new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed()) {
+                final GeoPoint point = new GeoPoint();
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasScript()) {
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
-        }
-        if (fieldType().hasDocValues() == false) {
-            throw new IllegalArgumentException(
-                "field ["
-                    + fullPath()
-                    + "] of type ["
-                    + typeName()
-                    + "] doesn't support synthetic source because it doesn't have doc values"
-            );
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
+                @Override
+                protected void writeValue(XContentBuilder b, long value) throws IOException {
+                    point.reset(GeoEncodingUtils.decodeLatitude((int) (value >>> 32)), GeoEncodingUtils.decodeLongitude((int) value));
+                    point.toXContent(b, ToXContent.EMPTY_PARAMS);
+                }
+            };
+
+            return new SyntheticSourceSupport.Native(loader);
         }
-        return new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed()) {
-            final GeoPoint point = new GeoPoint();
 
-            @Override
-            protected void writeValue(XContentBuilder b, long value) throws IOException {
-                point.reset(GeoEncodingUtils.decodeLatitude((int) (value >>> 32)), GeoEncodingUtils.decodeLongitude((int) value));
-                point.toXContent(b, ToXContent.EMPTY_PARAMS);
-            }
-        };
+        return super.syntheticSourceSupport();
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
index c5b1f575d941..8b1e54ef1c7b 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
@@ -50,11 +50,6 @@ protected final String contentType() {
         return CONTENT_TYPE;
     }
 
-    @Override
-    public final SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
-
     /**
      * Description of the document being parsed used in error messages. Not
      * called unless there is an error.
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java
index b0f153252ac4..2e6466e69b84 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IgnoredFieldMapper.java
@@ -140,9 +140,4 @@ public void postParse(DocumentParserContext context) {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapper.java
index f94a05b2a865..5d8d13abafea 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapper.java
@@ -199,12 +199,4 @@ public static byte[] encodeFromMap(MappedNameValue mappedNameValue, Map<String,
         );
         return IgnoredSourceFieldMapper.encode(filteredNameValue);
     }
-
-    // This mapper doesn't contribute to source directly as it has no access to the object structure. Instead, its contents
-    // are loaded by SourceLoader and passed to object mappers that, in turn, write their ignore fields at the appropriate level.
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
-
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java
index 1b2667fe9d2e..a72333b15490 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IndexFieldMapper.java
@@ -111,9 +111,4 @@ public IndexFieldMapper() {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IndexModeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IndexModeFieldMapper.java
index 8fa1ff304056..9f5cce81a79c 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IndexModeFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IndexModeFieldMapper.java
@@ -111,9 +111,4 @@ public IndexModeFieldMapper() {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
index d5819f5eb433..638af1a10532 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
@@ -42,7 +42,6 @@
 import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.lookup.FieldValues;
 import org.elasticsearch.search.lookup.SearchLookup;
-import org.elasticsearch.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -81,7 +80,10 @@ public static final class Builder extends FieldMapper.DimensionBuilder {
             .acceptsNull();
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
-        private final Parameter<OnScriptError> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
+        private final Parameter<OnScriptError> onScriptErrorParam = Parameter.onScriptErrorParam(
+            m -> toType(m).builderParams.onScriptError(),
+            script
+        );
 
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
         private final Parameter<Boolean> dimension;
@@ -162,7 +164,16 @@ private FieldValues<InetAddress> scriptValues() {
 
         @Override
         protected Parameter<?>[] getParameters() {
-            return new Parameter<?>[] { indexed, hasDocValues, stored, ignoreMalformed, nullValue, script, onScriptError, meta, dimension };
+            return new Parameter<?>[] {
+                indexed,
+                hasDocValues,
+                stored,
+                ignoreMalformed,
+                nullValue,
+                script,
+                onScriptErrorParam,
+                meta,
+                dimension };
         }
 
         @Override
@@ -170,6 +181,8 @@ public IpFieldMapper build(MapperBuilderContext context) {
             if (inheritDimensionParameterFromParentObject(context)) {
                 dimension.setValue(true);
             }
+            hasScript = script.get() != null;
+            onScriptError = onScriptErrorParam.getValue();
             return new IpFieldMapper(
                 leafName(),
                 new IpFieldType(
@@ -182,8 +195,7 @@ public IpFieldMapper build(MapperBuilderContext context) {
                     meta.getValue(),
                     dimension.getValue()
                 ),
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 context.isSourceSynthetic(),
                 this
             );
@@ -494,12 +506,11 @@ public TermsEnum getTerms(IndexReader reader, String prefix, boolean caseInsensi
     private IpFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean storeIgnored,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, builder.script.get() != null, builder.onScriptError.get());
+        super(simpleName, mappedFieldType, builderParams);
         this.ignoreMalformedByDefault = builder.ignoreMalformedByDefault;
         this.indexed = builder.indexed.getValue();
         this.hasDocValues = builder.hasDocValues.getValue();
@@ -533,8 +544,9 @@ protected String contentType() {
     @Override
     protected void parseCreateField(DocumentParserContext context) throws IOException {
         InetAddress address;
+        String value = context.parser().textOrNull();
         try {
-            address = value(context.parser(), nullValue);
+            address = value == null ? nullValue : InetAddresses.forString(value);
         } catch (IllegalArgumentException e) {
             if (ignoreMalformed) {
                 context.addIgnoredField(fieldType().name());
@@ -552,14 +564,6 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
         }
     }
 
-    private static InetAddress value(XContentParser parser, InetAddress nullValue) throws IOException {
-        String value = parser.textOrNull();
-        if (value == null) {
-            return nullValue;
-        }
-        return InetAddresses.forString(value);
-    }
-
     private void indexValue(DocumentParserContext context, InetAddress address) {
         if (dimension) {
             context.getDimensions().addIp(fieldType().name(), address).validate(context.indexSettings());
@@ -603,49 +607,30 @@ public void doValidate(MappingLookup lookup) {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasScript()) {
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
-        }
-        if (hasDocValues == false) {
-            throw new IllegalArgumentException(
-                "field ["
-                    + fullPath()
-                    + "] of type ["
-                    + typeName()
-                    + "] doesn't support synthetic source because it doesn't have doc values"
-            );
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        if (hasDocValues) {
+            var layers = new ArrayList<CompositeSyntheticFieldLoader.Layer>();
+            layers.add(new SortedSetDocValuesSyntheticFieldLoaderLayer(fullPath()) {
+                @Override
+                protected BytesRef convert(BytesRef value) {
+                    byte[] bytes = Arrays.copyOfRange(value.bytes, value.offset, value.offset + value.length);
+                    return new BytesRef(NetworkAddress.format(InetAddressPoint.decode(bytes)));
+                }
 
-        var layers = new ArrayList<CompositeSyntheticFieldLoader.Layer>();
-        layers.add(new SortedSetDocValuesSyntheticFieldLoaderLayer(fullPath()) {
-            @Override
-            protected BytesRef convert(BytesRef value) {
-                byte[] bytes = Arrays.copyOfRange(value.bytes, value.offset, value.offset + value.length);
-                return new BytesRef(NetworkAddress.format(InetAddressPoint.decode(bytes)));
-            }
+                @Override
+                protected BytesRef preserve(BytesRef value) {
+                    // No need to copy because convert has made a deep copy
+                    return value;
+                }
+            });
 
-            @Override
-            protected BytesRef preserve(BytesRef value) {
-                // No need to copy because convert has made a deep copy
-                return value;
+            if (ignoreMalformed) {
+                layers.add(new CompositeSyntheticFieldLoader.MalformedValuesLayer(fullPath()));
             }
-        });
 
-        if (ignoreMalformed) {
-            layers.add(new CompositeSyntheticFieldLoader.MalformedValuesLayer(fullPath()));
+            return new SyntheticSourceSupport.Native(new CompositeSyntheticFieldLoader(leafName(), fullPath(), layers));
         }
 
-        return new CompositeSyntheticFieldLoader(leafName(), fullPath(), layers);
+        return super.syntheticSourceSupport();
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
index d130f37c3e8e..97c48c7bbfa3 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java
@@ -182,7 +182,10 @@ public static final class Builder extends FieldMapper.DimensionBuilder {
         private final Parameter<Map<String, String>> meta = Parameter.metaParam();
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
-        private final Parameter<OnScriptError> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
+        private final Parameter<OnScriptError> onScriptError = Parameter.onScriptErrorParam(
+            m -> toType(m).builderParams.onScriptError(),
+            script
+        );
         private final Parameter<Boolean> dimension;
 
         private final IndexAnalyzers indexAnalyzers;
@@ -351,12 +354,13 @@ public KeywordFieldMapper build(MapperBuilderContext context) {
                 // deduplicate in the common default case to save some memory
                 fieldtype = Defaults.FIELD_TYPE;
             }
+            super.hasScript = script.get() != null;
+            super.onScriptError = onScriptError.getValue();
             return new KeywordFieldMapper(
                 leafName(),
                 fieldtype,
                 buildFieldType(context, fieldtype),
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 context.isSourceSynthetic(),
                 this
             );
@@ -865,12 +869,11 @@ private KeywordFieldMapper(
         String simpleName,
         FieldType fieldType,
         KeywordFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean isSyntheticSource,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, builder.script.get() != null, builder.onScriptError.getValue());
+        super(simpleName, mappedFieldType, builderParams);
         assert fieldType.indexOptions().compareTo(IndexOptions.DOCS_AND_FREQS) <= 0;
         this.indexed = builder.indexed.getValue();
         this.hasDocValues = builder.hasDocValues.getValue();
@@ -1026,37 +1029,22 @@ private String originalName() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
+    protected SyntheticSourceSupport syntheticSourceSupport() {
         if (hasNormalizer()) {
-            // NOTE: no matter if we have doc values or not we use a stored field to reconstruct the original value
-            // whose doc values would be altered by the normalizer
-            return SyntheticSourceMode.FALLBACK;
+            // NOTE: no matter if we have doc values or not we use fallback synthetic source
+            // to store the original value whose doc values would be altered by the normalizer
+            return SyntheticSourceSupport.FALLBACK;
         }
+
         if (fieldType.stored() || hasDocValues) {
-            return SyntheticSourceMode.NATIVE;
+            return new SyntheticSourceSupport.Native(syntheticFieldLoader(leafName()));
         }
 
-        return SyntheticSourceMode.FALLBACK;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return syntheticFieldLoader(leafName());
+        return super.syntheticSourceSupport();
     }
 
     public SourceLoader.SyntheticFieldLoader syntheticFieldLoader(String simpleName) {
-        if (hasScript()) {
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-
-        if (syntheticSourceMode() != SyntheticSourceMode.NATIVE) {
-            return super.syntheticFieldLoader();
-        }
+        assert fieldType.stored() || hasDocValues;
 
         var layers = new ArrayList<CompositeSyntheticFieldLoader.Layer>();
         if (fieldType.stored()) {
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/LegacyTypeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/LegacyTypeFieldMapper.java
index 359faf2d6f4b..9cd0482d133b 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/LegacyTypeFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/LegacyTypeFieldMapper.java
@@ -105,9 +105,4 @@ public ValueFetcher valueFetcher(SearchExecutionContext context, String format)
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java
index 9469ee29ff0a..7aa297c5854c 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/Mapper.java
@@ -16,7 +16,10 @@
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.xcontent.ToXContentFragment;
+import org.elasticsearch.xcontent.XContentBuilder;
 
+import java.io.IOException;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
@@ -39,6 +42,9 @@ public enum SourceKeepMode {
         }
 
         static SourceKeepMode from(String input) {
+            if (input == null) {
+                input = "null";
+            }
             if (input.equals(NONE.name)) {
                 return NONE;
             }
@@ -48,7 +54,15 @@ static SourceKeepMode from(String input) {
             if (input.equals(ARRAYS.name)) {
                 return ARRAYS;
             }
-            throw new IllegalArgumentException("Unknown " + SYNTHETIC_SOURCE_KEEP_PARAM + " value [" + input + "]");
+            throw new IllegalArgumentException(
+                "Unknown "
+                    + SYNTHETIC_SOURCE_KEEP_PARAM
+                    + " value ["
+                    + input
+                    + "], accepted values are ["
+                    + String.join(",", Arrays.stream(SourceKeepMode.values()).map(SourceKeepMode::toString).toList())
+                    + "]"
+            );
         }
 
         @Override
@@ -56,6 +70,10 @@ public String toString() {
             return name;
         }
 
+        public void toXContent(XContentBuilder builder) throws IOException {
+            builder.field(SYNTHETIC_SOURCE_KEEP_PARAM, name);
+        }
+
         private final String name;
     }
 
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java b/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java
index 2e250726b98c..92412177d35e 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/MapperFeatures.java
@@ -35,7 +35,8 @@ public Set<NodeFeature> getFeatures() {
             ObjectMapper.SUBOBJECTS_AUTO,
             KeywordFieldMapper.KEYWORD_NORMALIZER_SYNTHETIC_SOURCE,
             SourceFieldMapper.SYNTHETIC_SOURCE_STORED_FIELDS_ADVANCE_FIX,
-            Mapper.SYNTHETIC_SOURCE_KEEP_FEATURE
+            Mapper.SYNTHETIC_SOURCE_KEEP_FEATURE,
+            SourceFieldMapper.SYNTHETIC_SOURCE_WITH_COPY_TO_AND_DOC_VALUES_FALSE_SUPPORT
         );
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java
index d0c84c1acd46..356e80010514 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/MetadataFieldMapper.java
@@ -174,7 +174,7 @@ public final void parseMetadataField(String name, MappingParserContext parserCon
     }
 
     protected MetadataFieldMapper(MappedFieldType mappedFieldType) {
-        super(mappedFieldType.name(), mappedFieldType, MultiFields.empty(), CopyTo.empty(), false, null);
+        super(mappedFieldType.name(), mappedFieldType, BuilderParams.empty());
     }
 
     @Override
@@ -216,10 +216,7 @@ public void postParse(DocumentParserContext context) throws IOException {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        return new SyntheticSourceSupport.Native(SourceLoader.SyntheticFieldLoader.NOTHING);
     }
-
-    @Override
-    public abstract SourceLoader.SyntheticFieldLoader syntheticFieldLoader();
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NestedPathFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NestedPathFieldMapper.java
index 6a0f4a87eb89..d315fcba3ca0 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/NestedPathFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/NestedPathFieldMapper.java
@@ -83,9 +83,4 @@ private NestedPathFieldMapper(String name) {
     protected String contentType() {
         return NAME;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
index 1e5143a58f20..a895c9d52fcc 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
@@ -100,7 +100,10 @@ public static final class Builder extends FieldMapper.DimensionBuilder {
         private final Parameter<Number> nullValue;
 
         private final Parameter<Script> script = Parameter.scriptParam(m -> toType(m).script);
-        private final Parameter<OnScriptError> onScriptError = Parameter.onScriptErrorParam(m -> toType(m).onScriptError, script);
+        private final Parameter<OnScriptError> onScriptErrorParam = Parameter.onScriptErrorParam(
+            m -> toType(m).builderParams.onScriptError(),
+            script
+        );
 
         /**
          * Parameter that marks this field as a time series dimension.
@@ -253,7 +256,7 @@ protected Parameter<?>[] getParameters() {
                 coerce,
                 nullValue,
                 script,
-                onScriptError,
+                onScriptErrorParam,
                 meta,
                 dimension,
                 metric };
@@ -266,14 +269,9 @@ public NumberFieldMapper build(MapperBuilderContext context) {
             }
 
             MappedFieldType ft = new NumberFieldType(context.buildFullName(leafName()), this);
-            return new NumberFieldMapper(
-                leafName(),
-                ft,
-                multiFieldsBuilder.build(this, context),
-                copyTo,
-                context.isSourceSynthetic(),
-                this
-            );
+            hasScript = script.get() != null;
+            onScriptError = onScriptErrorParam.getValue();
+            return new NumberFieldMapper(leafName(), ft, builderParams(this, context), context.isSourceSynthetic(), this);
         }
     }
 
@@ -1841,12 +1839,11 @@ public MetricType getMetricType() {
     private NumberFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean storeMalformedFields,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, builder.script.get() != null, builder.onScriptError.getValue());
+        super(simpleName, mappedFieldType, builderParams);
         this.type = builder.type;
         this.indexed = builder.indexed.getValue();
         this.hasDocValues = builder.hasDocValues.getValue();
@@ -1987,29 +1984,12 @@ public void doValidate(MappingLookup lookup) {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        if (hasDocValues) {
-            return SyntheticSourceMode.NATIVE;
-        }
-
-        return SyntheticSourceMode.FALLBACK;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasScript()) {
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
         if (hasDocValues) {
-            return type.syntheticFieldLoader(fullPath(), leafName(), ignoreMalformed.value());
+            return new SyntheticSourceSupport.Native(type.syntheticFieldLoader(fullPath(), leafName(), ignoreMalformed.value()));
         }
 
-        return super.syntheticFieldLoader();
+        return super.syntheticSourceSupport();
     }
 
     // For testing only:
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/PlaceHolderFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/PlaceHolderFieldMapper.java
index 4a12ed77b4f2..e21d0ea9b3e9 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/PlaceHolderFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/PlaceHolderFieldMapper.java
@@ -91,7 +91,7 @@ protected Parameter<?>[] getParameters() {
         @Override
         public PlaceHolderFieldMapper build(MapperBuilderContext context) {
             PlaceHolderFieldType mappedFieldType = new PlaceHolderFieldType(context.buildFullName(leafName()), type, Map.of());
-            return new PlaceHolderFieldMapper(leafName(), mappedFieldType, multiFieldsBuilder.build(this, context), copyTo, unknownParams);
+            return new PlaceHolderFieldMapper(leafName(), mappedFieldType, builderParams(this, context), unknownParams);
         }
     }
 
@@ -262,11 +262,10 @@ private String fail(String query) {
     public PlaceHolderFieldMapper(
         String simpleName,
         PlaceHolderFieldType fieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Map<String, Object> unknownParams
     ) {
-        super(simpleName, fieldType, multiFields, copyTo);
+        super(simpleName, fieldType, builderParams);
         this.unknownParams.putAll(unknownParams);
     }
 
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java
index e80da7ce8a76..1aabb2959f0f 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java
@@ -167,7 +167,7 @@ protected RangeFieldType setupFieldType(MapperBuilderContext context) {
         @Override
         public RangeFieldMapper build(MapperBuilderContext context) {
             RangeFieldType ft = setupFieldType(context);
-            return new RangeFieldMapper(leafName(), ft, multiFieldsBuilder.build(this, context), copyTo, type, this);
+            return new RangeFieldMapper(leafName(), ft, builderParams(this, context), type, this);
         }
     }
 
@@ -342,12 +342,11 @@ public Query rangeQuery(
     private RangeFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         RangeType type,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+        super(simpleName, mappedFieldType, builderParams);
         this.type = type;
         this.index = builder.index.getValue();
         this.hasDocValues = builder.hasDocValues.getValue();
@@ -463,47 +462,34 @@ private static Range parseIpRangeFromCidr(final XContentParser parser) throws IO
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        if (hasDocValues) {
+            var loader = new BinaryDocValuesSyntheticFieldLoader(fullPath()) {
+                @Override
+                protected void writeValue(XContentBuilder b, BytesRef value) throws IOException {
+                    List<Range> ranges = type.decodeRanges(value);
+
+                    switch (ranges.size()) {
+                        case 0:
+                            return;
+                        case 1:
+                            b.field(leafName());
+                            ranges.get(0).toXContent(b, fieldType().dateTimeFormatter);
+                            break;
+                        default:
+                            b.startArray(leafName());
+                            for (var range : ranges) {
+                                range.toXContent(b, fieldType().dateTimeFormatter);
+                            }
+                            b.endArray();
+                    }
+                }
+            };
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasDocValues == false) {
-            throw new IllegalArgumentException(
-                "field ["
-                    + fullPath()
-                    + "] of type ["
-                    + typeName()
-                    + "] doesn't support synthetic source because it doesn't have doc values"
-            );
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
+            return new SyntheticSourceSupport.Native(loader);
         }
-        return new BinaryDocValuesSyntheticFieldLoader(fullPath()) {
-            @Override
-            protected void writeValue(XContentBuilder b, BytesRef value) throws IOException {
-                List<Range> ranges = type.decodeRanges(value);
-
-                switch (ranges.size()) {
-                    case 0:
-                        return;
-                    case 1:
-                        b.field(leafName());
-                        ranges.get(0).toXContent(b, fieldType().dateTimeFormatter);
-                        break;
-                    default:
-                        b.startArray(leafName());
-                        for (var range : ranges) {
-                            range.toXContent(b, fieldType().dateTimeFormatter);
-                        }
-                        b.endArray();
-                }
-            }
-        };
+
+        return super.syntheticSourceSupport();
     }
 
     /** Class defining a range */
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java
index 39686c3f3055..0b80e582f6f9 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/RoutingFieldMapper.java
@@ -119,9 +119,4 @@ public void preParse(DocumentParserContext context) {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java
index a46a310d0770..3b97b8ec5173 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java
@@ -244,9 +244,4 @@ public void postParse(DocumentParserContext context) {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java
index 8d34d3188a38..1de4e11a1d3b 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/SourceFieldMapper.java
@@ -36,11 +36,16 @@
 import java.util.List;
 import java.util.Locale;
 
+import static org.elasticsearch.indices.recovery.RecoverySettings.INDICES_RECOVERY_SOURCE_ENABLED_SETTING;
+
 public class SourceFieldMapper extends MetadataFieldMapper {
     public static final NodeFeature SYNTHETIC_SOURCE_FALLBACK = new NodeFeature("mapper.source.synthetic_source_fallback");
     public static final NodeFeature SYNTHETIC_SOURCE_STORED_FIELDS_ADVANCE_FIX = new NodeFeature(
         "mapper.source.synthetic_source_stored_fields_advance_fix"
     );
+    public static final NodeFeature SYNTHETIC_SOURCE_WITH_COPY_TO_AND_DOC_VALUES_FALSE_SUPPORT = new NodeFeature(
+        "mapper.source.synthetic_source_with_copy_to_and_doc_values_false"
+    );
 
     public static final String NAME = "_source";
     public static final String RECOVERY_SOURCE_NAME = "_recovery_source";
@@ -61,7 +66,17 @@ private enum Mode {
         Explicit.IMPLICIT_TRUE,
         Strings.EMPTY_ARRAY,
         Strings.EMPTY_ARRAY,
-        null
+        null,
+        true
+    );
+
+    private static final SourceFieldMapper DEFAULT_NO_RECOVERY_SOURCE = new SourceFieldMapper(
+        null,
+        Explicit.IMPLICIT_TRUE,
+        Strings.EMPTY_ARRAY,
+        Strings.EMPTY_ARRAY,
+        null,
+        false
     );
 
     private static final SourceFieldMapper TSDB_DEFAULT = new SourceFieldMapper(
@@ -69,7 +84,17 @@ private enum Mode {
         Explicit.IMPLICIT_TRUE,
         Strings.EMPTY_ARRAY,
         Strings.EMPTY_ARRAY,
-        IndexMode.TIME_SERIES
+        IndexMode.TIME_SERIES,
+        true
+    );
+
+    private static final SourceFieldMapper TSDB_DEFAULT_NO_RECOVERY_SOURCE = new SourceFieldMapper(
+        Mode.SYNTHETIC,
+        Explicit.IMPLICIT_TRUE,
+        Strings.EMPTY_ARRAY,
+        Strings.EMPTY_ARRAY,
+        IndexMode.TIME_SERIES,
+        false
     );
 
     private static final SourceFieldMapper LOGSDB_DEFAULT = new SourceFieldMapper(
@@ -77,7 +102,17 @@ private enum Mode {
         Explicit.IMPLICIT_TRUE,
         Strings.EMPTY_ARRAY,
         Strings.EMPTY_ARRAY,
-        IndexMode.LOGSDB
+        IndexMode.LOGSDB,
+        true
+    );
+
+    private static final SourceFieldMapper LOGSDB_DEFAULT_NO_RECOVERY_SOURCE = new SourceFieldMapper(
+        Mode.SYNTHETIC,
+        Explicit.IMPLICIT_TRUE,
+        Strings.EMPTY_ARRAY,
+        Strings.EMPTY_ARRAY,
+        IndexMode.LOGSDB,
+        false
     );
 
     /*
@@ -89,7 +124,17 @@ private enum Mode {
         Explicit.IMPLICIT_TRUE,
         Strings.EMPTY_ARRAY,
         Strings.EMPTY_ARRAY,
-        IndexMode.TIME_SERIES
+        IndexMode.TIME_SERIES,
+        true
+    );
+
+    private static final SourceFieldMapper TSDB_LEGACY_DEFAULT_NO_RECOVERY_SOURCE = new SourceFieldMapper(
+        null,
+        Explicit.IMPLICIT_TRUE,
+        Strings.EMPTY_ARRAY,
+        Strings.EMPTY_ARRAY,
+        IndexMode.TIME_SERIES,
+        false
     );
 
     public static class Defaults {
@@ -148,11 +193,19 @@ public static class Builder extends MetadataFieldMapper.Builder {
 
         private final boolean supportsNonDefaultParameterValues;
 
-        public Builder(IndexMode indexMode, final Settings settings, boolean supportsCheckForNonDefaultParams) {
+        private final boolean enableRecoverySource;
+
+        public Builder(
+            IndexMode indexMode,
+            final Settings settings,
+            boolean supportsCheckForNonDefaultParams,
+            boolean enableRecoverySource
+        ) {
             super(Defaults.NAME);
             this.indexMode = indexMode;
             this.supportsNonDefaultParameterValues = supportsCheckForNonDefaultParams == false
                 || settings.getAsBoolean(LOSSY_PARAMETERS_ALLOWED_SETTING_NAME, true);
+            this.enableRecoverySource = enableRecoverySource;
         }
 
         public Builder setSynthetic() {
@@ -186,9 +239,9 @@ public SourceFieldMapper build() {
             }
             if (isDefault()) {
                 return switch (indexMode) {
-                    case TIME_SERIES -> TSDB_DEFAULT;
-                    case LOGSDB -> LOGSDB_DEFAULT;
-                    default -> DEFAULT;
+                    case TIME_SERIES -> enableRecoverySource ? TSDB_DEFAULT : TSDB_DEFAULT_NO_RECOVERY_SOURCE;
+                    case LOGSDB -> enableRecoverySource ? LOGSDB_DEFAULT : LOGSDB_DEFAULT_NO_RECOVERY_SOURCE;
+                    default -> enableRecoverySource ? DEFAULT : DEFAULT_NO_RECOVERY_SOURCE;
                 };
             }
             if (supportsNonDefaultParameterValues == false) {
@@ -218,7 +271,8 @@ public SourceFieldMapper build() {
                 enabled.get(),
                 includes.getValue().toArray(Strings.EMPTY_ARRAY),
                 excludes.getValue().toArray(Strings.EMPTY_ARRAY),
-                indexMode
+                indexMode,
+                enableRecoverySource
             );
             if (indexMode != null) {
                 indexMode.validateSourceFieldMapper(sourceFieldMapper);
@@ -230,23 +284,25 @@ public SourceFieldMapper build() {
 
     public static final TypeParser PARSER = new ConfigurableTypeParser(c -> {
         var indexMode = c.getIndexSettings().getMode();
+        boolean enableRecoverySource = INDICES_RECOVERY_SOURCE_ENABLED_SETTING.get(c.getSettings());
         if (indexMode.isSyntheticSourceEnabled()) {
             if (indexMode == IndexMode.TIME_SERIES) {
                 if (c.getIndexSettings().getIndexVersionCreated().onOrAfter(IndexVersions.V_8_7_0)) {
-                    return TSDB_DEFAULT;
+                    return enableRecoverySource ? TSDB_DEFAULT : TSDB_DEFAULT_NO_RECOVERY_SOURCE;
                 } else {
-                    return TSDB_LEGACY_DEFAULT;
+                    return enableRecoverySource ? TSDB_LEGACY_DEFAULT : TSDB_LEGACY_DEFAULT_NO_RECOVERY_SOURCE;
                 }
             } else if (indexMode == IndexMode.LOGSDB) {
-                return LOGSDB_DEFAULT;
+                return enableRecoverySource ? LOGSDB_DEFAULT : LOGSDB_DEFAULT_NO_RECOVERY_SOURCE;
             }
         }
-        return DEFAULT;
+        return enableRecoverySource ? DEFAULT : DEFAULT_NO_RECOVERY_SOURCE;
     },
         c -> new Builder(
             c.getIndexSettings().getMode(),
             c.getSettings(),
-            c.indexVersionCreated().onOrAfter(IndexVersions.SOURCE_MAPPER_LOSSY_PARAMS_CHECK)
+            c.indexVersionCreated().onOrAfter(IndexVersions.SOURCE_MAPPER_LOSSY_PARAMS_CHECK),
+            INDICES_RECOVERY_SOURCE_ENABLED_SETTING.get(c.getSettings())
         )
     );
 
@@ -299,8 +355,16 @@ public BlockLoader blockLoader(BlockLoaderContext blContext) {
     private final SourceFilter sourceFilter;
 
     private final IndexMode indexMode;
-
-    private SourceFieldMapper(Mode mode, Explicit<Boolean> enabled, String[] includes, String[] excludes, IndexMode indexMode) {
+    private final boolean enableRecoverySource;
+
+    private SourceFieldMapper(
+        Mode mode,
+        Explicit<Boolean> enabled,
+        String[] includes,
+        String[] excludes,
+        IndexMode indexMode,
+        boolean enableRecoverySource
+    ) {
         super(new SourceFieldType((enabled.explicit() && enabled.value()) || (enabled.explicit() == false && mode != Mode.DISABLED)));
         assert enabled.explicit() == false || mode == null;
         this.mode = mode;
@@ -313,6 +377,7 @@ private SourceFieldMapper(Mode mode, Explicit<Boolean> enabled, String[] include
         }
         this.complete = stored() && sourceFilter == null;
         this.indexMode = indexMode;
+        this.enableRecoverySource = enableRecoverySource;
     }
 
     private static SourceFilter buildSourceFilter(String[] includes, String[] excludes) {
@@ -357,7 +422,7 @@ public void preParse(DocumentParserContext context) throws IOException {
             context.doc().add(new StoredField(fieldType().name(), ref.bytes, ref.offset, ref.length));
         }
 
-        if (originalSource != null && adaptedSource != originalSource) {
+        if (enableRecoverySource && originalSource != null && adaptedSource != originalSource) {
             // if we omitted source or modified it we add the _recovery_source to ensure we have it for ops based recovery
             BytesRef ref = originalSource.toBytesRef();
             context.doc().add(new StoredField(RECOVERY_SOURCE_NAME, ref.bytes, ref.offset, ref.length));
@@ -385,7 +450,7 @@ protected String contentType() {
 
     @Override
     public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(indexMode, Settings.EMPTY, false).init(this);
+        return new Builder(indexMode, Settings.EMPTY, false, enableRecoverySource).init(this);
     }
 
     /**
@@ -401,9 +466,4 @@ public SourceLoader newSourceLoader(Mapping mapping, SourceFieldMetrics metrics)
     public boolean isSynthetic() {
         return mode == Mode.SYNTHETIC;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java
index 9c98647f37bd..8c8396c7a9bb 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java
@@ -79,7 +79,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.IntPredicate;
@@ -463,7 +462,6 @@ private SubFieldInfo buildPhraseInfo(FieldType fieldType, TextFieldType parent)
 
         @Override
         public TextFieldMapper build(MapperBuilderContext context) {
-            MultiFields multiFields = multiFieldsBuilder.build(this, context);
             FieldType fieldType = TextParams.buildFieldType(
                 index,
                 store,
@@ -472,15 +470,16 @@ public TextFieldMapper build(MapperBuilderContext context) {
                 indexCreatedVersion.isLegacyIndexVersion() ? () -> false : norms,
                 termVectors
             );
-            TextFieldType tft = buildFieldType(fieldType, multiFields, context, indexCreatedVersion);
+            BuilderParams builderParams = builderParams(this, context);
+            TextFieldType tft = buildFieldType(fieldType, builderParams.multiFields(), context, indexCreatedVersion);
             SubFieldInfo phraseFieldInfo = buildPhraseInfo(fieldType, tft);
             SubFieldInfo prefixFieldInfo = buildPrefixInfo(context, fieldType, tft);
-            for (Mapper mapper : multiFields) {
+            for (Mapper mapper : builderParams.multiFields()) {
                 if (mapper.fullPath().endsWith(FAST_PHRASE_SUFFIX) || mapper.fullPath().endsWith(FAST_PREFIX_SUFFIX)) {
                     throw new MapperParsingException("Cannot use reserved field name [" + mapper.fullPath() + "]");
                 }
             }
-            return new TextFieldMapper(leafName(), fieldType, tft, prefixFieldInfo, phraseFieldInfo, multiFields, copyTo, this);
+            return new TextFieldMapper(leafName(), fieldType, tft, prefixFieldInfo, phraseFieldInfo, builderParams, this);
         }
     }
 
@@ -1215,11 +1214,10 @@ private TextFieldMapper(
         TextFieldType mappedFieldType,
         SubFieldInfo prefixFieldInfo,
         SubFieldInfo phraseFieldInfo,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, false, null);
+        super(simpleName, mappedFieldType, builderParams);
         assert mappedFieldType.getTextSearchInfo().isTokenized();
         assert mappedFieldType.hasDocValues() == false;
         if (fieldType.indexOptions() == IndexOptions.NONE && fieldType().fielddata()) {
@@ -1428,8 +1426,11 @@ protected void doXContentBody(XContentBuilder builder, Params params) throws IOE
         final Builder b = (Builder) getMergeBuilder();
         b.index.toXContent(builder, includeDefaults);
         b.store.toXContent(builder, includeDefaults);
-        this.multiFields.toXContent(builder, params);
-        this.copyTo.toXContent(builder);
+        multiFields().toXContent(builder, params);
+        copyTo().toXContent(builder);
+        if (sourceKeepMode().isPresent()) {
+            sourceKeepMode().get().toXContent(builder);
+        }
         b.meta.toXContent(builder, includeDefaults);
         b.indexOptions.toXContent(builder, includeDefaults);
         b.termVectors.toXContent(builder, includeDefaults);
@@ -1447,40 +1448,24 @@ protected void doXContentBody(XContentBuilder builder, Params params) throws IOE
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
         if (store) {
-            return new StringStoredFieldFieldLoader(fullPath(), leafName()) {
+            var loader = new StringStoredFieldFieldLoader(fullPath(), leafName()) {
                 @Override
                 protected void write(XContentBuilder b, Object value) throws IOException {
                     b.value((String) value);
                 }
             };
+
+            return new SyntheticSourceSupport.Native(loader);
         }
 
         var kwd = SyntheticSourceHelper.getKeywordFieldMapperForSyntheticSource(this);
         if (kwd != null) {
-            return kwd.syntheticFieldLoader(leafName());
+            return new SyntheticSourceSupport.Native(kwd.syntheticFieldLoader(leafName()));
         }
 
-        throw new IllegalArgumentException(
-            String.format(
-                Locale.ROOT,
-                "field [%s] of type [%s] doesn't support synthetic source unless it is stored or has a sub-field of"
-                    + " type [keyword] with doc values or stored and without a normalizer",
-                fullPath(),
-                typeName()
-            )
-        );
+        return super.syntheticSourceSupport();
     }
 
     public static class SyntheticSourceHelper {
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapper.java
index f1c6a072c2d9..0b8177b2408a 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesIdFieldMapper.java
@@ -158,11 +158,6 @@ protected String contentType() {
         return CONTENT_TYPE;
     }
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
-
     /**
      * Decode the {@code _tsid} into a human readable map.
      */
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesRoutingHashFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesRoutingHashFieldMapper.java
index b9629d756198..5b2b095c5133 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesRoutingHashFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/TimeSeriesRoutingHashFieldMapper.java
@@ -128,11 +128,6 @@ protected String contentType() {
         return NAME;
     }
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
-
     public static String encode(int routingId) {
         byte[] bytes = new byte[4];
         ByteUtils.writeIntLE(routingId, bytes, 0);
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java
index 1d4f56b02ed7..daeec320514f 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/VersionFieldMapper.java
@@ -101,9 +101,4 @@ public void postParse(DocumentParserContext context) {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java
index 3887c5a15cd5..3507db5db606 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapper.java
@@ -53,7 +53,6 @@
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.Mapper;
 import org.elasticsearch.index.mapper.MapperBuilderContext;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.StringFieldType;
 import org.elasticsearch.index.mapper.TextParams;
@@ -216,7 +215,7 @@ public FlattenedFieldMapper build(MapperBuilderContext context) {
                 eagerGlobalOrdinals.get(),
                 dimensions.get()
             );
-            return new FlattenedFieldMapper(leafName(), ft, this);
+            return new FlattenedFieldMapper(leafName(), ft, builderParams(this, context), this);
         }
     }
 
@@ -737,8 +736,8 @@ public void validateMatchedRoutingPath(final String routingPath) {
     private final FlattenedFieldParser fieldParser;
     private final Builder builder;
 
-    private FlattenedFieldMapper(String leafName, MappedFieldType mappedFieldType, Builder builder) {
-        super(leafName, mappedFieldType, MultiFields.empty(), CopyTo.empty());
+    private FlattenedFieldMapper(String leafName, MappedFieldType mappedFieldType, BuilderParams builderParams, Builder builder) {
+        super(leafName, mappedFieldType, builderParams);
         this.builder = builder;
         this.fieldParser = new FlattenedFieldParser(
             mappedFieldType.name(),
@@ -809,21 +808,13 @@ public FieldMapper.Builder getMergeBuilder() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasScript()) {
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
-        }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
         if (fieldType().hasDocValues()) {
-            return new FlattenedSortedSetDocValuesSyntheticFieldLoader(fullPath(), fullPath() + "._keyed", leafName());
+            var loader = new FlattenedSortedSetDocValuesSyntheticFieldLoader(fullPath(), fullPath() + "._keyed", leafName());
+
+            return new SyntheticSourceSupport.Native(loader);
         }
 
-        throw new IllegalArgumentException(
-            "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it doesn't have doc values"
-        );
+        return super.syntheticSourceSupport();
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java
index d56fc68dbc1c..1afd2f718daf 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java
@@ -297,10 +297,9 @@ public DenseVectorFieldMapper build(MapperBuilderContext context) {
                     indexOptions.getValue(),
                     meta.getValue()
                 ),
+                builderParams(this, context),
                 indexOptions.getValue(),
-                indexVersionCreated,
-                multiFieldsBuilder.build(this, context),
-                copyTo
+                indexVersionCreated
             );
         }
     }
@@ -1963,12 +1962,11 @@ ElementType getElementType() {
     private DenseVectorFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
+        BuilderParams params,
         IndexOptions indexOptions,
-        IndexVersion indexCreatedVersion,
-        MultiFields multiFields,
-        CopyTo copyTo
+        IndexVersion indexCreatedVersion
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+        super(simpleName, mappedFieldType, params);
         this.indexOptions = indexOptions;
         this.indexCreatedVersion = indexCreatedVersion;
     }
@@ -2015,10 +2013,9 @@ public void parse(DocumentParserContext context) throws IOException {
             Mapper update = new DenseVectorFieldMapper(
                 leafName(),
                 updatedDenseVectorFieldType,
+                builderParams,
                 indexOptions,
-                indexCreatedVersion,
-                multiFields(),
-                copyTo
+                indexCreatedVersion
             );
             context.addDynamicMapper(update);
             return;
@@ -2156,21 +2153,12 @@ public String toString() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        var loader = fieldType().indexed
+            ? new IndexedSyntheticFieldLoader(indexCreatedVersion, fieldType().similarity)
+            : new DocValuesSyntheticFieldLoader(indexCreatedVersion);
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-        if (fieldType().indexed) {
-            return new IndexedSyntheticFieldLoader(indexCreatedVersion, fieldType().similarity);
-        }
-        return new DocValuesSyntheticFieldLoader(indexCreatedVersion);
+        return new SyntheticSourceSupport.Native(loader);
     }
 
     private class IndexedSyntheticFieldLoader extends SourceLoader.DocValuesBasedSyntheticFieldLoader {
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java
index 62be6910bf6f..7155fc1161ed 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapper.java
@@ -69,8 +69,7 @@ public SparseVectorFieldMapper build(MapperBuilderContext context) {
             return new SparseVectorFieldMapper(
                 leafName(),
                 new SparseVectorFieldType(context.buildFullName(leafName()), meta.getValue()),
-                multiFieldsBuilder.build(this, context),
-                copyTo
+                builderParams(this, context)
             );
         }
     }
@@ -131,8 +130,8 @@ private static String indexedValueForSearch(Object value) {
         }
     }
 
-    private SparseVectorFieldMapper(String simpleName, MappedFieldType mappedFieldType, MultiFields multiFields, CopyTo copyTo) {
-        super(simpleName, mappedFieldType, multiFields, copyTo, false, null);
+    private SparseVectorFieldMapper(String simpleName, MappedFieldType mappedFieldType, BuilderParams builderParams) {
+        super(simpleName, mappedFieldType, builderParams);
     }
 
     @Override
@@ -178,15 +177,11 @@ public void parse(DocumentParserContext context) throws IOException {
             for (Token token = context.parser().nextToken(); token != Token.END_OBJECT; token = context.parser().nextToken()) {
                 if (token == Token.FIELD_NAME) {
                     feature = context.parser().currentName();
-                    if (feature.contains(".")) {
-                        throw new IllegalArgumentException(
-                            "[sparse_vector] fields do not support dots in feature names but found [" + feature + "]"
-                        );
-                    }
                 } else if (token == Token.VALUE_NULL) {
                     // ignore feature, this is consistent with numeric fields
                 } else if (token == Token.VALUE_NUMBER || token == Token.VALUE_STRING) {
-                    final String key = fullPath() + "." + feature;
+                    // Use a delimiter that won't collide with subfields & escape the dots in the feature name
+                    final String key = fullPath() + "\\." + feature.replace(".", "\\.");
                     float value = context.parser().floatValue(true);
 
                     // if we have an existing feature of the same name we'll select for the one with the max value
diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
index b7d1beb4d1e0..b618ca49a3a0 100644
--- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
+++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
@@ -83,6 +83,7 @@
 import org.elasticsearch.index.cache.query.TrivialQueryCachingPolicy;
 import org.elasticsearch.index.cache.request.ShardRequestCache;
 import org.elasticsearch.index.codec.CodecService;
+import org.elasticsearch.index.codec.FieldInfosWithUsages;
 import org.elasticsearch.index.engine.CommitStats;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.engine.Engine.GetResult;
@@ -1700,13 +1701,22 @@ public void setGlobalCheckpointIfUnpromotable(long globalCheckpoint) {
 
     private static final class NonClosingReaderWrapper extends FilterDirectoryReader {
 
+        private static final LeafReader[] EMPTY_LEAF_READERS = new LeafReader[0];
+
+        private static final FilterDirectoryReader.SubReaderWrapper SUB_READER_WRAPPER = new SubReaderWrapper() {
+            @Override
+            public LeafReader wrap(LeafReader reader) {
+                return reader;
+            }
+
+            @Override
+            protected LeafReader[] wrap(List<? extends LeafReader> readers) {
+                return readers.toArray(EMPTY_LEAF_READERS);
+            }
+        };
+
         private NonClosingReaderWrapper(DirectoryReader in) throws IOException {
-            super(in, new SubReaderWrapper() {
-                @Override
-                public LeafReader wrap(LeafReader reader) {
-                    return reader;
-                }
-            });
+            super(in, SUB_READER_WRAPPER);
         }
 
         @Override
@@ -4084,11 +4094,20 @@ public void afterRefresh(boolean didRefresh) {
                 try (var searcher = getEngine().acquireSearcher("shard_field_stats", Engine.SearcherScope.INTERNAL)) {
                     int numSegments = 0;
                     int totalFields = 0;
+                    long usages = 0;
                     for (LeafReaderContext leaf : searcher.getLeafContexts()) {
                         numSegments++;
-                        totalFields += leaf.reader().getFieldInfos().size();
+                        var fieldInfos = leaf.reader().getFieldInfos();
+                        totalFields += fieldInfos.size();
+                        if (fieldInfos instanceof FieldInfosWithUsages ft) {
+                            if (usages != -1) {
+                                usages += ft.getTotalUsages();
+                            }
+                        } else {
+                            usages = -1;
+                        }
                     }
-                    shardFieldStats = new ShardFieldStats(numSegments, totalFields);
+                    shardFieldStats = new ShardFieldStats(numSegments, totalFields, usages);
                 } catch (AlreadyClosedException ignored) {
 
                 }
diff --git a/server/src/main/java/org/elasticsearch/index/shard/ShardFieldStats.java b/server/src/main/java/org/elasticsearch/index/shard/ShardFieldStats.java
index 9c53abb1e95e..c2122b9f4b0a 100644
--- a/server/src/main/java/org/elasticsearch/index/shard/ShardFieldStats.java
+++ b/server/src/main/java/org/elasticsearch/index/shard/ShardFieldStats.java
@@ -14,7 +14,9 @@
  *
  * @param numSegments the number of segments
  * @param totalFields the total number of fields across the segments
+ * @param fieldUsages the number of usages for segment-level fields (e.g., doc_values, postings, norms, points)
+ *                    -1 if unavailable
  */
-public record ShardFieldStats(int numSegments, int totalFields) {
+public record ShardFieldStats(int numSegments, int totalFields, long fieldUsages) {
 
 }
diff --git a/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
index 30fbbba5ed09..90e4bc9f43bc 100644
--- a/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
+++ b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java
@@ -266,6 +266,10 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     static volatile boolean INTEGRITY_ASSERTIONS_ENABLED = true;
 
+    public static boolean areIntegrityAssertionsEnabled() {
+        return INTEGRITY_ASSERTIONS_ENABLED;
+    }
+
     public static BlobStoreIndexShardSnapshots fromXContent(XContentParser parser) throws IOException {
         XContentParser.Token token = parser.currentToken();
         if (token == null) { // New parser
diff --git a/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java
index 6ab1bb6413fa..586b1bae4cc9 100644
--- a/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java
+++ b/server/src/main/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStream.java
@@ -21,10 +21,14 @@
  * close is called before.
  */
 public abstract class SlicedInputStream extends InputStream {
-    private int slice = 0;
+    private int nextSlice = 0;
     private InputStream currentStream;
+    private int currentSliceOffset = 0;
     private final int numSlices;
+    private boolean closed = false;
     private boolean initialized = false;
+    private int markedSlice = -1;
+    private int markedSliceOffset = -1;
 
     /**
      * Creates a new SlicedInputStream
@@ -36,18 +40,23 @@ protected SlicedInputStream(final int numSlices) {
 
     private InputStream nextStream() throws IOException {
         assert initialized == false || currentStream != null;
+        assert closed == false : "attempted to get next stream when closed";
         initialized = true;
         IOUtils.close(currentStream);
-        if (slice < numSlices) {
-            currentStream = openSlice(slice++);
+        if (nextSlice < numSlices) {
+            currentStream = openSlice(nextSlice++);
         } else {
             currentStream = null;
         }
+        currentSliceOffset = 0;
         return currentStream;
     }
 
     /**
      * Called for each logical slice given a zero based slice ordinal.
+     *
+     * Note that if {@link InputStream#markSupported()} is true (can be overridden to return false), the function may be called again to
+     * open a previous slice (which must have the same size as before). The returned InputStreams do not need to support mark/reset.
      */
     protected abstract InputStream openSlice(int slice) throws IOException;
 
@@ -69,6 +78,7 @@ public final int read() throws IOException {
             nextStream();
             return read();
         }
+        currentSliceOffset++;
         return read;
     }
 
@@ -83,14 +93,22 @@ public final int read(byte[] buffer, int offset, int length) throws IOException
             nextStream();
             return read(buffer, offset, length);
         }
+        currentSliceOffset += read;
         return read;
     }
 
     @Override
-    public final void close() throws IOException {
-        IOUtils.close(currentStream);
+    public void close() throws IOException {
+        closed = true;
         initialized = true;
+        currentSliceOffset = 0;
+        final InputStream stream = currentStream;
         currentStream = null;
+        IOUtils.close(stream);
+    }
+
+    public boolean isClosed() {
+        return closed;
     }
 
     @Override
@@ -99,4 +117,47 @@ public final int available() throws IOException {
         return stream == null ? 0 : stream.available();
     }
 
+    @Override
+    public boolean markSupported() {
+        return true;
+    }
+
+    @Override
+    public void mark(int readLimit) {
+        // We ignore readLimit since openSlice() can re-open previous InputStreams, and we can skip as many bytes as we'd like.
+        // According to JDK documentation, marking a closed InputStream should have no effect.
+        if (markSupported() && isClosed() == false && numSlices > 0) {
+            if (initialized) {
+                markedSlice = nextSlice - 1;
+                markedSliceOffset = currentSliceOffset;
+            } else {
+                markedSlice = 0;
+                markedSliceOffset = 0;
+            }
+        }
+    }
+
+    @Override
+    public void reset() throws IOException {
+        if (markSupported()) {
+            if (isClosed()) {
+                throw new IOException("reset called on a closed stream");
+            } else if (numSlices > 0) {
+                if (markedSlice < 0 || markedSliceOffset < 0) {
+                    throw new IOException("Mark has not been set");
+                }
+
+                // We do not call the SlicedInputStream's skipNBytes but call skipNBytes directly on the returned stream, to ensure that
+                // the skip is performed on the marked slice and no other slices are involved. This may help uncover any bugs.
+                nextSlice = markedSlice;
+                final InputStream stream = nextStream();
+                if (stream != null) {
+                    stream.skipNBytes(markedSliceOffset);
+                }
+                currentSliceOffset = markedSliceOffset;
+            }
+        } else {
+            throw new IOException("mark/reset not supported");
+        }
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/indices/SystemIndices.java b/server/src/main/java/org/elasticsearch/indices/SystemIndices.java
index 3261ac83a7e6..bafbd57a607a 100644
--- a/server/src/main/java/org/elasticsearch/indices/SystemIndices.java
+++ b/server/src/main/java/org/elasticsearch/indices/SystemIndices.java
@@ -562,11 +562,10 @@ public static SystemIndexAccessLevel getSystemIndexAccessLevel(ThreadContext thr
         // This method intentionally cannot return BACKWARDS_COMPATIBLE_ONLY - that access level should only be used manually
         // in known special cases.
         final String headerValue = threadContext.getHeader(SYSTEM_INDEX_ACCESS_CONTROL_HEADER_KEY);
-        final String productHeaderValue = threadContext.getHeader(EXTERNAL_SYSTEM_INDEX_ACCESS_CONTROL_HEADER_KEY);
 
         final boolean allowed = Booleans.parseBoolean(headerValue, true);
         if (allowed) {
-            if (productHeaderValue != null) {
+            if (threadContext.getHeader(EXTERNAL_SYSTEM_INDEX_ACCESS_CONTROL_HEADER_KEY) != null) {
                 return SystemIndexAccessLevel.RESTRICTED;
             } else {
                 return SystemIndexAccessLevel.ALL;
diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
index 2e10a5de2d4e..df6fcf0ff7b9 100644
--- a/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
+++ b/server/src/main/java/org/elasticsearch/indices/recovery/RecoverySettings.java
@@ -29,6 +29,7 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
+import org.elasticsearch.index.mapper.SourceFieldMapper;
 import org.elasticsearch.monitor.os.OsProbe;
 import org.elasticsearch.node.NodeRoleSettings;
 
@@ -380,6 +381,16 @@ public Iterator<Setting<?>> settings() {
         Setting.Property.NodeScope
     );
 
+    /**
+     * Indicates whether the `recovery_source` should be enabled (see {@link SourceFieldMapper}).
+     * This setting is not registered and should be used exclusively in a serverless environment.
+     */
+    public static final Setting<Boolean> INDICES_RECOVERY_SOURCE_ENABLED_SETTING = Setting.boolSetting(
+        "indices.recovery.recovery_source.enabled",
+        true,
+        Property.NodeScope
+    );
+
     public static final ByteSizeValue DEFAULT_CHUNK_SIZE = new ByteSizeValue(512, ByteSizeUnit.KB);
 
     private volatile ByteSizeValue maxBytesPerSec;
diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/SnapshotFilesProvider.java b/server/src/main/java/org/elasticsearch/indices/recovery/SnapshotFilesProvider.java
index 1424ef160657..0a1bf765bc12 100644
--- a/server/src/main/java/org/elasticsearch/indices/recovery/SnapshotFilesProvider.java
+++ b/server/src/main/java/org/elasticsearch/indices/recovery/SnapshotFilesProvider.java
@@ -52,6 +52,11 @@ public InputStream getInputStreamForSnapshotFile(
                 protected InputStream openSlice(int slice) throws IOException {
                     return container.readBlob(OperationPurpose.SNAPSHOT_DATA, fileInfo.partName(slice));
                 }
+
+                @Override
+                public boolean markSupported() {
+                    return false;
+                }
             };
         }
         return blobStoreRepository.maybeRateLimitRestores(inputStream, rateLimiterListener::accept);
diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestService.java b/server/src/main/java/org/elasticsearch/ingest/IngestService.java
index 20f97e187148..c54bdbf71a38 100644
--- a/server/src/main/java/org/elasticsearch/ingest/IngestService.java
+++ b/server/src/main/java/org/elasticsearch/ingest/IngestService.java
@@ -323,18 +323,11 @@ public void delete(DeletePipelineRequest request, ActionListener<AcknowledgedRes
     public static class DeletePipelineClusterStateUpdateTask extends PipelineClusterStateUpdateTask {
         private final DeletePipelineRequest request;
 
-        DeletePipelineClusterStateUpdateTask(ActionListener<AcknowledgedResponse> listener, DeletePipelineRequest request) {
+        public DeletePipelineClusterStateUpdateTask(ActionListener<AcknowledgedResponse> listener, DeletePipelineRequest request) {
             super(listener);
             this.request = request;
         }
 
-        /**
-         * Used by the {@link org.elasticsearch.action.ingest.ReservedPipelineAction}
-         */
-        public DeletePipelineClusterStateUpdateTask(String id) {
-            this(null, new DeletePipelineRequest(id));
-        }
-
         @Override
         public IngestMetadata execute(IngestMetadata currentIngestMetadata, Collection<IndexMetadata> allIndexMetadata) {
             if (currentIngestMetadata == null) {
diff --git a/server/src/main/java/org/elasticsearch/node/NodeConstruction.java b/server/src/main/java/org/elasticsearch/node/NodeConstruction.java
index eb9ef08b329a..ea53882a22a0 100644
--- a/server/src/main/java/org/elasticsearch/node/NodeConstruction.java
+++ b/server/src/main/java/org/elasticsearch/node/NodeConstruction.java
@@ -855,7 +855,8 @@ private void construct(
             featureService,
             systemIndices,
             dataStreamGlobalRetentionSettings,
-            documentParsingProvider
+            documentParsingProvider,
+            taskManager
         );
 
         Collection<?> pluginComponents = pluginsService.flatMap(plugin -> {
diff --git a/server/src/main/java/org/elasticsearch/node/PluginServiceInstances.java b/server/src/main/java/org/elasticsearch/node/PluginServiceInstances.java
index 7c8775502fd6..74ae5936c960 100644
--- a/server/src/main/java/org/elasticsearch/node/PluginServiceInstances.java
+++ b/server/src/main/java/org/elasticsearch/node/PluginServiceInstances.java
@@ -24,6 +24,7 @@
 import org.elasticsearch.plugins.internal.DocumentParsingProvider;
 import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.tasks.TaskManager;
 import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.watcher.ResourceWatcherService;
@@ -48,5 +49,6 @@ public record PluginServiceInstances(
     FeatureService featureService,
     SystemIndices systemIndices,
     DataStreamGlobalRetentionSettings dataStreamGlobalRetentionSettings,
-    DocumentParsingProvider documentParsingProvider
+    DocumentParsingProvider documentParsingProvider,
+    TaskManager taskManager
 ) implements Plugin.PluginServices {}
diff --git a/server/src/main/java/org/elasticsearch/plugins/Plugin.java b/server/src/main/java/org/elasticsearch/plugins/Plugin.java
index a8bfda54b064..4441ecadc3e8 100644
--- a/server/src/main/java/org/elasticsearch/plugins/Plugin.java
+++ b/server/src/main/java/org/elasticsearch/plugins/Plugin.java
@@ -31,6 +31,7 @@
 import org.elasticsearch.plugins.internal.DocumentParsingProvider;
 import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.tasks.TaskManager;
 import org.elasticsearch.telemetry.TelemetryProvider;
 import org.elasticsearch.threadpool.ExecutorBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -165,6 +166,12 @@ public interface PluginServices {
          * A provider of utilities to observe and report parsing of documents
          */
         DocumentParsingProvider documentParsingProvider();
+
+        /**
+         * The task manager for the node. This should only be used by plugins
+         * to track task removal by registering a RemovedTaskListener.
+         */
+        TaskManager taskManager();
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/repositories/RepositoryData.java b/server/src/main/java/org/elasticsearch/repositories/RepositoryData.java
index c6494eca9823..72376d5b20fd 100644
--- a/server/src/main/java/org/elasticsearch/repositories/RepositoryData.java
+++ b/server/src/main/java/org/elasticsearch/repositories/RepositoryData.java
@@ -281,6 +281,13 @@ public Collection<SnapshotId> getSnapshotIds() {
         return snapshotIds.values();
     }
 
+    /**
+     * @return the number of index snapshots (i.e. the sum of the index count of each snapshot)
+     */
+    public long getIndexSnapshotCount() {
+        return indexSnapshots.values().stream().mapToLong(List::size).sum();
+    }
+
     /**
      * @return whether some of the {@link SnapshotDetails} of the given snapshot are missing, due to BwC, so that they must be loaded from
      * the {@link SnapshotInfo} blob instead.
diff --git a/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
index cc56e940530e..43af0a970857 100644
--- a/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
+++ b/server/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreRepository.java
@@ -172,6 +172,7 @@
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.InflaterInputStream;
 
+import static org.elasticsearch.common.blobstore.OperationPurpose.SNAPSHOT_METADATA;
 import static org.elasticsearch.core.Strings.format;
 import static org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo;
 import static org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo.canonicalName;
@@ -199,26 +200,79 @@ public abstract class BlobStoreRepository extends AbstractLifecycleComponent imp
     public static final String STATELESS_CLUSTER_STATE_READ_WRITE_THREAD_NAME = "stateless_cluster_state";
     public static final String STATELESS_SHARD_PREWARMING_THREAD_NAME = "stateless_prewarm";
 
-    public static final String SNAPSHOT_PREFIX = "snap-";
-
+    /**
+     * Prefix for the name of the root {@link RepositoryData} blob.
+     * @see #getRepositoryDataBlobName
+     */
     public static final String INDEX_FILE_PREFIX = "index-";
 
+    /**
+     * Name of the blob which points to the root {@link RepositoryData} blob.
+     * @see #supportURLRepo()
+     */
     public static final String INDEX_LATEST_BLOB = "index.latest";
 
     private static final String TESTS_FILE = "tests-";
 
+    /**
+     * Name prefix for the blobs that hold the global {@link Metadata} for each snapshot, and the {@link IndexMetadata} for its indices.
+     * @see #METADATA_NAME_FORMAT
+     */
     public static final String METADATA_PREFIX = "meta-";
 
-    public static final String METADATA_NAME_FORMAT = METADATA_PREFIX + "%s.dat";
+    /**
+     * Name prefix for the blobs that hold top-level {@link SnapshotInfo} and shard-level {@link BlobStoreIndexShardSnapshot} metadata.
+     * @see #SNAPSHOT_NAME_FORMAT
+     */
+    public static final String SNAPSHOT_PREFIX = "snap-";
+
+    /**
+     * Name suffix for all {@code meta-*.dat} and {@code snap-*.dat} blobs.
+     * @see #METADATA_NAME_FORMAT
+     * @see #SNAPSHOT_NAME_FORMAT
+     */
+    public static final String METADATA_BLOB_NAME_SUFFIX = ".dat";
+
+    /**
+     * Blob name format for global {@link Metadata} and {@link IndexMetadata} blobs.
+     * @see #GLOBAL_METADATA_FORMAT
+     * @see #INDEX_METADATA_FORMAT
+     */
+    public static final String METADATA_NAME_FORMAT = METADATA_PREFIX + "%s" + METADATA_BLOB_NAME_SUFFIX;
 
-    public static final String SNAPSHOT_NAME_FORMAT = SNAPSHOT_PREFIX + "%s.dat";
+    /**
+     * Blob name format for top-level {@link SnapshotInfo} and shard-level {@link BlobStoreIndexShardSnapshot} blobs.
+     * @see #SNAPSHOT_FORMAT
+     * @see #INDEX_SHARD_SNAPSHOT_FORMAT
+     */
+    public static final String SNAPSHOT_NAME_FORMAT = SNAPSHOT_PREFIX + "%s" + METADATA_BLOB_NAME_SUFFIX;
 
-    private static final String SNAPSHOT_INDEX_PREFIX = "index-";
+    /**
+     * Name prefix for shard-level {@link BlobStoreIndexShardSnapshots} blobs.
+     * @see #SNAPSHOT_INDEX_NAME_FORMAT
+     * @see #INDEX_SHARD_SNAPSHOTS_FORMAT
+     */
+    public static final String SNAPSHOT_INDEX_PREFIX = "index-";
 
+    /**
+     * Name format for shard-level {@link BlobStoreIndexShardSnapshots} blobs.
+     * @see #INDEX_SHARD_SNAPSHOTS_FORMAT
+     */
     public static final String SNAPSHOT_INDEX_NAME_FORMAT = SNAPSHOT_INDEX_PREFIX + "%s";
 
+    /**
+     * Name prefix for blobs holding the actual shard data.
+     */
     public static final String UPLOADED_DATA_BLOB_PREFIX = "__";
 
+    /**
+     * @param repositoryGeneration The numeric generation of the {@link RepositoryData} blob.
+     * @return The name of the blob holding the corresponding {@link RepositoryData}.
+     */
+    public static String getRepositoryDataBlobName(long repositoryGeneration) {
+        return INDEX_FILE_PREFIX + repositoryGeneration;
+    }
+
     // Expose a copy of URLRepository#TYPE here too, for a better error message until https://github.com/elastic/elasticsearch/issues/68918
     // is resolved.
     public static final String URL_REPOSITORY_TYPE = "url";
@@ -533,7 +587,7 @@ public void cloneShardSnapshot(
             final ShardGeneration existingShardGen;
             if (shardGeneration == null) {
                 Tuple<BlobStoreIndexShardSnapshots, Long> tuple = buildBlobStoreIndexShardSnapshots(
-                    shardContainer.listBlobsByPrefix(OperationPurpose.SNAPSHOT_METADATA, INDEX_FILE_PREFIX).keySet(),
+                    shardContainer.listBlobsByPrefix(OperationPurpose.SNAPSHOT_METADATA, SNAPSHOT_INDEX_PREFIX).keySet(),
                     shardContainer
                 );
                 existingShardGen = new ShardGeneration(tuple.v2());
@@ -541,7 +595,7 @@ public void cloneShardSnapshot(
                 existingSnapshots = tuple.v1();
             } else {
                 newGen = ShardGeneration.newGeneration();
-                existingSnapshots = buildBlobStoreIndexShardSnapshots(Collections.emptySet(), shardContainer, shardGeneration).v1();
+                existingSnapshots = buildBlobStoreIndexShardSnapshots(index, Collections.emptySet(), shardContainer, shardGeneration).v1();
                 existingShardGen = shardGeneration;
             }
             SnapshotFiles existingTargetFiles = null;
@@ -1253,6 +1307,7 @@ protected void doRun() throws Exception {
                     if (useShardGenerations) {
                         newGen = -1L;
                         blobStoreIndexShardSnapshots = buildBlobStoreIndexShardSnapshots(
+                            indexId,
                             originalShardBlobs,
                             shardContainer,
                             originalRepositoryData.shardGenerations().getShardGen(indexId, shardId)
@@ -1331,9 +1386,9 @@ private static List<String> unusedBlobs(
                         .filter(
                             blob -> blob.startsWith(SNAPSHOT_INDEX_PREFIX)
                                 || (blob.startsWith(SNAPSHOT_PREFIX)
-                                    && blob.endsWith(".dat")
+                                    && blob.endsWith(METADATA_BLOB_NAME_SUFFIX)
                                     && survivingSnapshotUUIDs.contains(
-                                        blob.substring(SNAPSHOT_PREFIX.length(), blob.length() - ".dat".length())
+                                        blob.substring(SNAPSHOT_PREFIX.length(), blob.length() - METADATA_BLOB_NAME_SUFFIX.length())
                                     ) == false)
                                 || (blob.startsWith(UPLOADED_DATA_BLOB_PREFIX)
                                     && updatedSnapshots.findNameFile(canonicalName(blob)) == null)
@@ -1486,13 +1541,13 @@ private static List<String> staleRootBlobs(RepositoryData newRepositoryData, Set
                 if (FsBlobContainer.isTempBlobName(blob)) {
                     return true;
                 }
-                if (blob.endsWith(".dat")) {
+                if (blob.endsWith(METADATA_BLOB_NAME_SUFFIX)) {
                     final String foundUUID;
                     if (blob.startsWith(SNAPSHOT_PREFIX)) {
-                        foundUUID = blob.substring(SNAPSHOT_PREFIX.length(), blob.length() - ".dat".length());
+                        foundUUID = blob.substring(SNAPSHOT_PREFIX.length(), blob.length() - METADATA_BLOB_NAME_SUFFIX.length());
                         assert SNAPSHOT_FORMAT.blobName(foundUUID).equals(blob);
                     } else if (blob.startsWith(METADATA_PREFIX)) {
-                        foundUUID = blob.substring(METADATA_PREFIX.length(), blob.length() - ".dat".length());
+                        foundUUID = blob.substring(METADATA_PREFIX.length(), blob.length() - METADATA_BLOB_NAME_SUFFIX.length());
                         assert GLOBAL_METADATA_FORMAT.blobName(foundUUID).equals(blob);
                     } else {
                         return false;
@@ -1525,7 +1580,7 @@ private void logStaleRootLevelBlobs(
                         snapshotId -> Stream.of(
                             GLOBAL_METADATA_FORMAT.blobName(snapshotId.getUUID()),
                             SNAPSHOT_FORMAT.blobName(snapshotId.getUUID()),
-                            INDEX_FILE_PREFIX + newestStaleRepositoryDataGeneration
+                            getRepositoryDataBlobName(newestStaleRepositoryDataGeneration)
                         )
                     )
                     .collect(Collectors.toSet());
@@ -1849,7 +1904,7 @@ private void cleanupOldMetadata(
             Math.max(existingRepositoryData.getGenId() - 1, 0),
             newRepoGeneration - 1000
         ); gen < newRepoGeneration; gen++) {
-            toDelete.add(INDEX_FILE_PREFIX + gen);
+            toDelete.add(getRepositoryDataBlobName(gen));
         }
         if (writeShardGenerations) {
             final int prefixPathLen = basePath().buildAsString().length();
@@ -1858,15 +1913,15 @@ private void cleanupOldMetadata(
                 .forEach(
                     (indexId, gens) -> gens.forEach(
                         (shardId, oldGen) -> toDelete.add(
-                            shardPath(indexId, shardId).buildAsString().substring(prefixPathLen) + INDEX_FILE_PREFIX + oldGen
-                                .getGenerationUUID()
+                            shardPath(indexId, shardId).buildAsString().substring(prefixPathLen) + BlobStoreRepository.SNAPSHOT_INDEX_PREFIX
+                                + oldGen.getGenerationUUID()
                         )
                     )
                 );
             for (Map.Entry<RepositoryShardId, Set<ShardGeneration>> obsoleteEntry : finalizeSnapshotContext.obsoleteShardGenerations()
                 .entrySet()) {
                 final String containerPath = shardPath(obsoleteEntry.getKey().index(), obsoleteEntry.getKey().shardId()).buildAsString()
-                    .substring(prefixPathLen) + INDEX_FILE_PREFIX;
+                    .substring(prefixPathLen) + SNAPSHOT_INDEX_PREFIX;
                 for (ShardGeneration shardGeneration : obsoleteEntry.getValue()) {
                     toDelete.add(containerPath + shardGeneration);
                 }
@@ -2565,11 +2620,11 @@ private RepositoryData getRepositoryData(long indexGen) {
             return RepositoryData.EMPTY;
         }
         try {
-            final String snapshotsIndexBlobName = INDEX_FILE_PREFIX + Long.toString(indexGen);
+            final var repositoryDataBlobName = getRepositoryDataBlobName(indexGen);
 
             // EMPTY is safe here because RepositoryData#fromXContent calls namedObject
             try (
-                InputStream blob = blobContainer().readBlob(OperationPurpose.SNAPSHOT_METADATA, snapshotsIndexBlobName);
+                InputStream blob = blobContainer().readBlob(OperationPurpose.SNAPSHOT_METADATA, repositoryDataBlobName);
                 XContentParser parser = XContentType.JSON.xContent()
                     .createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, blob)
             ) {
@@ -2795,7 +2850,7 @@ public void onFailure(Exception e) {
             if (ensureSafeGenerationExists(expectedGen, delegate::onFailure) == false) {
                 return;
             }
-            final String indexBlob = INDEX_FILE_PREFIX + newGen;
+            final String indexBlob = getRepositoryDataBlobName(newGen);
             logger.debug("Repository [{}] writing new index generational blob [{}]", metadata.name(), indexBlob);
             writeAtomic(OperationPurpose.SNAPSHOT_METADATA, blobContainer(), indexBlob, out -> {
                 try (XContentBuilder xContentBuilder = XContentFactory.jsonBuilder(org.elasticsearch.core.Streams.noCloseStream(out))) {
@@ -2936,7 +2991,7 @@ private void maybeWriteIndexLatest(long newGen) {
     private boolean ensureSafeGenerationExists(long safeGeneration, Consumer<Exception> onFailure) throws IOException {
         logger.debug("Ensure generation [{}] that is the basis for this write exists in [{}]", safeGeneration, metadata.name());
         if (safeGeneration != RepositoryData.EMPTY_REPO_GEN
-            && blobContainer().blobExists(OperationPurpose.SNAPSHOT_METADATA, INDEX_FILE_PREFIX + safeGeneration) == false) {
+            && blobContainer().blobExists(SNAPSHOT_METADATA, getRepositoryDataBlobName(safeGeneration)) == false) {
             Tuple<Long, String> previousWriterInfo = null;
             Exception readRepoDataEx = null;
             try {
@@ -3136,16 +3191,17 @@ private void doSnapshotShard(SnapshotShardContext context) {
             if (generation == null) {
                 snapshotStatus.ensureNotAborted();
                 try {
-                    blobs = shardContainer.listBlobsByPrefix(OperationPurpose.SNAPSHOT_METADATA, INDEX_FILE_PREFIX).keySet();
+                    blobs = shardContainer.listBlobsByPrefix(OperationPurpose.SNAPSHOT_METADATA, SNAPSHOT_INDEX_PREFIX).keySet();
                 } catch (IOException e) {
                     throw new IndexShardSnapshotFailedException(shardId, "failed to list blobs", e);
                 }
             } else {
-                blobs = Collections.singleton(INDEX_FILE_PREFIX + generation);
+                blobs = Collections.singleton(SNAPSHOT_INDEX_PREFIX + generation);
             }
 
             snapshotStatus.ensureNotAborted();
             Tuple<BlobStoreIndexShardSnapshots, ShardGeneration> tuple = buildBlobStoreIndexShardSnapshots(
+                context.indexId(),
                 blobs,
                 shardContainer,
                 generation
@@ -3550,6 +3606,11 @@ protected InputStream openSlice(int slice) throws IOException {
                                     ensureNotClosing(store);
                                     return container.readBlob(OperationPurpose.SNAPSHOT_DATA, fileInfo.partName(slice));
                                 }
+
+                                @Override
+                                public boolean markSupported() {
+                                    return false;
+                                }
                             })) {
                                 final byte[] buffer = new byte[Math.toIntExact(Math.min(bufferSize, fileInfo.length()))];
                                 int length;
@@ -3689,7 +3750,7 @@ public void verify(String seed, DiscoveryNode localNode) {
             try {
                 testBlobContainer.writeBlob(
                     OperationPurpose.SNAPSHOT_METADATA,
-                    "data-" + localNode.getId() + ".dat",
+                    "data-" + localNode.getId() + METADATA_BLOB_NAME_SUFFIX,
                     new BytesArray(seed),
                     true
                 );
@@ -3783,16 +3844,17 @@ public BlobStoreIndexShardSnapshots getBlobStoreIndexShardSnapshots(IndexId inde
 
         Set<String> blobs = Collections.emptySet();
         if (shardGen == null) {
-            blobs = shardContainer.listBlobsByPrefix(OperationPurpose.SNAPSHOT_METADATA, INDEX_FILE_PREFIX).keySet();
+            blobs = shardContainer.listBlobsByPrefix(OperationPurpose.SNAPSHOT_METADATA, SNAPSHOT_INDEX_PREFIX).keySet();
         }
 
-        return buildBlobStoreIndexShardSnapshots(blobs, shardContainer, shardGen).v1();
+        return buildBlobStoreIndexShardSnapshots(indexId, blobs, shardContainer, shardGen).v1();
     }
 
     /**
      * Loads all available snapshots in the repository using the given {@code generation} or falling back to trying to determine it from
      * the given list of blobs in the shard container.
      *
+     * @param indexId    {@link IndexId} identifying the corresponding index
      * @param blobs      list of blobs in repository
      * @param generation shard generation or {@code null} in case there was no shard generation tracked in the {@link RepositoryData} for
      *                   this shard because its snapshot was created in a version older than
@@ -3800,6 +3862,7 @@ public BlobStoreIndexShardSnapshots getBlobStoreIndexShardSnapshots(IndexId inde
      * @return tuple of BlobStoreIndexShardSnapshots and the last snapshot index generation
      */
     private Tuple<BlobStoreIndexShardSnapshots, ShardGeneration> buildBlobStoreIndexShardSnapshots(
+        IndexId indexId,
         Set<String> blobs,
         BlobContainer shardContainer,
         @Nullable ShardGeneration generation
@@ -3808,13 +3871,95 @@ private Tuple<BlobStoreIndexShardSnapshots, ShardGeneration> buildBlobStoreIndex
             if (generation.equals(ShardGenerations.NEW_SHARD_GEN)) {
                 return new Tuple<>(BlobStoreIndexShardSnapshots.EMPTY, ShardGenerations.NEW_SHARD_GEN);
             }
-            return new Tuple<>(
-                INDEX_SHARD_SNAPSHOTS_FORMAT.read(metadata.name(), shardContainer, generation.getGenerationUUID(), namedXContentRegistry),
-                generation
-            );
+            try {
+                return new Tuple<>(
+                    INDEX_SHARD_SNAPSHOTS_FORMAT.read(
+                        metadata.name(),
+                        shardContainer,
+                        generation.getGenerationUUID(),
+                        namedXContentRegistry
+                    ),
+                    generation
+                );
+            } catch (NoSuchFileException noSuchFileException) {
+                // This shouldn't happen (absent an external force deleting blobs from the repo) but in practice we've found bugs in the way
+                // we manipulate shard generation UUIDs under concurrent snapshot load which can lead to incorrectly deleting a referenced
+                // shard-level `index-UUID` blob during finalization. We definitely want to treat this as a test failure (see the `assert`
+                // below), but in production it is rather poor UX to leave this shard in a state where it permanently cannot take any new
+                // snapshots. Especially if we got into this state because of a bug. Thus we fall back to reconstructing the contents of the
+                // missing blob from all available shard-level snapshot metadata blobs.
+                //
+                // Note that if a shard-level snapshot metadata blob is also missing when executing this fallback then we'll lose track of,
+                // and eventually delete, the corresponding data blobs. We haven't seen any bugs that can lead to missing shard-level
+                // metadata blobs, and any such bug would prevent the shard snapshot from being restored anyway so there's no point in
+                // keeping hold of its data blobs.
+                try {
+                    final var message = Strings.format(
+                        "index %s shard generation [%s] in [%s][%s] not found - falling back to reading all shard snapshots",
+                        indexId,
+                        generation,
+                        metadata.name(),
+                        shardContainer.path()
+                    );
+                    logger.error(message, noSuchFileException);
+                    assert BlobStoreIndexShardSnapshots.areIntegrityAssertionsEnabled() == false
+                        : new AssertionError(message, noSuchFileException);
+
+                    final var shardSnapshotBlobs = shardContainer.listBlobsByPrefix(OperationPurpose.SNAPSHOT_METADATA, SNAPSHOT_PREFIX);
+                    var blobStoreIndexShardSnapshots = BlobStoreIndexShardSnapshots.EMPTY;
+                    final var messageBuilder = new StringBuilder();
+                    final var shardSnapshotBlobNameLengthBeforeExt = SNAPSHOT_PREFIX.length() + UUIDs.RANDOM_BASED_UUID_STRING_LENGTH;
+                    final var shardSnapshotBlobNameLength = shardSnapshotBlobNameLengthBeforeExt + METADATA_BLOB_NAME_SUFFIX.length();
+                    for (final var shardSnapshotBlobName : shardSnapshotBlobs.keySet()) {
+                        if (shardSnapshotBlobName.startsWith(SNAPSHOT_PREFIX)
+                            && shardSnapshotBlobName.endsWith(METADATA_BLOB_NAME_SUFFIX)
+                            && shardSnapshotBlobName.length() == shardSnapshotBlobNameLength) {
+                            final var shardSnapshot = INDEX_SHARD_SNAPSHOT_FORMAT.read(
+                                metadata.name(),
+                                shardContainer,
+                                shardSnapshotBlobName.substring(SNAPSHOT_PREFIX.length(), shardSnapshotBlobNameLengthBeforeExt),
+                                namedXContentRegistry
+                            );
+                            blobStoreIndexShardSnapshots = blobStoreIndexShardSnapshots.withAddedSnapshot(
+                                new SnapshotFiles(shardSnapshot.snapshot(), shardSnapshot.indexFiles(), null)
+                            );
+                            if (messageBuilder.length() > 0) {
+                                messageBuilder.append(", ");
+                            }
+                            messageBuilder.append(shardSnapshotBlobName);
+                        } else {
+                            throw new IllegalStateException(
+                                Strings.format(
+                                    "unexpected shard snapshot blob [%s] found in [%s][%s]",
+                                    shardSnapshotBlobName,
+                                    metadata.name(),
+                                    shardContainer.path()
+                                )
+                            );
+                        }
+                    }
+                    logger.error(
+                        "read shard snapshots [{}] due to missing shard generation [{}] for index {} in [{}][{}]",
+                        messageBuilder,
+                        generation,
+                        indexId,
+                        metadata.name(),
+                        shardContainer.path()
+                    );
+                    return new Tuple<>(blobStoreIndexShardSnapshots, generation);
+                } catch (Exception fallbackException) {
+                    logger.error(
+                        Strings.format("failed while reading all shard snapshots from [%s][%s]", metadata.name(), shardContainer.path()),
+                        fallbackException
+                    );
+                    noSuchFileException.addSuppressed(fallbackException);
+                    throw noSuchFileException;
+                }
+            }
+        } else {
+            final Tuple<BlobStoreIndexShardSnapshots, Long> legacyIndex = buildBlobStoreIndexShardSnapshots(blobs, shardContainer);
+            return new Tuple<>(legacyIndex.v1(), new ShardGeneration(legacyIndex.v2()));
         }
-        final Tuple<BlobStoreIndexShardSnapshots, Long> legacyIndex = buildBlobStoreIndexShardSnapshots(blobs, shardContainer);
-        return new Tuple<>(legacyIndex.v1(), new ShardGeneration(legacyIndex.v2()));
     }
 
     /**
@@ -3835,7 +3980,9 @@ private Tuple<BlobStoreIndexShardSnapshots, Long> buildBlobStoreIndexShardSnapsh
             );
             return new Tuple<>(shardSnapshots, latest);
         } else if (blobs.stream()
-            .anyMatch(b -> b.startsWith(SNAPSHOT_PREFIX) || b.startsWith(INDEX_FILE_PREFIX) || b.startsWith(UPLOADED_DATA_BLOB_PREFIX))) {
+            .anyMatch(
+                b -> b.startsWith(SNAPSHOT_PREFIX) || b.startsWith(SNAPSHOT_INDEX_PREFIX) || b.startsWith(UPLOADED_DATA_BLOB_PREFIX)
+            )) {
                 logger.warn(
                     "Could not find a readable index-N file in a non-empty shard snapshot directory [" + shardContainer.path() + "]"
                 );
diff --git a/server/src/main/java/org/elasticsearch/reservedstate/action/ReservedClusterSettingsAction.java b/server/src/main/java/org/elasticsearch/reservedstate/action/ReservedClusterSettingsAction.java
index 5bead071cb4b..ebc0d5cdf50e 100644
--- a/server/src/main/java/org/elasticsearch/reservedstate/action/ReservedClusterSettingsAction.java
+++ b/server/src/main/java/org/elasticsearch/reservedstate/action/ReservedClusterSettingsAction.java
@@ -14,6 +14,7 @@
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsUpdater;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.reservedstate.ReservedClusterStateHandler;
 import org.elasticsearch.reservedstate.TransformState;
 import org.elasticsearch.xcontent.XContentParser;
@@ -58,7 +59,11 @@ private static ClusterUpdateSettingsRequest prepare(Object input, Set<String> pr
         toDelete.removeAll(newSettings.keys());
         toDelete.forEach(k -> newSettings.put(k, (String) null));
 
-        final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest();
+        final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest(
+            // timeouts are unused, any value will do
+            TimeValue.THIRTY_SECONDS,
+            TimeValue.THIRTY_SECONDS
+        );
         clusterUpdateSettingsRequest.persistentSettings(newSettings);
         return clusterUpdateSettingsRequest;
     }
diff --git a/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java b/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java
index a17bc885f6b6..6a45d1e5dc43 100644
--- a/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java
+++ b/server/src/main/java/org/elasticsearch/rest/BaseRestHandler.java
@@ -83,7 +83,14 @@ public final void handleRequest(RestRequest request, RestChannel channel, NodeCl
         // check if the query has any parameters that are not in the supported set (if declared)
         Set<String> supported = allSupportedParameters();
         if (supported != null) {
-            var allSupported = Sets.union(RestResponse.RESPONSE_PARAMS, ALWAYS_SUPPORTED, supported);
+            var allSupported = Sets.union(
+                RestResponse.RESPONSE_PARAMS,
+                ALWAYS_SUPPORTED,
+                // these internal parameters cannot be set by end-users, but are used by Elasticsearch internally.
+                // they must be accepted by all handlers
+                RestRequest.INTERNAL_MARKER_REQUEST_PARAMETERS,
+                supported
+            );
             if (allSupported.containsAll(request.params().keySet()) == false) {
                 Set<String> unsupported = Sets.difference(request.params().keySet(), allSupported);
                 throw new IllegalArgumentException(unrecognized(request, unsupported, allSupported, "parameter"));
diff --git a/server/src/main/java/org/elasticsearch/rest/RestCompatibleVersionHelper.java b/server/src/main/java/org/elasticsearch/rest/RestCompatibleVersionHelper.java
index ca574a5c7eba..a71394aaaf39 100644
--- a/server/src/main/java/org/elasticsearch/rest/RestCompatibleVersionHelper.java
+++ b/server/src/main/java/org/elasticsearch/rest/RestCompatibleVersionHelper.java
@@ -10,6 +10,7 @@
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.RestApiVersion;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.xcontent.MediaType;
 import org.elasticsearch.xcontent.ParsedMediaType;
 
@@ -25,6 +26,7 @@ class RestCompatibleVersionHelper {
     /**
      * @return The requested API version, or {@link Optional#empty()} if there was no explicit version in the request.
      */
+    @UpdateForV9
     static Optional<RestApiVersion> getCompatibleVersion(
         @Nullable ParsedMediaType acceptHeader,
         @Nullable ParsedMediaType contentTypeHeader,
@@ -49,7 +51,8 @@ static Optional<RestApiVersion> getCompatibleVersion(
         if (hasContent) {
 
             // content-type version must be current or prior
-            if (contentTypeVersion > RestApiVersion.current().major || contentTypeVersion < RestApiVersion.minimumSupported().major) {
+            // This can be uncommented once all references to RestApiVersion.V_7 are removed
+            /*if (contentTypeVersion > RestApiVersion.current().major || contentTypeVersion < RestApiVersion.minimumSupported().major) {
                 throw new ElasticsearchStatusException(
                     "Content-Type version must be either version {} or {}, but found {}. Content-Type={}",
                     RestStatus.BAD_REQUEST,
@@ -58,7 +61,7 @@ static Optional<RestApiVersion> getCompatibleVersion(
                     contentTypeVersion,
                     contentTypeHeader
                 );
-            }
+            }*/
             // if both accept and content-type are sent, the version must match
             if (contentTypeVersion != acceptVersion) {
                 throw new ElasticsearchStatusException(
diff --git a/server/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java
index 8592888d2dd0..8e9cbd686110 100644
--- a/server/src/main/java/org/elasticsearch/rest/RestController.java
+++ b/server/src/main/java/org/elasticsearch/rest/RestController.java
@@ -480,6 +480,14 @@ private void dispatchRequest(
             } else {
                 threadContext.putHeader(SYSTEM_INDEX_ACCESS_CONTROL_HEADER_KEY, Boolean.TRUE.toString());
             }
+
+            if (apiProtections.isEnabled()) {
+                // API protections are only enabled in serverless; therefore we can use this as an indicator to mark the
+                // request as a serverless mode request here, so downstream handlers can use the marker
+                request.markAsServerlessRequest();
+                logger.trace("Marked request for uri [{}] as serverless request", request.uri());
+            }
+
             final var finalChannel = responseChannel;
             this.interceptor.intercept(request, responseChannel, handler.getConcreteRestHandler(), new ActionListener<>() {
                 @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/RestRequest.java b/server/src/main/java/org/elasticsearch/rest/RestRequest.java
index 66ba0c743813..fb4ebe3aa586 100644
--- a/server/src/main/java/org/elasticsearch/rest/RestRequest.java
+++ b/server/src/main/java/org/elasticsearch/rest/RestRequest.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.unit.ByteSizeValue;
@@ -48,7 +49,31 @@
 
 public class RestRequest implements ToXContent.Params, Traceable {
 
-    public static final String PATH_RESTRICTED = "pathRestricted";
+    /**
+     * Internal marker request parameter to indicate that a request was made in serverless mode. Use this parameter, together with
+     * {@link #OPERATOR_REQUEST} if you need to toggle behavior for serverless, for example to enforce partial API restrictions
+     * (prevent request fields, omit response fields) for an API.
+     * Requests not made in serverless mode, will *not* have this parameter set.
+     * Given a request instance, you can use {@link #isServerlessRequest()} to determine if the parameter is set or not.
+     * This is also available from {@code ToXContent.Params}. For example:
+     * {@code params.paramAsBoolean(RestRequest.SERVERLESS_REQUEST, false)}
+     */
+    public static final String SERVERLESS_REQUEST = "serverlessRequest";
+    /**
+     * Internal marker request parameter to indicate that a request was made by an operator user.
+     * Requests made by regular users (users without operator privileges), will *not* have this parameter set.
+     * Given a request instance, you can use {@link #isOperatorRequest()} to determine if the parameter is set or not.
+     * This is also available from {@code ToXContent.Params}. For example:
+     * {@code params.paramAsBoolean(RestRequest.OPERATOR_REQUEST, false)}
+     */
+    public static final String OPERATOR_REQUEST = "operatorRequest";
+
+    /**
+     * Internal request parameters used as markers to indicate various operations modes such as serverless mode, or operator mode.
+     * These can never be set directly by end-users. Instead, they are set internally by Elasticsearch and must be supported by all
+     * request handlers.
+     */
+    public static final Set<String> INTERNAL_MARKER_REQUEST_PARAMETERS = Set.of(SERVERLESS_REQUEST, OPERATOR_REQUEST);
     // tchar pattern as defined by RFC7230 section 3.2.6
     private static final Pattern TCHAR_PATTERN = Pattern.compile("[a-zA-Z0-9!#$%&'*+\\-.\\^_`|~]+");
 
@@ -297,11 +322,17 @@ public final BytesReference requiredContent() {
         if (hasContent() == false) {
             throw new ElasticsearchParseException("request body is required");
         } else if (xContentType.get() == null) {
-            throw new IllegalStateException("unknown content type");
+            throwValidationException("unknown content type");
         }
         return content();
     }
 
+    private static void throwValidationException(String msg) {
+        ValidationException unknownContentType = new ValidationException();
+        unknownContentType.addValidationError(msg);
+        throw unknownContentType;
+    }
+
     /**
      * Get the value of the header or {@code null} if not found. This method only retrieves the first header value if multiple values are
      * sent. Use of {@link #getAllHeaderValues(String)} should be preferred
@@ -561,12 +592,12 @@ public final Tuple<XContentType, BytesReference> contentOrSourceParam() {
         String source = param("source");
         String typeParam = param("source_content_type");
         if (source == null || typeParam == null) {
-            throw new IllegalStateException("source and source_content_type parameters are required");
+            throwValidationException("source and source_content_type parameters are required");
         }
         BytesArray bytes = new BytesArray(source);
         final XContentType xContentType = parseContentType(Collections.singletonList(typeParam));
         if (xContentType == null) {
-            throw new IllegalStateException("Unknown value for source_content_type [" + typeParam + "]");
+            throwValidationException("Unknown value for source_content_type [" + typeParam + "]");
         }
         return new Tuple<>(xContentType, bytes);
     }
@@ -616,13 +647,41 @@ public boolean hasExplicitRestApiVersion() {
         return restApiVersion.isPresent();
     }
 
-    public void markPathRestricted(String restriction) {
-        if (params.containsKey(PATH_RESTRICTED)) {
-            throw new IllegalArgumentException("The parameter [" + PATH_RESTRICTED + "] is already defined.");
+    /**
+     * See {@link #SERVERLESS_REQUEST}
+     */
+    public void markAsServerlessRequest() {
+        setParamTrueOnceAndConsume(SERVERLESS_REQUEST);
+    }
+
+    /**
+     * See {@link #SERVERLESS_REQUEST}
+     */
+    public boolean isServerlessRequest() {
+        return paramAsBoolean(SERVERLESS_REQUEST, false);
+    }
+
+    /**
+     * See {@link #OPERATOR_REQUEST}
+     */
+    public void markAsOperatorRequest() {
+        setParamTrueOnceAndConsume(OPERATOR_REQUEST);
+    }
+
+    /**
+     * See {@link #OPERATOR_REQUEST}
+     */
+    public boolean isOperatorRequest() {
+        return paramAsBoolean(OPERATOR_REQUEST, false);
+    }
+
+    private void setParamTrueOnceAndConsume(String param) {
+        if (params.containsKey(param)) {
+            throw new IllegalArgumentException("The parameter [" + param + "] is already defined.");
         }
-        params.put(PATH_RESTRICTED, restriction);
+        params.put(param, "true");
         // this parameter is intended be consumed via ToXContent.Params.param(..), not this.params(..) so don't require it is consumed here
-        consumedParams.add(PATH_RESTRICTED);
+        consumedParams.add(param);
     }
 
     @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/RestUtils.java b/server/src/main/java/org/elasticsearch/rest/RestUtils.java
index 0e7200fa83b1..681f4c33eb77 100644
--- a/server/src/main/java/org/elasticsearch/rest/RestUtils.java
+++ b/server/src/main/java/org/elasticsearch/rest/RestUtils.java
@@ -23,7 +23,7 @@
 import java.util.regex.Pattern;
 
 import static org.elasticsearch.action.support.master.AcknowledgedRequest.DEFAULT_ACK_TIMEOUT;
-import static org.elasticsearch.rest.RestRequest.PATH_RESTRICTED;
+import static org.elasticsearch.rest.RestRequest.INTERNAL_MARKER_REQUEST_PARAMETERS;
 
 public class RestUtils {
 
@@ -85,8 +85,10 @@ private static String decodeQueryStringParam(final String s) {
     }
 
     private static void addParam(Map<String, String> params, String name, String value) {
-        if (PATH_RESTRICTED.equalsIgnoreCase(name)) {
-            throw new IllegalArgumentException("parameter [" + PATH_RESTRICTED + "] is reserved and may not set");
+        for (var reservedParameter : INTERNAL_MARKER_REQUEST_PARAMETERS) {
+            if (reservedParameter.equalsIgnoreCase(name)) {
+                throw new IllegalArgumentException("parameter [" + name + "] is reserved and may not be set");
+            }
         }
         params.put(name, value);
     }
diff --git a/server/src/main/java/org/elasticsearch/rest/ServerlessScope.java b/server/src/main/java/org/elasticsearch/rest/ServerlessScope.java
index 34aa04c5e484..8a078db7dc01 100644
--- a/server/src/main/java/org/elasticsearch/rest/ServerlessScope.java
+++ b/server/src/main/java/org/elasticsearch/rest/ServerlessScope.java
@@ -22,9 +22,4 @@
 @Target(ElementType.TYPE)
 public @interface ServerlessScope {
     Scope value();
-
-    /**
-     * A value used when restricting a response of a serverless endpoints.
-     */
-    String SERVERLESS_RESTRICTION = "serverless";
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java
index 74ecc85e960b..28dc14e3112f 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java
@@ -77,13 +77,12 @@ static AddVotingConfigExclusionsRequest resolveVotingConfigExclusionsRequest(fin
             nodeNames = request.param("node_names");
         }
 
-        final var resolvedRequest = new AddVotingConfigExclusionsRequest(
+        return new AddVotingConfigExclusionsRequest(
+            getMasterNodeTimeout(request),
             Strings.splitStringByCommaToArray(nodeIds),
             Strings.splitStringByCommaToArray(nodeNames),
             request.paramAsTime("timeout", DEFAULT_TIMEOUT)
         );
-
-        return resolvedRequest.masterNodeTimeout(getMasterNodeTimeout(request));
     }
 
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java
index ff2664847692..0e7b6ecac25d 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClearVotingConfigExclusionsAction.java
@@ -45,8 +45,7 @@ protected RestChannelConsumer prepareRequest(final RestRequest request, final No
     }
 
     static ClearVotingConfigExclusionsRequest resolveVotingConfigExclusionsRequest(final RestRequest request) {
-        final var resolvedRequest = new ClearVotingConfigExclusionsRequest();
-        resolvedRequest.masterNodeTimeout(getMasterNodeTimeout(request));
+        final var resolvedRequest = new ClearVotingConfigExclusionsRequest(getMasterNodeTimeout(request));
         resolvedRequest.setTimeout(resolvedRequest.masterNodeTimeout());
         resolvedRequest.setWaitForRemoval(request.paramAsBoolean("wait_for_removal", resolvedRequest.getWaitForRemoval()));
         return resolvedRequest;
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java
index 2d2d241c3508..8ccaa9c44211 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterGetSettingsAction.java
@@ -65,7 +65,6 @@ public String getName() {
 
     private static void setUpRequestParams(MasterNodeReadRequest<?> clusterRequest, RestRequest request) {
         clusterRequest.local(request.paramAsBoolean("local", clusterRequest.local()));
-        clusterRequest.masterNodeTimeout(getMasterNodeTimeout(request));
     }
 
     @Override
@@ -76,7 +75,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
             return prepareLegacyRequest(request, client, renderDefaults);
         }
 
-        ClusterGetSettingsAction.Request clusterSettingsRequest = new ClusterGetSettingsAction.Request();
+        ClusterGetSettingsAction.Request clusterSettingsRequest = new ClusterGetSettingsAction.Request(getMasterNodeTimeout(request));
 
         setUpRequestParams(clusterSettingsRequest, request);
 
@@ -90,7 +89,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
     }
 
     private RestChannelConsumer prepareLegacyRequest(final RestRequest request, final NodeClient client, final boolean renderDefaults) {
-        ClusterStateRequest clusterStateRequest = new ClusterStateRequest().routingTable(false).nodes(false);
+        ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request)).routingTable(false).nodes(false);
         setUpRequestParams(clusterStateRequest, request);
         return channel -> client.admin()
             .cluster()
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java
index f5910f76f36c..82325a22ac43 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterHealthAction.java
@@ -20,6 +20,7 @@
 import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.RestUtils;
 import org.elasticsearch.rest.Scope;
 import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestCancellableNodeClient;
@@ -32,7 +33,6 @@
 import java.util.Set;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
-import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
 
 @ServerlessScope(Scope.INTERNAL)
 public class RestClusterHealthAction extends BaseRestHandler {
@@ -62,15 +62,15 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
 
     public static ClusterHealthRequest fromRequest(final RestRequest request) {
         String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
-        final ClusterHealthRequest clusterHealthRequest = new ClusterHealthRequest(indices);
+
+        final var masterNodeTimeout = request.hasParam(RestUtils.REST_MASTER_TIMEOUT_PARAM)
+            ? RestUtils.getMasterNodeTimeout(request)
+            : request.paramAsTime("timeout", RestUtils.REST_MASTER_TIMEOUT_DEFAULT);
+
+        final ClusterHealthRequest clusterHealthRequest = new ClusterHealthRequest(masterNodeTimeout, indices);
         clusterHealthRequest.indicesOptions(IndicesOptions.fromRequest(request, clusterHealthRequest.indicesOptions()));
         clusterHealthRequest.local(request.paramAsBoolean("local", clusterHealthRequest.local()));
         clusterHealthRequest.timeout(request.paramAsTime("timeout", clusterHealthRequest.timeout()));
-        if (request.hasParam("master_timeout")) {
-            clusterHealthRequest.masterNodeTimeout(getMasterNodeTimeout(request));
-        } else {
-            clusterHealthRequest.masterNodeTimeout(clusterHealthRequest.timeout());
-        }
         String waitForStatus = request.param("wait_for_status");
         if (waitForStatus != null) {
             clusterHealthRequest.waitForStatus(ClusterHealthStatus.valueOf(waitForStatus.toUpperCase(Locale.ROOT)));
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java
index cb9be980f35c..2127a632be0b 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStateAction.java
@@ -79,10 +79,9 @@ public boolean allowSystemIndexAccessByDefault() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.indicesOptions(IndicesOptions.fromRequest(request, clusterStateRequest.indicesOptions()));
         clusterStateRequest.local(request.paramAsBoolean("local", clusterStateRequest.local()));
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
         if (request.hasParam("wait_for_metadata_version")) {
             clusterStateRequest.waitForMetadataVersion(request.paramAsLong("wait_for_metadata_version", 0));
         }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java
index 823e459c35e2..2280460f5b3f 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java
@@ -45,9 +45,10 @@ public String getName() {
     @Override
     @SuppressWarnings("unchecked")
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest();
-        clusterUpdateSettingsRequest.ackTimeout(getAckTimeout(request));
-        clusterUpdateSettingsRequest.masterNodeTimeout(getMasterNodeTimeout(request));
+        final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest(
+            getMasterNodeTimeout(request),
+            getAckTimeout(request)
+        );
         Map<String, Object> source;
         try (XContentParser parser = request.contentParser()) {
             source = parser.map();
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetDesiredNodesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetDesiredNodesAction.java
index ae375309c301..21d4e5c100dc 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetDesiredNodesAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetDesiredNodesAction.java
@@ -32,8 +32,7 @@ public List<Route> routes() {
 
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
-        final GetDesiredNodesAction.Request getDesiredNodesRequest = new GetDesiredNodesAction.Request();
-        getDesiredNodesRequest.masterNodeTimeout(getMasterNodeTimeout(request));
+        final GetDesiredNodesAction.Request getDesiredNodesRequest = new GetDesiredNodesAction.Request(getMasterNodeTimeout(request));
         return restChannel -> client.execute(
             GetDesiredNodesAction.INSTANCE,
             getDesiredNodesRequest,
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetFeatureUpgradeStatusAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetFeatureUpgradeStatusAction.java
index 13fbf3504ebc..0bb609ff1123 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetFeatureUpgradeStatusAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestGetFeatureUpgradeStatusAction.java
@@ -41,10 +41,7 @@ public boolean allowSystemIndexAccessByDefault() {
 
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
-
-        final GetFeatureUpgradeStatusRequest req = new GetFeatureUpgradeStatusRequest();
-        req.masterNodeTimeout(getMasterNodeTimeout(request));
-
-        return restChannel -> { client.execute(GetFeatureUpgradeStatusAction.INSTANCE, req, new RestToXContentListener<>(restChannel)); };
+        final GetFeatureUpgradeStatusRequest req = new GetFeatureUpgradeStatusRequest(getMasterNodeTimeout(request));
+        return restChannel -> client.execute(GetFeatureUpgradeStatusAction.INSTANCE, req, new RestToXContentListener<>(restChannel));
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java
index c38f5effc385..73701e771eb4 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPendingClusterTasksAction.java
@@ -38,8 +38,7 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        PendingClusterTasksRequest pendingClusterTasksRequest = new PendingClusterTasksRequest();
-        pendingClusterTasksRequest.masterNodeTimeout(getMasterNodeTimeout(request));
+        PendingClusterTasksRequest pendingClusterTasksRequest = new PendingClusterTasksRequest(getMasterNodeTimeout(request));
         pendingClusterTasksRequest.local(request.paramAsBoolean("local", pendingClusterTasksRequest.local()));
         return channel -> client.execute(
             TransportPendingClusterTasksAction.TYPE,
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPostFeatureUpgradeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPostFeatureUpgradeAction.java
index cb9af32955ab..64f0f7897b93 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPostFeatureUpgradeAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPostFeatureUpgradeAction.java
@@ -41,10 +41,7 @@ public boolean allowSystemIndexAccessByDefault() {
 
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
-
-        final PostFeatureUpgradeRequest req = new PostFeatureUpgradeRequest();
-        req.masterNodeTimeout(getMasterNodeTimeout(request));
-
-        return restChannel -> { client.execute(PostFeatureUpgradeAction.INSTANCE, req, new RestToXContentListener<>(restChannel)); };
+        final PostFeatureUpgradeRequest req = new PostFeatureUpgradeRequest(getMasterNodeTimeout(request));
+        return restChannel -> client.execute(PostFeatureUpgradeAction.INSTANCE, req, new RestToXContentListener<>(restChannel));
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPrevalidateNodeRemovalAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPrevalidateNodeRemovalAction.java
index 119f6660f2a3..71c36815e99a 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPrevalidateNodeRemovalAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPrevalidateNodeRemovalAction.java
@@ -14,13 +14,13 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.RestUtils;
 import org.elasticsearch.rest.action.RestToXContentListener;
 
 import java.io.IOException;
 import java.util.List;
 
 import static org.elasticsearch.rest.RestRequest.Method.POST;
-import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
 
 public class RestPrevalidateNodeRemovalAction extends BaseRestHandler {
 
@@ -36,6 +36,9 @@ public String getName() {
 
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
+        final var masterNodeTimeout = request.hasParam(RestUtils.REST_MASTER_TIMEOUT_PARAM)
+            ? RestUtils.getMasterNodeTimeout(request)
+            : request.paramAsTime("timeout", RestUtils.REST_MASTER_TIMEOUT_DEFAULT);
         String[] ids = request.paramAsStringArray("ids", Strings.EMPTY_ARRAY);
         String[] names = request.paramAsStringArray("names", Strings.EMPTY_ARRAY);
         String[] externalIds = request.paramAsStringArray("external_ids", Strings.EMPTY_ARRAY);
@@ -43,13 +46,8 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
             .setNames(names)
             .setIds(ids)
             .setExternalIds(externalIds)
-            .build();
+            .build(masterNodeTimeout);
         prevalidationRequest.timeout(request.paramAsTime("timeout", prevalidationRequest.timeout()));
-        if (request.hasParam("master_timeout")) {
-            prevalidationRequest.masterNodeTimeout(getMasterNodeTimeout(request));
-        } else {
-            prevalidationRequest.masterNodeTimeout(prevalidationRequest.timeout());
-        }
         return channel -> client.execute(
             PrevalidateNodeRemovalAction.INSTANCE,
             prevalidationRequest,
diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestUpdateDesiredNodesAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestUpdateDesiredNodesAction.java
index 38b191ba9f00..0e06f37b1e09 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestUpdateDesiredNodesAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestUpdateDesiredNodesAction.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 
+import static org.elasticsearch.rest.RestUtils.getAckTimeout;
 import static org.elasticsearch.rest.RestUtils.getMasterNodeTimeout;
 
 public class RestUpdateDesiredNodesAction extends BaseRestHandler {
@@ -55,7 +56,14 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
 
         final UpdateDesiredNodesRequest updateDesiredNodesRequest;
         try (XContentParser parser = request.contentParser()) {
-            updateDesiredNodesRequest = UpdateDesiredNodesRequest.fromXContent(historyId, version, dryRun, parser);
+            updateDesiredNodesRequest = UpdateDesiredNodesRequest.fromXContent(
+                getMasterNodeTimeout(request),
+                getAckTimeout(request),
+                historyId,
+                version,
+                dryRun,
+                parser
+            );
         }
 
         if (clusterSupportsFeature.test(DesiredNode.DESIRED_NODE_VERSION_DEPRECATED)) {
@@ -68,7 +76,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
             }
         }
 
-        updateDesiredNodesRequest.masterNodeTimeout(getMasterNodeTimeout(request));
         return restChannel -> client.execute(
             UpdateDesiredNodesAction.INSTANCE,
             updateDesiredNodesRequest,
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java
index d185f3f921d3..51c58ff79fb6 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestAllocationAction.java
@@ -59,10 +59,9 @@ protected void documentation(StringBuilder sb) {
     @Override
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
         final String[] nodes = Strings.splitStringByCommaToArray(request.param("nodes", "data:true"));
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.clear().routingTable(true);
         clusterStateRequest.local(request.paramAsBoolean("local", clusterStateRequest.local()));
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
 
         return channel -> client.admin().cluster().state(clusterStateRequest, new RestActionListener<ClusterStateResponse>(channel) {
             @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatComponentTemplateAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatComponentTemplateAction.java
index 4faf44ff8c5a..52dc1bcfb440 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatComponentTemplateAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestCatComponentTemplateAction.java
@@ -74,10 +74,9 @@ protected Table getTableWithHeader(RestRequest request) {
     @Override
     protected BaseRestHandler.RestChannelConsumer doCatRequest(RestRequest request, NodeClient client) {
         final String matchPattern = request.hasParam("name") ? request.param("name") : null;
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.clear().metadata(true);
         clusterStateRequest.local(request.paramAsBoolean("local", clusterStateRequest.local()));
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
         return channel -> client.admin().cluster().state(clusterStateRequest, new RestResponseListener<>(channel) {
             @Override
             public RestResponse buildResponse(ClusterStateResponse clusterStateResponse) throws Exception {
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java
index 587423d0fa1f..608cd222c27b 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestHealthAction.java
@@ -15,6 +15,7 @@
 import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestResponse;
+import org.elasticsearch.rest.RestUtils;
 import org.elasticsearch.rest.Scope;
 import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestResponseListener;
@@ -50,9 +51,9 @@ protected void documentation(StringBuilder sb) {
 
     @Override
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
-        ClusterHealthRequest clusterHealthRequest = new ClusterHealthRequest();
+        final var clusterHealthRequest = new ClusterHealthRequest(RestUtils.getMasterNodeTimeout(request));
 
-        return channel -> client.admin().cluster().health(clusterHealthRequest, new RestResponseListener<ClusterHealthResponse>(channel) {
+        return channel -> client.admin().cluster().health(clusterHealthRequest, new RestResponseListener<>(channel) {
             @Override
             public RestResponse buildResponse(final ClusterHealthResponse health) throws Exception {
                 return RestTable.buildResponse(buildTable(health, request), channel);
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java
index edf8f12b6957..e7c304cdefcc 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestIndicesAction.java
@@ -127,13 +127,12 @@ public RestResponse buildResponse(Void ignored) throws Exception {
 
                 client.admin()
                     .cluster()
-                    .prepareState()
+                    .prepareState(masterNodeTimeout)
                     .clear()
                     .setMetadata(true)
                     .setRoutingTable(true)
                     .setIndices(indices)
                     .setIndicesOptions(subRequestIndicesOptions)
-                    .setMasterNodeTimeout(masterNodeTimeout)
                     .execute(listeners.acquire(clusterStateRef::set));
 
                 client.admin()
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java
index b0805bf42345..a9b4e0cfdee2 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestMasterAction.java
@@ -45,10 +45,9 @@ protected void documentation(StringBuilder sb) {
 
     @Override
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.clear().nodes(true);
         clusterStateRequest.local(request.paramAsBoolean("local", clusterStateRequest.local()));
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
 
         return channel -> client.admin().cluster().state(clusterStateRequest, new RestResponseListener<ClusterStateResponse>(channel) {
             @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java
index 83e6ea35ec52..57113bb226b3 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodeAttrsAction.java
@@ -53,10 +53,9 @@ protected void documentation(StringBuilder sb) {
 
     @Override
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.clear().nodes(true);
         clusterStateRequest.local(request.paramAsBoolean("local", clusterStateRequest.local()));
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
 
         return channel -> client.admin().cluster().state(clusterStateRequest, new RestActionListener<ClusterStateResponse>(channel) {
             @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
index d2162544abb3..4b70922dd796 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
@@ -85,9 +85,8 @@ public RestChannelConsumer doCatRequest(final RestRequest request, final NodeCli
 
         final boolean fullId = request.paramAsBoolean("full_id", false);
 
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.clear().nodes(true);
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
 
         final NodesInfoRequest nodesInfoRequest = new NodesInfoRequest();
         nodesInfoRequest.clear()
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java
index 5ed0cd722d5d..4b54eacb1f38 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPendingClusterTasksAction.java
@@ -45,8 +45,7 @@ protected void documentation(StringBuilder sb) {
 
     @Override
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
-        PendingClusterTasksRequest pendingClusterTasksRequest = new PendingClusterTasksRequest();
-        pendingClusterTasksRequest.masterNodeTimeout(getMasterNodeTimeout(request));
+        PendingClusterTasksRequest pendingClusterTasksRequest = new PendingClusterTasksRequest(getMasterNodeTimeout(request));
         pendingClusterTasksRequest.local(request.paramAsBoolean("local", pendingClusterTasksRequest.local()));
         return channel -> client.execute(
             TransportPendingClusterTasksAction.TYPE,
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java
index 0e459b53d203..a7fa0699be95 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java
@@ -54,10 +54,9 @@ protected void documentation(StringBuilder sb) {
     @Override
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
         final boolean includeBootstrapPlugins = request.paramAsBoolean("include_bootstrap", false);
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.clear().nodes(true);
         clusterStateRequest.local(request.paramAsBoolean("local", clusterStateRequest.local()));
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
 
         return channel -> client.admin().cluster().state(clusterStateRequest, new RestActionListener<ClusterStateResponse>(channel) {
             @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java
index 1f11a662c0ab..3e7ce29d4012 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java
@@ -57,9 +57,8 @@ public boolean allowSystemIndexAccessByDefault() {
     protected RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
         final String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
 
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.local(request.paramAsBoolean("local", clusterStateRequest.local()));
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
         clusterStateRequest.clear().nodes(true).routingTable(true).indices(indices);
 
         final RestCancellableNodeClient cancelClient = new RestCancellableNodeClient(client, request.getHttpChannel());
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java
index fffa272d8fd1..e9b23c49a97d 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java
@@ -84,8 +84,7 @@ protected void documentation(StringBuilder sb) {
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
         final String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
 
-        final var clusterStateRequest = new ClusterStateRequest();
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
+        final var clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.clear().nodes(true).routingTable(true).indices(indices).indicesOptions(IndicesOptions.strictExpandHidden());
 
         return channel -> {
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java
index 95fc945226f6..2a61756429d1 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/cat/RestThreadPoolAction.java
@@ -70,10 +70,9 @@ protected void documentation(StringBuilder sb) {
 
     @Override
     public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
-        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(getMasterNodeTimeout(request));
         clusterStateRequest.clear().nodes(true);
         clusterStateRequest.local(request.paramAsBoolean("local", clusterStateRequest.local()));
-        clusterStateRequest.masterNodeTimeout(getMasterNodeTimeout(request));
 
         return channel -> client.admin().cluster().state(clusterStateRequest, new RestActionListener<ClusterStateResponse>(channel) {
             @Override
diff --git a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java
index da22a211bd58..2659fed00879 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.rest.action.ingest;
 
 import org.elasticsearch.action.ingest.DeletePipelineRequest;
+import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
@@ -40,6 +41,6 @@ public RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient cl
         DeletePipelineRequest request = new DeletePipelineRequest(restRequest.param("id"));
         request.masterNodeTimeout(getMasterNodeTimeout(restRequest));
         request.ackTimeout(getAckTimeout(restRequest));
-        return channel -> client.admin().cluster().deletePipeline(request, new RestToXContentListener<>(channel));
+        return channel -> client.execute(DeletePipelineTransportAction.TYPE, request, new RestToXContentListener<>(channel));
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java
index d6712b44f3e0..6f8d8ce926ae 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java
@@ -8,6 +8,7 @@
 
 package org.elasticsearch.rest.action.ingest;
 
+import org.elasticsearch.action.ingest.GetPipelineAction;
 import org.elasticsearch.action.ingest.GetPipelineRequest;
 import org.elasticsearch.action.ingest.GetPipelineResponse;
 import org.elasticsearch.client.internal.node.NodeClient;
@@ -44,6 +45,10 @@ public RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient cl
             Strings.splitStringByCommaToArray(restRequest.param("id"))
         );
         request.masterNodeTimeout(getMasterNodeTimeout(restRequest));
-        return channel -> client.admin().cluster().getPipeline(request, new RestToXContentListener<>(channel, GetPipelineResponse::status));
+        return channel -> client.execute(
+            GetPipelineAction.INSTANCE,
+            request,
+            new RestToXContentListener<>(channel, GetPipelineResponse::status)
+        );
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java
index 520855b8987c..e58a6e62d689 100644
--- a/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java
+++ b/server/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.rest.action.ingest;
 
 import org.elasticsearch.action.ingest.PutPipelineRequest;
+import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.core.Tuple;
@@ -58,6 +59,6 @@ public RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient cl
         PutPipelineRequest request = new PutPipelineRequest(restRequest.param("id"), sourceTuple.v2(), sourceTuple.v1(), ifVersion);
         request.masterNodeTimeout(getMasterNodeTimeout(restRequest));
         request.ackTimeout(getAckTimeout(restRequest));
-        return channel -> client.admin().cluster().putPipeline(request, new RestToXContentListener<>(channel));
+        return channel -> client.execute(PutPipelineTransportAction.TYPE, request, new RestToXContentListener<>(channel));
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java b/server/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java
index 04dea2d8bd88..924ea5093baf 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/BucketOrder.java
@@ -18,6 +18,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
+import java.util.function.BiFunction;
 import java.util.function.ToLongFunction;
 
 /**
@@ -128,8 +129,14 @@ public final void validate(Aggregator aggregator) throws AggregationExecutionExc
 
     /**
      * Build a comparator for {@link DelayedBucket}, a wrapper that delays bucket reduction.
+     *
+     * The comparator might need to reduce the {@link DelayedBucket} and therefore we need to provide the
+     * reducer and the reduce context.The context must be on the final reduce phase.
      */
-    abstract Comparator<DelayedBucket<? extends Bucket>> delayedBucketComparator();
+    public abstract <B extends InternalMultiBucketAggregation.InternalBucket> Comparator<DelayedBucket<B>> delayedBucketComparator(
+        BiFunction<List<B>, AggregationReduceContext, B> reduce,
+        AggregationReduceContext reduceContext
+    );
 
     /**
      * @return unique internal ID used for reading/writing this order from/to a stream.
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/DelayedBucket.java b/server/src/main/java/org/elasticsearch/search/aggregations/DelayedBucket.java
index fc0806b5827d..2a45f174390e 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/DelayedBucket.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/DelayedBucket.java
@@ -16,8 +16,6 @@
  * as long as possible. It's stateful and not even close to thread safe.
  */
 public final class DelayedBucket<B extends InternalMultiBucketAggregation.InternalBucket> {
-    private final BiFunction<List<B>, AggregationReduceContext, B> reduce;
-    private final AggregationReduceContext reduceContext;
     /**
      * The buckets to reduce or {@code null} if we've already reduced the buckets.
      */
@@ -36,13 +34,7 @@ public final class DelayedBucket<B extends InternalMultiBucketAggregation.Intern
     /**
      * Build a delayed bucket.
      */
-    public DelayedBucket(
-        BiFunction<List<B>, AggregationReduceContext, B> reduce,
-        AggregationReduceContext reduceContext,
-        List<B> toReduce
-    ) {
-        this.reduce = reduce;
-        this.reduceContext = reduceContext;
+    public DelayedBucket(List<B> toReduce) {
         this.toReduce = toReduce;
     }
 
@@ -50,7 +42,7 @@ public DelayedBucket(
      * The reduced bucket. If the bucket hasn't been reduced already this
      * will reduce the sub-aggs and throw out the list to reduce.
      */
-    public B reduced() {
+    public B reduced(BiFunction<List<B>, AggregationReduceContext, B> reduce, AggregationReduceContext reduceContext) {
         if (reduced == null) {
             reduceContext.consumeBucketsAndMaybeBreak(1);
             reduced = reduce.apply(toReduce, reduceContext);
@@ -100,7 +92,7 @@ public String toString() {
      * Called to mark a bucket as non-competitive so it can release it can release
      * any sub-buckets from the breaker.
      */
-    void nonCompetitive() {
+    public void nonCompetitive(AggregationReduceContext reduceContext) {
         if (reduced != null) {
             // -1 for itself, -countInnerBucket for all the sub-buckets.
             reduceContext.consumeBucketsAndMaybeBreak(-1 - InternalMultiBucketAggregation.countInnerBucket(reduced));
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java
index 07ddf5fd4555..9dcaa691219e 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.search.aggregations;
 
 import org.elasticsearch.common.ParsingException;
+import org.elasticsearch.common.io.stream.DelayableWriteable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.logging.DeprecationLogger;
@@ -28,6 +29,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.BiFunction;
 import java.util.function.ToLongFunction;
 
 /**
@@ -35,6 +37,7 @@
  */
 public abstract class InternalOrder extends BucketOrder {
     // TODO merge the contents of this file into BucketOrder. The way it is now is relic.
+
     /**
      * {@link Bucket} ordering strategy to sort by a sub-aggregation.
      */
@@ -80,14 +83,17 @@ public Comparator<Bucket> comparator() {
         }
 
         @Override
-        Comparator<DelayedBucket<? extends Bucket>> delayedBucketComparator() {
+        public <B extends InternalMultiBucketAggregation.InternalBucket> Comparator<DelayedBucket<B>> delayedBucketComparator(
+            BiFunction<List<B>, AggregationReduceContext, B> reduce,
+            AggregationReduceContext reduceContext
+        ) {
             Comparator<Bucket> comparator = comparator();
             /*
              * Reduce the buckets if we haven't already so we can get at the
              * sub-aggregations. With enough code we could avoid this but
              * we haven't written that code....
              */
-            return (lhs, rhs) -> comparator.compare(lhs.reduced(), rhs.reduced());
+            return (lhs, rhs) -> comparator.compare(lhs.reduced(reduce, reduceContext), rhs.reduced(reduce, reduceContext));
         }
 
         @Override
@@ -212,12 +218,15 @@ public Comparator<Bucket> comparator() {
         }
 
         @Override
-        Comparator<DelayedBucket<? extends Bucket>> delayedBucketComparator() {
-            List<Comparator<DelayedBucket<? extends Bucket>>> comparators = orderElements.stream()
-                .map(BucketOrder::delayedBucketComparator)
+        public <B extends InternalMultiBucketAggregation.InternalBucket> Comparator<DelayedBucket<B>> delayedBucketComparator(
+            BiFunction<List<B>, AggregationReduceContext, B> reduce,
+            AggregationReduceContext reduceContext
+        ) {
+            List<Comparator<DelayedBucket<B>>> comparators = orderElements.stream()
+                .map(b -> b.delayedBucketComparator(reduce, reduceContext))
                 .toList();
             return (lhs, rhs) -> {
-                for (Comparator<DelayedBucket<? extends Bucket>> c : comparators) {
+                for (Comparator<DelayedBucket<B>> c : comparators) {
                     int result = c.compare(lhs, rhs);
                     if (result != 0) {
                         return result;
@@ -277,8 +286,11 @@ public Comparator<Bucket> comparator() {
         }
 
         @Override
-        Comparator<DelayedBucket<? extends Bucket>> delayedBucketComparator() {
-            return delayedBucketCompator;
+        public <B extends InternalMultiBucketAggregation.InternalBucket> Comparator<DelayedBucket<B>> delayedBucketComparator(
+            BiFunction<List<B>, AggregationReduceContext, B> reduce,
+            AggregationReduceContext reduceContext
+        ) {
+            return delayedBucketCompator::compare;
         }
 
         @Override
@@ -466,6 +478,10 @@ public static class Streams {
          * @throws IOException on error reading from the stream.
          */
         public static BucketOrder readOrder(StreamInput in) throws IOException {
+            return readOrder(in, true);
+        }
+
+        private static BucketOrder readOrder(StreamInput in, boolean dedupe) throws IOException {
             byte id = in.readByte();
             switch (id) {
                 case COUNT_DESC_ID:
@@ -479,12 +495,18 @@ public static BucketOrder readOrder(StreamInput in) throws IOException {
                 case Aggregation.ID:
                     boolean asc = in.readBoolean();
                     String key = in.readString();
+                    if (dedupe && in instanceof DelayableWriteable.Deduplicator bo) {
+                        return bo.deduplicate(new Aggregation(key, asc));
+                    }
                     return new Aggregation(key, asc);
                 case CompoundOrder.ID:
                     int size = in.readVInt();
                     List<BucketOrder> compoundOrder = new ArrayList<>(size);
                     for (int i = 0; i < size; i++) {
-                        compoundOrder.add(Streams.readOrder(in));
+                        compoundOrder.add(Streams.readOrder(in, false));
+                    }
+                    if (dedupe && in instanceof DelayableWriteable.Deduplicator bo) {
+                        return bo.deduplicate(new CompoundOrder(compoundOrder, false));
                     }
                     return new CompoundOrder(compoundOrder, false);
                 default:
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/TopBucketBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/TopBucketBuilder.java
deleted file mode 100644
index 61427b446cb6..000000000000
--- a/server/src/main/java/org/elasticsearch/search/aggregations/TopBucketBuilder.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-package org.elasticsearch.search.aggregations;
-
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.PriorityQueue;
-import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation.Bucket;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * Merges many buckets into the "top" buckets as sorted by {@link BucketOrder}.
- */
-public abstract class TopBucketBuilder<B extends InternalMultiBucketAggregation.InternalBucket> {
-    /**
-     * The number of buckets required before we switch to the
-     * {@link BufferingTopBucketBuilder}. If we need fewer buckets we use
-     * {@link PriorityQueueTopBucketBuilder}.
-     * <p>
-     * The value we picked for this boundary is fairly arbitrary, but it
-     * is important that its bigger than the default size of the terms
-     * aggregation. It's basically the amount of memory you are willing to
-     * waste when reduce small terms aggregations so it shouldn't be too
-     * large either. The value we have, {@code 1024}, preallocates about
-     * 32k for the priority queue.
-     */
-    static final int USE_BUFFERING_BUILDER = 1024;
-
-    /**
-     * Create a {@link TopBucketBuilder} to build a list of the top buckets.
-     * <p>
-     * If there are few required results we use a {@link PriorityQueueTopBucketBuilder}
-     * which is simpler and when the priority queue is full but allocates {@code size + 1}
-     * slots in an array. If there are many required results we prefer a
-     * {@link BufferingTopBucketBuilder} which doesn't preallocate and is faster for the
-     * first {@code size} results. But it's a little slower when the priority queue is full.
-     * <p>
-     * It's important for this <strong>not</strong> to preallocate a bunch of memory when
-     * {@code size} is very very large because this backs the reduction of the {@code terms}
-     * aggregation and folks often set the {@code size} of that to something quite large.
-     * The choice in the paragraph above handles this case.
-     *
-     * @param size the requested size of the list
-     * @param order the sort order of the buckets
-     * @param nonCompetitive called with non-competitive buckets
-     */
-    public static <B extends InternalMultiBucketAggregation.InternalBucket> TopBucketBuilder<B> build(
-        int size,
-        BucketOrder order,
-        Consumer<DelayedBucket<B>> nonCompetitive
-    ) {
-        if (size < USE_BUFFERING_BUILDER) {
-            return new PriorityQueueTopBucketBuilder<>(size, order, nonCompetitive);
-        }
-        return new BufferingTopBucketBuilder<>(size, order, nonCompetitive);
-    }
-
-    protected final Consumer<DelayedBucket<B>> nonCompetitive;
-
-    private TopBucketBuilder(Consumer<DelayedBucket<B>> nonCompetitive) {
-        this.nonCompetitive = nonCompetitive;
-    }
-
-    /**
-     * Add a bucket if it is competitive. If there isn't space but the
-     * bucket is competitive then this will drop the least competitive bucket
-     * to make room for the new bucket.
-     * <p>
-     * Instead of operating on complete buckets we this operates on a
-     * wrapper containing what we need to merge the buckets called
-     * {@link DelayedBucket}. We can evaluate some common sort criteria
-     * directly on the {@linkplain DelayedBucket}s so we only need to
-     * merge <strong>exactly</strong> the sub-buckets we need.
-     */
-    public abstract void add(DelayedBucket<B> bucket);
-
-    /**
-     * Return the most competitive buckets sorted by the comparator.
-     */
-    public abstract List<B> build();
-
-    /**
-     * Collects the "top" buckets by adding them directly to a {@link PriorityQueue}.
-     * This is always going to be faster than {@link BufferingTopBucketBuilder}
-     * but it requires allocating an array of {@code size + 1}.
-     */
-    static class PriorityQueueTopBucketBuilder<B extends InternalMultiBucketAggregation.InternalBucket> extends TopBucketBuilder<B> {
-        private final PriorityQueue<DelayedBucket<B>> queue;
-
-        PriorityQueueTopBucketBuilder(int size, BucketOrder order, Consumer<DelayedBucket<B>> nonCompetitive) {
-            super(nonCompetitive);
-            if (size >= ArrayUtil.MAX_ARRAY_LENGTH) {
-                throw new IllegalArgumentException("can't reduce more than [" + ArrayUtil.MAX_ARRAY_LENGTH + "] buckets");
-            }
-            queue = new PriorityQueue<>(size) {
-                private final Comparator<DelayedBucket<? extends Bucket>> comparator = order.delayedBucketComparator();
-
-                @Override
-                protected boolean lessThan(DelayedBucket<B> a, DelayedBucket<B> b) {
-                    return comparator.compare(a, b) > 0;
-                }
-            };
-        }
-
-        @Override
-        public void add(DelayedBucket<B> bucket) {
-            DelayedBucket<B> removed = queue.insertWithOverflow(bucket);
-            if (removed != null) {
-                nonCompetitive.accept(removed);
-                removed.nonCompetitive();
-            }
-        }
-
-        @Override
-        public List<B> build() {
-            List<B> result = new ArrayList<>(queue.size());
-            for (int i = queue.size() - 1; i >= 0; i--) {
-                result.add(queue.pop().reduced());
-            }
-            Collections.reverse(result);
-            return result;
-        }
-    }
-
-    /**
-     * Collects the "top" buckets by adding them to a {@link List} that grows
-     * as more buckets arrive and is converting into a
-     * {@link PriorityQueueTopBucketBuilder} when {@code size} buckets arrive.
-     */
-    private static class BufferingTopBucketBuilder<B extends InternalMultiBucketAggregation.InternalBucket> extends TopBucketBuilder<B> {
-        private final int size;
-        private final BucketOrder order;
-
-        private List<DelayedBucket<B>> buffer;
-        private PriorityQueueTopBucketBuilder<B> next;
-
-        BufferingTopBucketBuilder(int size, BucketOrder order, Consumer<DelayedBucket<B>> nonCompetitive) {
-            super(nonCompetitive);
-            this.size = size;
-            this.order = order;
-            buffer = new ArrayList<>();
-        }
-
-        @Override
-        public void add(DelayedBucket<B> bucket) {
-            if (next != null) {
-                assert buffer == null;
-                next.add(bucket);
-                return;
-            }
-            buffer.add(bucket);
-            if (buffer.size() < size) {
-                return;
-            }
-            next = new PriorityQueueTopBucketBuilder<>(size, order, nonCompetitive);
-            for (DelayedBucket<B> b : buffer) {
-                next.queue.add(b);
-            }
-            buffer = null;
-        }
-
-        @Override
-        public List<B> build() {
-            if (next != null) {
-                assert buffer == null;
-                return next.build();
-            }
-            List<B> result = new ArrayList<>(buffer.size());
-            for (DelayedBucket<B> b : buffer) {
-                result.add(b.reduced());
-            }
-            result.sort(order.comparator());
-            return result;
-        }
-    }
-}
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractInternalTerms.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractInternalTerms.java
index 5f08855048ae..e4b4dbbac48c 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractInternalTerms.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/AbstractInternalTerms.java
@@ -20,13 +20,13 @@
 import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation;
 import org.elasticsearch.search.aggregations.InternalOrder;
 import org.elasticsearch.search.aggregations.KeyComparable;
-import org.elasticsearch.search.aggregations.TopBucketBuilder;
 import org.elasticsearch.search.aggregations.bucket.IteratorAndCurrent;
 import org.elasticsearch.search.aggregations.support.SamplingContext;
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -137,28 +137,18 @@ private long getDocCountError(A terms) {
      * @param sink Handle the reduced buckets. Returns false if we should stop iterating the buckets, true if we should continue.
      * @return the order we used to reduce the buckets
      */
-    private BucketOrder reduceBuckets(
-        List<List<B>> bucketsList,
-        BucketOrder thisReduceOrder,
-        AggregationReduceContext reduceContext,
-        Consumer<DelayedBucket<B>> sink
-    ) {
+    private BucketOrder reduceBuckets(List<List<B>> bucketsList, BucketOrder thisReduceOrder, Consumer<DelayedBucket<B>> sink) {
         if (isKeyOrder(thisReduceOrder)) {
             // extract the primary sort in case this is a compound order.
             thisReduceOrder = InternalOrder.key(isKeyAsc(thisReduceOrder));
-            reduceMergeSort(bucketsList, thisReduceOrder, reduceContext, sink);
+            reduceMergeSort(bucketsList, thisReduceOrder, sink);
         } else {
-            reduceLegacy(bucketsList, reduceContext, sink);
+            reduceLegacy(bucketsList, sink);
         }
         return thisReduceOrder;
     }
 
-    private void reduceMergeSort(
-        List<List<B>> bucketsList,
-        BucketOrder thisReduceOrder,
-        AggregationReduceContext reduceContext,
-        Consumer<DelayedBucket<B>> sink
-    ) {
+    private void reduceMergeSort(List<List<B>> bucketsList, BucketOrder thisReduceOrder, Consumer<DelayedBucket<B>> sink) {
         assert isKeyOrder(thisReduceOrder);
         final Comparator<Bucket> cmp = thisReduceOrder.comparator();
         final PriorityQueue<IteratorAndCurrent<B>> pq = new PriorityQueue<>(bucketsList.size()) {
@@ -179,7 +169,7 @@ protected boolean lessThan(IteratorAndCurrent<B> a, IteratorAndCurrent<B> b) {
             if (lastBucket != null && cmp.compare(top.current(), lastBucket) != 0) {
                 // the key changed so bundle up the last key's worth of buckets
                 sameTermBuckets.trimToSize();
-                sink.accept(new DelayedBucket<>(AbstractInternalTerms.this::reduceBucket, reduceContext, sameTermBuckets));
+                sink.accept(new DelayedBucket<>(sameTermBuckets));
                 sameTermBuckets = new ArrayList<>();
             }
             lastBucket = top.current();
@@ -200,11 +190,11 @@ protected boolean lessThan(IteratorAndCurrent<B> a, IteratorAndCurrent<B> b) {
 
         if (sameTermBuckets.isEmpty() == false) {
             sameTermBuckets.trimToSize();
-            sink.accept(new DelayedBucket<>(AbstractInternalTerms.this::reduceBucket, reduceContext, sameTermBuckets));
+            sink.accept(new DelayedBucket<>(sameTermBuckets));
         }
     }
 
-    private void reduceLegacy(List<List<B>> bucketsList, AggregationReduceContext reduceContext, Consumer<DelayedBucket<B>> sink) {
+    private void reduceLegacy(List<List<B>> bucketsList, Consumer<DelayedBucket<B>> sink) {
         final Map<Object, ArrayList<B>> bucketMap = new HashMap<>();
         for (List<B> buckets : bucketsList) {
             for (B bucket : buckets) {
@@ -213,7 +203,7 @@ private void reduceLegacy(List<List<B>> bucketsList, AggregationReduceContext re
         }
         for (ArrayList<B> sameTermBuckets : bucketMap.values()) {
             sameTermBuckets.trimToSize();
-            sink.accept(new DelayedBucket<>(AbstractInternalTerms.this::reduceBucket, reduceContext, sameTermBuckets));
+            sink.accept(new DelayedBucket<>(sameTermBuckets));
         }
     }
 
@@ -297,28 +287,49 @@ public InternalAggregation get() {
                  * so we can just have an optimize collection.
                  */
                 result = new ArrayList<>();
-                thisReduceOrder = reduceBuckets(bucketsList, getThisReduceOrder(), reduceContext, bucket -> {
+                thisReduceOrder = reduceBuckets(bucketsList, getThisReduceOrder(), bucket -> {
                     if (result.size() < getRequiredSize()) {
-                        result.add(bucket.reduced());
+                        result.add(bucket.reduced(AbstractInternalTerms.this::reduceBucket, reduceContext));
                     } else {
                         otherDocCount[0] += bucket.getDocCount();
                     }
                 });
             } else if (reduceContext.isFinalReduce()) {
-                TopBucketBuilder<B> top = TopBucketBuilder.build(
-                    getRequiredSize(),
-                    getOrder(),
-                    removed -> otherDocCount[0] += removed.getDocCount()
+                final Comparator<DelayedBucket<B>> comparator = getOrder().delayedBucketComparator(
+                    AbstractInternalTerms.this::reduceBucket,
+                    reduceContext
                 );
-                thisReduceOrder = reduceBuckets(bucketsList, getThisReduceOrder(), reduceContext, bucket -> {
-                    if (bucket.getDocCount() >= getMinDocCount()) {
-                        top.add(bucket);
+                try (
+                    BucketPriorityQueue<DelayedBucket<B>> top = new BucketPriorityQueue<>(
+                        getRequiredSize(),
+                        reduceContext.bigArrays(),
+                        comparator
+                    )
+                ) {
+                    thisReduceOrder = reduceBuckets(bucketsList, getThisReduceOrder(), bucket -> {
+                        if (bucket.getDocCount() >= getMinDocCount()) {
+                            final DelayedBucket<B> removed = top.insertWithOverflow(bucket);
+                            if (removed != null) {
+                                otherDocCount[0] += removed.getDocCount();
+                                removed.nonCompetitive(reduceContext);
+                            }
+                        }
+                    });
+                    // size is an integer as it should be <= getRequiredSize()
+                    final int size = (int) top.size();
+                    result = new ArrayList<>(size);
+                    for (int i = 0; i < size; i++) {
+                        result.add(top.pop().reduced(AbstractInternalTerms.this::reduceBucket, reduceContext));
                     }
-                });
-                result = top.build();
+                    Collections.reverse(result);
+                }
             } else {
                 result = new ArrayList<>();
-                thisReduceOrder = reduceBuckets(bucketsList, getThisReduceOrder(), reduceContext, bucket -> result.add(bucket.reduced()));
+                thisReduceOrder = reduceBuckets(
+                    bucketsList,
+                    getThisReduceOrder(),
+                    bucket -> result.add(bucket.reduced(AbstractInternalTerms.this::reduceBucket, reduceContext))
+                );
             }
             for (B r : result) {
                 if (sumDocCountError == -1) {
diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java
deleted file mode 100644
index edd9d4a824da..000000000000
--- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-package org.elasticsearch.search.builder;
-
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.common.io.stream.StreamInput;
-
-import java.io.IOException;
-
-public class SearchSourceBuilderException extends ElasticsearchException {
-
-    public SearchSourceBuilderException(String msg) {
-        super(msg);
-    }
-
-    public SearchSourceBuilderException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
-
-    public SearchSourceBuilderException(StreamInput in) throws IOException {
-        super(in);
-    }
-}
diff --git a/server/src/main/java/org/elasticsearch/search/query/QueryPhaseCollector.java b/server/src/main/java/org/elasticsearch/search/query/QueryPhaseCollector.java
index b63b961ed7b6..00b523d4b2a3 100644
--- a/server/src/main/java/org/elasticsearch/search/query/QueryPhaseCollector.java
+++ b/server/src/main/java/org/elasticsearch/search/query/QueryPhaseCollector.java
@@ -189,14 +189,10 @@ public LeafCollector getLeafCollector(LeafReaderContext context) throws IOExcept
             return new FilterLeafCollector(topDocsLeafCollector) {
                 @Override
                 public void setScorer(Scorable scorer) throws IOException {
-                    super.setScorer(new FilterScorable(scorer) {
-                        @Override
-                        public void setMinCompetitiveScore(float minScore) {
-                            // Ignore calls to setMinCompetitiveScore. The top docs collector may try to skip low
-                            // scoring hits, but the overall score_mode won't allow it because an aggs collector
-                            // was originally provided which never supports TOP_SCORES is not supported for aggs
-                        }
-                    });
+                    // Ignore calls to setMinCompetitiveScore. The top docs collector may try to skip low
+                    // scoring hits, but the overall score_mode won't allow it because an aggs collector
+                    // was originally provided which never supports TOP_SCORES is not supported for aggs
+                    super.setScorer(wrapToIgnoreMinCompetitiveScore(scorer));
                 }
 
                 @Override
@@ -208,6 +204,13 @@ public DocIdSetIterator competitiveIterator() throws IOException {
         return new CompositeLeafCollector(postFilterBits, topDocsLeafCollector, aggsLeafCollector);
     }
 
+    private static FilterScorable wrapToIgnoreMinCompetitiveScore(Scorable scorer) {
+        return new FilterScorable(scorer) {
+            @Override
+            public void setMinCompetitiveScore(float minScore) {}
+        };
+    }
+
     private class TopDocsLeafCollector implements LeafCollector {
         private final Bits postFilterBits;
         private final LeafCollector topDocsLeafCollector;
@@ -262,14 +265,10 @@ public void setScorer(Scorable scorer) throws IOException {
             if (cacheScores && topDocsLeafCollector != null && aggsLeafCollector != null) {
                 scorer = ScoreCachingWrappingScorer.wrap(scorer);
             }
-            scorer = new FilterScorable(scorer) {
-                @Override
-                public void setMinCompetitiveScore(float minScore) {
-                    // Ignore calls to setMinCompetitiveScore so that if the top docs collector
-                    // wants to skip low-scoring hits, the aggs collector still sees all hits.
-                    // this is important also for terminate_after in case used when total hits tracking is early terminated.
-                }
-            };
+            // Ignore calls to setMinCompetitiveScore so that if the top docs collector
+            // wants to skip low-scoring hits, the aggs collector still sees all hits.
+            // this is important also for terminate_after in case used when total hits tracking is early terminated.
+            scorer = wrapToIgnoreMinCompetitiveScore(scorer);
             if (topDocsLeafCollector != null) {
                 topDocsLeafCollector.setScorer(scorer);
             }
diff --git a/server/src/main/java/org/elasticsearch/transport/ClusterConnectionManager.java b/server/src/main/java/org/elasticsearch/transport/ClusterConnectionManager.java
index 4d6a66b6ec07..da8f7b25e519 100644
--- a/server/src/main/java/org/elasticsearch/transport/ClusterConnectionManager.java
+++ b/server/src/main/java/org/elasticsearch/transport/ClusterConnectionManager.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ContextPreservingActionListener;
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.common.ReferenceDocs;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
 import org.elasticsearch.common.util.concurrent.ListenableFuture;
@@ -237,7 +238,13 @@ private void connectToNodeOrRetry(
                                     if (connectingRefCounter.hasReferences() == false) {
                                         logger.trace("connection manager shut down, closing transport connection to [{}]", node);
                                     } else if (conn.hasReferences()) {
-                                        logger.info("transport connection to [{}] closed by remote", node.descriptionWithoutAttributes());
+                                        logger.info(
+                                            """
+                                                transport connection to [{}] closed by remote; \
+                                                if unexpected, see [{}] for troubleshooting guidance""",
+                                            node.descriptionWithoutAttributes(),
+                                            ReferenceDocs.NETWORK_DISCONNECT_TROUBLESHOOTING
+                                        );
                                         // In production code we only close connections via ref-counting, so this message confirms that a
                                         // 'node-left ... reason: disconnected' event was caused by external factors. Put differently, if a
                                         // node leaves the cluster with "reason: disconnected" but without this message being logged then
diff --git a/server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java b/server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java
index 3c74e4685150..6b5f1786f669 100644
--- a/server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java
+++ b/server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java
@@ -148,7 +148,10 @@ void collectNodes(ActionListener<Function<String, DiscoveryNode>> listener) {
                         }), RemoteClusterNodesAction.Response::new, TransportResponseHandler.TRANSPORT_WORKER)
                     );
                 } else {
-                    final ClusterStateRequest request = new ClusterStateRequest();
+                    final ClusterStateRequest request = new ClusterStateRequest(
+                        /* Timeout doesn't really matter with .local(true) */
+                        TimeValue.THIRTY_SECONDS
+                    );
                     request.clear();
                     request.nodes(true);
                     request.local(true); // run this on the node that gets the request it's as good as any other
diff --git a/server/src/main/java/org/elasticsearch/transport/SniffConnectionStrategy.java b/server/src/main/java/org/elasticsearch/transport/SniffConnectionStrategy.java
index 75903b5bf72a..c25c06570638 100644
--- a/server/src/main/java/org/elasticsearch/transport/SniffConnectionStrategy.java
+++ b/server/src/main/java/org/elasticsearch/transport/SniffConnectionStrategy.java
@@ -31,6 +31,7 @@
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.core.Booleans;
 import org.elasticsearch.core.IOUtils;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -116,6 +117,8 @@ public class SniffConnectionStrategy extends RemoteConnectionStrategy {
 
     static final int CHANNELS_PER_CONNECTION = 6;
 
+    private static final TimeValue SNIFF_REQUEST_TIMEOUT = TimeValue.THIRTY_SECONDS; // TODO make configurable?
+
     private static final Predicate<DiscoveryNode> DEFAULT_NODE_PREDICATE = (node) -> Version.CURRENT.isCompatible(node.getVersion())
         && (node.isMasterNode() == false || node.canContainData() || node.isIngestNode());
 
@@ -317,7 +320,7 @@ private void collectRemoteNodes(Iterator<Supplier<DiscoveryNode>> seedNodesSuppl
                     sniffResponseHandler = new RemoteClusterNodesSniffResponseHandler(connection, listener, seedNodesSuppliers);
                 } else {
                     action = ClusterStateAction.NAME;
-                    final ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+                    final ClusterStateRequest clusterStateRequest = new ClusterStateRequest(SNIFF_REQUEST_TIMEOUT);
                     clusterStateRequest.clear();
                     clusterStateRequest.nodes(true);
                     request = clusterStateRequest;
diff --git a/server/src/main/resources/org/elasticsearch/TransportVersions.csv b/server/src/main/resources/org/elasticsearch/TransportVersions.csv
index 88bf3232a2b1..19528a9719e2 100644
--- a/server/src/main/resources/org/elasticsearch/TransportVersions.csv
+++ b/server/src/main/resources/org/elasticsearch/TransportVersions.csv
@@ -71,6 +71,7 @@
 7.17.21,7172199
 7.17.22,7172299
 7.17.23,7172399
+7.17.24,7172499
 8.0.0,8000099
 8.0.1,8000199
 8.1.0,8010099
diff --git a/server/src/main/resources/org/elasticsearch/common/reference-docs-links.json b/server/src/main/resources/org/elasticsearch/common/reference-docs-links.json
index cc0bc5e2257c..4da6de7f7b56 100644
--- a/server/src/main/resources/org/elasticsearch/common/reference-docs-links.json
+++ b/server/src/main/resources/org/elasticsearch/common/reference-docs-links.json
@@ -4,6 +4,7 @@
   "UNSTABLE_CLUSTER_TROUBLESHOOTING": "troubleshooting-unstable-cluster.html",
   "LAGGING_NODE_TROUBLESHOOTING": "troubleshooting-unstable-cluster.html#troubleshooting-unstable-cluster-lagging",
   "SHARD_LOCK_TROUBLESHOOTING": "troubleshooting-unstable-cluster.html#troubleshooting-unstable-cluster-shardlockobtainfailedexception",
+  "NETWORK_DISCONNECT_TROUBLESHOOTING": "troubleshooting-unstable-cluster.html#troubleshooting-unstable-cluster-network",
   "CONCURRENT_REPOSITORY_WRITERS": "diagnosing-corrupted-repositories.html",
   "ARCHIVE_INDICES": "archive-indices.html",
   "HTTP_TRACER": "modules-network.html#http-rest-request-tracer",
diff --git a/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv b/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv
index f89bbb571263..2e684719688f 100644
--- a/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv
+++ b/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv
@@ -71,6 +71,7 @@
 7.17.21,7172199
 7.17.22,7172299
 7.17.23,7172399
+7.17.24,7172499
 8.0.0,8000099
 8.0.1,8000199
 8.1.0,8010099
diff --git a/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
index 58f85474f38e..5df8fa45ed20 100644
--- a/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
+++ b/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
@@ -781,7 +781,7 @@ public void testIds() {
         ids.put(125, TcpTransport.HttpRequestOnTransportException.class);
         ids.put(126, org.elasticsearch.index.mapper.MapperParsingException.class);
         ids.put(127, null); // was org.elasticsearch.search.SearchContextException.class
-        ids.put(128, org.elasticsearch.search.builder.SearchSourceBuilderException.class);
+        ids.put(128, null); // was org.elasticsearch.search.builder.SearchSourceBuilderException.class
         ids.put(129, null); // was org.elasticsearch.index.engine.EngineClosedException.class
         ids.put(130, org.elasticsearch.action.NoShardAvailableActionException.class);
         ids.put(131, org.elasticsearch.action.UnavailableShardsException.class);
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequestTests.java
index dc1528e87f23..78f6f8d429b1 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequestTests.java
@@ -35,6 +35,7 @@ public class AddVotingConfigExclusionsRequestTests extends ESTestCase {
 
     public void testSerializationForNodeIdOrNodeName() throws IOException {
         AddVotingConfigExclusionsRequest originalRequest = new AddVotingConfigExclusionsRequest(
+            TEST_REQUEST_TIMEOUT,
             new String[] { "nodeId1", "nodeId2" },
             Strings.EMPTY_ARRAY,
             TimeValue.ZERO
@@ -49,7 +50,7 @@ public void testSerializationForNodeIdOrNodeName() throws IOException {
         assertThat(deserialized.getNodeNames(), equalTo(originalRequest.getNodeNames()));
         assertThat(deserialized.getTimeout(), equalTo(originalRequest.getTimeout()));
 
-        originalRequest = new AddVotingConfigExclusionsRequest("nodeName1", "nodeName2");
+        originalRequest = new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "nodeName1", "nodeName2");
         deserialized = copyWriteable(originalRequest, writableRegistry(), AddVotingConfigExclusionsRequest::new);
 
         assertThat(deserialized.getNodeIds(), equalTo(originalRequest.getNodeIds()));
@@ -80,17 +81,26 @@ public void testResolve() {
             .build();
 
         assertThat(
-            new AddVotingConfigExclusionsRequest("local", "other1", "other2").resolveVotingConfigExclusions(clusterState),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "local", "other1", "other2").resolveVotingConfigExclusions(
+                clusterState
+            ),
             containsInAnyOrder(localNodeExclusion, otherNode1Exclusion, otherNode2Exclusion)
         );
-        assertThat(new AddVotingConfigExclusionsRequest("local").resolveVotingConfigExclusions(clusterState), contains(localNodeExclusion));
         assertThat(
-            new AddVotingConfigExclusionsRequest("other1", "other2").resolveVotingConfigExclusions(clusterState),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "local").resolveVotingConfigExclusions(clusterState),
+            contains(localNodeExclusion)
+        );
+        assertThat(
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "other1", "other2").resolveVotingConfigExclusions(clusterState),
             containsInAnyOrder(otherNode1Exclusion, otherNode2Exclusion)
         );
         assertThat(
-            new AddVotingConfigExclusionsRequest(Strings.EMPTY_ARRAY, new String[] { "other1", "other2" }, TimeValue.ZERO)
-                .resolveVotingConfigExclusions(clusterState),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                Strings.EMPTY_ARRAY,
+                new String[] { "other1", "other2" },
+                TimeValue.ZERO
+            ).resolveVotingConfigExclusions(clusterState),
             containsInAnyOrder(otherNode1Exclusion, otherNode2Exclusion)
         );
     }
@@ -99,7 +109,7 @@ public void testResolveAllNodeIdentifiersNullOrEmpty() {
         assertThat(
             expectThrows(
                 IllegalArgumentException.class,
-                () -> new AddVotingConfigExclusionsRequest(Strings.EMPTY_ARRAY, Strings.EMPTY_ARRAY, TimeValue.ZERO)
+                () -> new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, Strings.EMPTY_ARRAY, Strings.EMPTY_ARRAY, TimeValue.ZERO)
             ).getMessage(),
             equalTo(NODE_IDENTIFIERS_INCORRECTLY_SET_MSG)
         );
@@ -109,7 +119,12 @@ public void testResolveMoreThanOneNodeIdentifiersSet() {
         assertThat(
             expectThrows(
                 IllegalArgumentException.class,
-                () -> new AddVotingConfigExclusionsRequest(new String[] { "nodeId" }, new String[] { "nodeName" }, TimeValue.ZERO)
+                () -> new AddVotingConfigExclusionsRequest(
+                    TEST_REQUEST_TIMEOUT,
+                    new String[] { "nodeId" },
+                    new String[] { "nodeName" },
+                    TimeValue.ZERO
+                )
             ).getMessage(),
             equalTo(NODE_IDENTIFIERS_INCORRECTLY_SET_MSG)
         );
@@ -143,14 +158,22 @@ public void testResolveByNodeIds() {
             .build();
 
         assertThat(
-            new AddVotingConfigExclusionsRequest(new String[] { "nodeId1", "nodeId2" }, Strings.EMPTY_ARRAY, TimeValue.ZERO)
-                .resolveVotingConfigExclusions(clusterState),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                new String[] { "nodeId1", "nodeId2" },
+                Strings.EMPTY_ARRAY,
+                TimeValue.ZERO
+            ).resolveVotingConfigExclusions(clusterState),
             containsInAnyOrder(node1Exclusion, node2Exclusion)
         );
 
         assertThat(
-            new AddVotingConfigExclusionsRequest(new String[] { "nodeId1", "unresolvableNodeId" }, Strings.EMPTY_ARRAY, TimeValue.ZERO)
-                .resolveVotingConfigExclusions(clusterState),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                new String[] { "nodeId1", "unresolvableNodeId" },
+                Strings.EMPTY_ARRAY,
+                TimeValue.ZERO
+            ).resolveVotingConfigExclusions(clusterState),
             containsInAnyOrder(node1Exclusion, unresolvableVotingConfigExclusion)
         );
     }
@@ -183,12 +206,16 @@ public void testResolveByNodeNames() {
             .build();
 
         assertThat(
-            new AddVotingConfigExclusionsRequest("nodeName1", "nodeName2").resolveVotingConfigExclusions(clusterState),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "nodeName1", "nodeName2").resolveVotingConfigExclusions(
+                clusterState
+            ),
             containsInAnyOrder(node1Exclusion, node2Exclusion)
         );
 
         assertThat(
-            new AddVotingConfigExclusionsRequest("nodeName1", "unresolvableNodeName").resolveVotingConfigExclusions(clusterState),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "nodeName1", "unresolvableNodeName").resolveVotingConfigExclusions(
+                clusterState
+            ),
             containsInAnyOrder(node1Exclusion, unresolvableVotingConfigExclusion)
         );
     }
@@ -208,7 +235,7 @@ public void testResolveAmbiguousName() {
             .nodes(new Builder().add(node1).add(node2).localNodeId(node1.getId()))
             .build();
 
-        final var request = new AddVotingConfigExclusionsRequest("ambiguous-name");
+        final var request = new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "ambiguous-name");
         assertThat(
             expectThrows(IllegalArgumentException.class, () -> request.resolveVotingConfigExclusions(clusterState)).getMessage(),
             allOf(
@@ -248,8 +275,12 @@ public void testResolveRemoveExistingVotingConfigExclusions() {
             .build();
 
         assertThat(
-            new AddVotingConfigExclusionsRequest(new String[] { "nodeId1", "nodeId2" }, Strings.EMPTY_ARRAY, TimeValue.ZERO)
-                .resolveVotingConfigExclusions(clusterState),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                new String[] { "nodeId1", "nodeId2" },
+                Strings.EMPTY_ARRAY,
+                TimeValue.ZERO
+            ).resolveVotingConfigExclusions(clusterState),
             contains(node2Exclusion)
         );
     }
@@ -278,13 +309,17 @@ public void testResolveAndCheckMaximum() {
         final ClusterState clusterState = builder.build();
 
         assertThat(
-            new AddVotingConfigExclusionsRequest("local").resolveVotingConfigExclusionsAndCheckMaximum(clusterState, 2, "setting.name"),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "local").resolveVotingConfigExclusionsAndCheckMaximum(
+                clusterState,
+                2,
+                "setting.name"
+            ),
             contains(localNodeExclusion)
         );
         assertThat(
             expectThrows(
                 IllegalArgumentException.class,
-                () -> new AddVotingConfigExclusionsRequest("local").resolveVotingConfigExclusionsAndCheckMaximum(
+                () -> new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "local").resolveVotingConfigExclusionsAndCheckMaximum(
                     clusterState,
                     1,
                     "setting.name"
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequestTests.java
index 19f977c020e9..2bee4898e0e1 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequestTests.java
@@ -16,7 +16,7 @@
 
 public class ClearVotingConfigExclusionsRequestTests extends ESTestCase {
     public void testSerialization() throws IOException {
-        final ClearVotingConfigExclusionsRequest originalRequest = new ClearVotingConfigExclusionsRequest();
+        final ClearVotingConfigExclusionsRequest originalRequest = new ClearVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT);
         if (randomBoolean()) {
             originalRequest.setWaitForRemoval(randomBoolean());
         }
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsActionTests.java
index 02ec4dc508c0..3af51f3a2e79 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsActionTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsActionTests.java
@@ -180,7 +180,7 @@ public void testWithdrawsVoteFromANode() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest("other1"),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "other1"),
             expectSuccess(r -> {
                 assertNotNull(r);
                 final var state = clusterService.getClusterApplierService().state();
@@ -198,7 +198,7 @@ public void testWithdrawsVotesFromMultipleNodes() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest("other1", "other2"),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "other1", "other2"),
             expectSuccess(r -> {
                 assertNotNull(r);
                 final var state = clusterService.getClusterApplierService().state();
@@ -231,7 +231,7 @@ public void testReturnsImmediatelyIfVoteAlreadyWithdrawn() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest("other1"),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "other1"),
             expectSuccess(r -> {
                 assertNotNull(r);
                 final var finalState = clusterService.getClusterApplierService().state();
@@ -248,7 +248,12 @@ public void testExcludeAbsentNodesByNodeIds() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest(new String[] { "absent_id" }, Strings.EMPTY_ARRAY, TimeValue.timeValueSeconds(30)),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                new String[] { "absent_id" },
+                Strings.EMPTY_ARRAY,
+                TimeValue.timeValueSeconds(30)
+            ),
             expectSuccess(r -> {
                 final var state = clusterService.getClusterApplierService().state();
                 assertEquals(
@@ -268,7 +273,12 @@ public void testExcludeExistingNodesByNodeIds() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest(new String[] { "other1", "other2" }, Strings.EMPTY_ARRAY, TimeValue.timeValueSeconds(30)),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                new String[] { "other1", "other2" },
+                Strings.EMPTY_ARRAY,
+                TimeValue.timeValueSeconds(30)
+            ),
             expectSuccess(r -> {
                 assertNotNull(r);
                 final var state = clusterService.getClusterApplierService().state();
@@ -285,7 +295,7 @@ public void testExcludeAbsentNodesByNodeNames() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest("absent_node"),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "absent_node"),
             expectSuccess(r -> {
                 final var state = clusterService.getClusterApplierService().state();
                 assertEquals(
@@ -305,7 +315,7 @@ public void testExcludeExistingNodesByNodeNames() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest("other1", "other2"),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "other1", "other2"),
             expectSuccess(r -> {
                 assertNotNull(r);
                 final var state = clusterService.getClusterApplierService().state();
@@ -334,8 +344,13 @@ public void testTriggersReconfigurationEvenIfAllExclusionsAlreadyAddedButStillIn
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
             randomFrom(
-                new AddVotingConfigExclusionsRequest("other1"),
-                new AddVotingConfigExclusionsRequest(new String[] { "other1" }, Strings.EMPTY_ARRAY, TimeValue.timeValueSeconds(30))
+                new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "other1"),
+                new AddVotingConfigExclusionsRequest(
+                    TEST_REQUEST_TIMEOUT,
+                    new String[] { "other1" },
+                    Strings.EMPTY_ARRAY,
+                    TimeValue.timeValueSeconds(30)
+                )
             ),
             expectSuccess(r -> {
                 assertNotNull(r);
@@ -368,7 +383,12 @@ public void testExcludeByNodeIdSucceedsEvenIfAllExclusionsAlreadyAdded() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest(new String[] { "other1" }, Strings.EMPTY_ARRAY, TimeValue.timeValueSeconds(30)),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                new String[] { "other1" },
+                Strings.EMPTY_ARRAY,
+                TimeValue.timeValueSeconds(30)
+            ),
             expectSuccess(r -> {
                 assertNotNull(r);
                 final var finalState = clusterService.getClusterApplierService().state();
@@ -400,7 +420,7 @@ public void testExcludeByNodeNameSucceedsEvenIfAllExclusionsAlreadyAdded() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest("other1"),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "other1"),
             expectSuccess(r -> {
                 assertNotNull(r);
                 final var finalState = clusterService.getClusterApplierService().state();
@@ -457,7 +477,7 @@ public void testReturnsErrorIfMaximumExclusionCountExceeded() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest("other1", "other2"),
+            new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, "other1", "other2"),
             expectError(e -> {
                 final Throwable rootCause = e.getRootCause();
                 assertThat(rootCause, instanceOf(IllegalArgumentException.class));
@@ -485,7 +505,12 @@ public void testTimesOut() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest(Strings.EMPTY_ARRAY, new String[] { "other1" }, TimeValue.timeValueMillis(100)),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                Strings.EMPTY_ARRAY,
+                new String[] { "other1" },
+                TimeValue.timeValueMillis(100)
+            ),
             expectError(e -> {
                 final Throwable rootCause = e.getRootCause();
                 assertThat(rootCause, instanceOf(ElasticsearchTimeoutException.class));
@@ -504,7 +529,12 @@ public void testCannotAddVotingConfigExclusionsWhenItIsDisabled() {
         transportService.sendRequest(
             localNode,
             TransportAddVotingConfigExclusionsAction.TYPE.name(),
-            new AddVotingConfigExclusionsRequest(Strings.EMPTY_ARRAY, new String[] { "other1" }, TimeValue.timeValueMillis(100)),
+            new AddVotingConfigExclusionsRequest(
+                TEST_REQUEST_TIMEOUT,
+                Strings.EMPTY_ARRAY,
+                new String[] { "other1" },
+                TimeValue.timeValueMillis(100)
+            ),
             expectError(e -> {
                 final Throwable rootCause = e.getRootCause();
                 assertThat(rootCause, instanceOf(IllegalStateException.class));
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsActionTests.java
index 22aa5e9869af..eb2d0ce98718 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsActionTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsActionTests.java
@@ -118,7 +118,9 @@ public void setupForTest() {
     public void testClearsVotingConfigExclusions() {
         final CountDownLatch countDownLatch = new CountDownLatch(1);
 
-        final ClearVotingConfigExclusionsRequest clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest();
+        final ClearVotingConfigExclusionsRequest clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest(
+            TEST_REQUEST_TIMEOUT
+        );
         clearVotingConfigExclusionsRequest.setWaitForRemoval(false);
         transportService.sendRequest(
             localNode,
@@ -136,7 +138,9 @@ public void testClearsVotingConfigExclusions() {
     public void testTimesOutIfWaitingForNodesThatAreNotRemoved() {
         final CountDownLatch countDownLatch = new CountDownLatch(1);
 
-        final ClearVotingConfigExclusionsRequest clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest();
+        final ClearVotingConfigExclusionsRequest clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest(
+            TEST_REQUEST_TIMEOUT
+        );
         clearVotingConfigExclusionsRequest.setTimeout(TimeValue.timeValueMillis(100));
         transportService.sendRequest(
             localNode,
@@ -165,7 +169,7 @@ public void testSucceedsIfNodesAreRemovedWhileWaiting() {
         transportService.sendRequest(
             localNode,
             TransportClearVotingConfigExclusionsAction.TYPE.name(),
-            new ClearVotingConfigExclusionsRequest(),
+            new ClearVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT),
             expectSuccess(r -> {
                 assertThat(clusterService.getClusterApplierService().state().getVotingConfigExclusions(), empty());
                 countDownLatch.countDown();
@@ -187,7 +191,7 @@ public void testCannotClearVotingConfigurationWhenItIsDisabled() {
         transportService.sendRequest(
             localNode,
             TransportClearVotingConfigExclusionsAction.TYPE.name(),
-            new ClearVotingConfigExclusionsRequest(),
+            new ClearVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT),
             expectError(e -> {
                 final Throwable rootCause = e.getRootCause();
                 assertThat(rootCause, instanceOf(IllegalStateException.class));
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesActionTests.java
index 3d88e4e6d6a0..831f033b8303 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesActionTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/TransportUpdateDesiredNodesActionTests.java
@@ -117,7 +117,14 @@ public void testUpdateDesiredNodes() {
                 .stream()
                 .map(DesiredNodeWithStatus::desiredNode)
                 .toList();
-            request = new UpdateDesiredNodesRequest(desiredNodes.historyID(), desiredNodes.version() + 1, updatedNodes, false);
+            request = new UpdateDesiredNodesRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT,
+                desiredNodes.historyID(),
+                desiredNodes.version() + 1,
+                updatedNodes,
+                false
+            );
         } else {
             request = randomUpdateDesiredNodesRequest();
         }
@@ -148,6 +155,8 @@ public void testUpdatesAreIdempotent() {
             Collections.shuffle(equivalentDesiredNodesList, random());
         }
         final UpdateDesiredNodesRequest equivalentDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             updateDesiredNodesRequest.getHistoryID(),
             updateDesiredNodesRequest.getVersion(),
             equivalentDesiredNodesList,
@@ -165,6 +174,8 @@ public void testUpdateSameHistoryAndVersionWithDifferentContentsFails() {
         final var latestDesiredNodes = TransportUpdateDesiredNodesAction.updateDesiredNodes(null, updateDesiredNodesRequest);
 
         final UpdateDesiredNodesRequest request = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             latestDesiredNodes.historyID(),
             latestDesiredNodes.version(),
             randomList(1, 10, DesiredNodesTestCase::randomDesiredNode),
@@ -182,6 +193,8 @@ public void testBackwardUpdatesFails() {
         final var updateDesiredNodesRequest = randomUpdateDesiredNodesRequest();
         final var latestDesiredNodes = TransportUpdateDesiredNodesAction.updateDesiredNodes(null, updateDesiredNodesRequest);
         final UpdateDesiredNodesRequest request = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             latestDesiredNodes.historyID(),
             latestDesiredNodes.version() - 1,
             List.copyOf(latestDesiredNodes.nodes().stream().map(DesiredNodeWithStatus::desiredNode).toList()),
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequestSerializationTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequestSerializationTests.java
index cf491c52b49d..4cc19260c7b0 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequestSerializationTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequestSerializationTests.java
@@ -20,7 +20,14 @@ protected Writeable.Reader<UpdateDesiredNodesRequest> instanceReader() {
 
     @Override
     protected UpdateDesiredNodesRequest mutateInstance(UpdateDesiredNodesRequest request) {
-        return new UpdateDesiredNodesRequest(request.getHistoryID(), request.getVersion() + 1, request.getNodes(), request.isDryRun());
+        return new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
+            request.getHistoryID(),
+            request.getVersion() + 1,
+            request.getNodes(),
+            request.isDryRun()
+        );
     }
 
     @Override
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequestTests.java
index df963829810e..2837b2a10762 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/desirednodes/UpdateDesiredNodesRequestTests.java
@@ -26,6 +26,8 @@
 public class UpdateDesiredNodesRequestTests extends ESTestCase {
     public void testValidation() {
         final UpdateDesiredNodesRequest updateDesiredNodesRequest = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             randomBoolean() ? "" : "     ",
             -1,
             randomBoolean() ? Collections.emptyList() : List.of(hotDesiredNode()),
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java
index 4a59ca93c14d..931e84b9e915 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequestTests.java
@@ -42,12 +42,12 @@ public void testSerialize() throws Exception {
     }
 
     public void testRequestReturnsHiddenIndicesByDefault() {
-        final ClusterHealthRequest defaultRequest = new ClusterHealthRequest();
+        final ClusterHealthRequest defaultRequest = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT);
         assertTrue(defaultRequest.indicesOptions().expandWildcardsHidden());
     }
 
     private ClusterHealthRequest randomRequest() {
-        ClusterHealthRequest request = new ClusterHealthRequest();
+        ClusterHealthRequest request = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT);
         request.waitForStatus(randomFrom(ClusterHealthStatus.values()));
         request.waitForNodes(randomFrom("", "<", "<=", ">", ">=") + between(0, 1000));
         request.waitForNoInitializingShards(randomBoolean());
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java
index f2a852a8bd96..b3cc363d21ce 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthActionTests.java
@@ -33,7 +33,7 @@ public class TransportClusterHealthActionTests extends ESTestCase {
 
     public void testWaitForInitializingShards() throws Exception {
         final String[] indices = { "test" };
-        final ClusterHealthRequest request = new ClusterHealthRequest();
+        final ClusterHealthRequest request = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT);
         request.waitForNoInitializingShards(true);
         ClusterState clusterState = randomClusterStateWithInitializingShards("test", 0);
         ClusterHealthResponse response = new ClusterHealthResponse("", indices, clusterState);
@@ -52,7 +52,7 @@ public void testWaitForInitializingShards() throws Exception {
 
     public void testWaitForAllShards() {
         final String[] indices = { "test" };
-        final ClusterHealthRequest request = new ClusterHealthRequest();
+        final ClusterHealthRequest request = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT);
         request.waitForActiveShards(ActiveShardCount.ALL);
 
         ClusterState clusterState = randomClusterStateWithInitializingShards("test", 1);
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequestSerializationTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequestSerializationTests.java
index 584ad10a5a16..932b0b7cbac6 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequestSerializationTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequestSerializationTests.java
@@ -38,7 +38,7 @@ protected PrevalidateNodeRemovalRequest mutateInstance(PrevalidateNodeRemovalReq
                 )
                 .setIds(request.getIds())
                 .setExternalIds(request.getExternalIds())
-                .build();
+                .build(TEST_REQUEST_TIMEOUT);
 
             case 1 -> PrevalidateNodeRemovalRequest.builder()
                 .setNames(request.getNames())
@@ -49,7 +49,7 @@ protected PrevalidateNodeRemovalRequest mutateInstance(PrevalidateNodeRemovalReq
                     )
                 )
                 .setExternalIds(request.getExternalIds())
-                .build();
+                .build(TEST_REQUEST_TIMEOUT);
 
             case 2 -> PrevalidateNodeRemovalRequest.builder()
                 .setNames(request.getNames())
@@ -60,7 +60,7 @@ protected PrevalidateNodeRemovalRequest mutateInstance(PrevalidateNodeRemovalReq
                         PrevalidateNodeRemovalRequestSerializationTests::randomStringArray
                     )
                 )
-                .build();
+                .build(TEST_REQUEST_TIMEOUT);
             default -> throw new IllegalStateException("unexpected value: " + i);
         };
     }
@@ -74,6 +74,6 @@ private static PrevalidateNodeRemovalRequest randomRequest() {
             .setNames(randomStringArray())
             .setIds(randomStringArray())
             .setExternalIds(randomStringArray())
-            .build();
+            .build(TEST_REQUEST_TIMEOUT);
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequestTests.java
index 27bc4a0f0bc2..60ba698ce14d 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/PrevalidateNodeRemovalRequestTests.java
@@ -18,24 +18,28 @@
 public class PrevalidateNodeRemovalRequestTests extends ESTestCase {
 
     public void testValidate() {
-        ActionRequestValidationException ex1 = PrevalidateNodeRemovalRequest.builder().build().validate();
+        ActionRequestValidationException ex1 = PrevalidateNodeRemovalRequest.builder().build(TEST_REQUEST_TIMEOUT).validate();
         assertNotNull(ex1);
         assertThat(ex1.validationErrors(), equalTo(List.of(PrevalidateNodeRemovalRequest.VALIDATION_ERROR_MSG_NO_QUERY_PARAM)));
 
-        ActionRequestValidationException ex2 = PrevalidateNodeRemovalRequest.builder().setNames("name1").setIds("id1").build().validate();
+        ActionRequestValidationException ex2 = PrevalidateNodeRemovalRequest.builder()
+            .setNames("name1")
+            .setIds("id1")
+            .build(TEST_REQUEST_TIMEOUT)
+            .validate();
         assertNotNull(ex2);
         assertThat(ex2.validationErrors(), equalTo(List.of(PrevalidateNodeRemovalRequest.VALIDATION_ERROR_MSG_ONLY_ONE_QUERY_PARAM)));
 
         ActionRequestValidationException ex3 = PrevalidateNodeRemovalRequest.builder()
             .setNames("name1")
             .setExternalIds("id1")
-            .build()
+            .build(TEST_REQUEST_TIMEOUT)
             .validate();
         assertNotNull(ex3);
         assertThat(ex3.validationErrors(), equalTo(List.of(PrevalidateNodeRemovalRequest.VALIDATION_ERROR_MSG_ONLY_ONE_QUERY_PARAM)));
 
-        assertNull(PrevalidateNodeRemovalRequest.builder().setNames("name1").build().validate());
-        assertNull(PrevalidateNodeRemovalRequest.builder().setIds("id1").build().validate());
-        assertNull(PrevalidateNodeRemovalRequest.builder().setExternalIds("external_id1").build().validate());
+        assertNull(PrevalidateNodeRemovalRequest.builder().setNames("name1").build(TEST_REQUEST_TIMEOUT).validate());
+        assertNull(PrevalidateNodeRemovalRequest.builder().setIds("id1").build(TEST_REQUEST_TIMEOUT).validate());
+        assertNull(PrevalidateNodeRemovalRequest.builder().setExternalIds("external_id1").build(TEST_REQUEST_TIMEOUT).validate());
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalActionTests.java
index d6e48104620c..a580fa17b6d8 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalActionTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/shutdown/TransportPrevalidateNodeRemovalActionTests.java
@@ -35,24 +35,32 @@ public void testResolveNodes() {
         DiscoveryNodes discoveryNodes = DiscoveryNodes.builder().add(node1).add(node2).build();
 
         assertThat(
-            resolveNodes(PrevalidateNodeRemovalRequest.builder().setNames(node1Name).build(), discoveryNodes),
+            resolveNodes(PrevalidateNodeRemovalRequest.builder().setNames(node1Name).build(TEST_REQUEST_TIMEOUT), discoveryNodes),
             equalTo(Set.of(node1))
         );
         assertThat(
-            resolveNodes(PrevalidateNodeRemovalRequest.builder().setIds(node1Id, node2Id).build(), discoveryNodes),
+            resolveNodes(PrevalidateNodeRemovalRequest.builder().setIds(node1Id, node2Id).build(TEST_REQUEST_TIMEOUT), discoveryNodes),
             equalTo(Set.of(node1, node2))
         );
         expectThrows(
             ResourceNotFoundException.class,
-            () -> resolveNodes(PrevalidateNodeRemovalRequest.builder().setNames(node1Name, node1Id).build(), discoveryNodes)
+            () -> resolveNodes(
+                PrevalidateNodeRemovalRequest.builder().setNames(node1Name, node1Id).build(TEST_REQUEST_TIMEOUT),
+                discoveryNodes
+            )
         );
         expectThrows(
             ResourceNotFoundException.class,
-            () -> resolveNodes(PrevalidateNodeRemovalRequest.builder().setIds(node1Name, node1Id).build(), discoveryNodes)
+            () -> resolveNodes(
+                PrevalidateNodeRemovalRequest.builder().setIds(node1Name, node1Id).build(TEST_REQUEST_TIMEOUT),
+                discoveryNodes
+            )
         );
         assertThat(
             resolveNodes(
-                PrevalidateNodeRemovalRequest.builder().setExternalIds(node1.getExternalId(), node2.getExternalId()).build(),
+                PrevalidateNodeRemovalRequest.builder()
+                    .setExternalIds(node1.getExternalId(), node2.getExternalId())
+                    .build(TEST_REQUEST_TIMEOUT),
                 discoveryNodes
             ),
             equalTo(Set.of(node1, node2))
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java
index 774093834e94..ed2660061f76 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java
@@ -63,13 +63,13 @@ private void doFromXContentTestWithRandomFields(boolean addRandomFields) throws
             );
             XContentParseException iae = expectThrows(XContentParseException.class, () -> {
                 try (var parser = createParser(xContentType.xContent(), mutated)) {
-                    ClusterUpdateSettingsRequest.fromXContent(parser);
+                    ClusterUpdateSettingsRequest.fromXContent(ClusterUpdateSettingsRequestTests::newTestRequest, parser);
                 }
             });
             assertThat(iae.getMessage(), containsString("[cluster_update_settings_request] unknown field [" + unsupportedField + "]"));
         } else {
             try (XContentParser parser = createParser(xContentType.xContent(), originalBytes)) {
-                ClusterUpdateSettingsRequest parsedRequest = ClusterUpdateSettingsRequest.fromXContent(parser);
+                var parsedRequest = ClusterUpdateSettingsRequest.fromXContent(ClusterUpdateSettingsRequestTests::newTestRequest, parser);
 
                 assertNull(parser.nextToken());
                 assertThat(parsedRequest.transientSettings(), equalTo(request.transientSettings()));
@@ -79,7 +79,7 @@ private void doFromXContentTestWithRandomFields(boolean addRandomFields) throws
     }
 
     private static ClusterUpdateSettingsRequest createTestItem() {
-        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
+        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         request.persistentSettings(ClusterUpdateSettingsResponseTests.randomClusterSettings(0, 2));
         request.transientSettings(ClusterUpdateSettingsResponseTests.randomClusterSettings(0, 2));
         return request;
@@ -119,11 +119,15 @@ public void testOperatorHandler() throws IOException {
             }""";
 
         try (XContentParser parser = createParser(XContentType.JSON.xContent(), oneSettingJSON)) {
-            ClusterUpdateSettingsRequest parsedRequest = ClusterUpdateSettingsRequest.fromXContent(parser);
+            var parsedRequest = ClusterUpdateSettingsRequest.fromXContent(ClusterUpdateSettingsRequestTests::newTestRequest, parser);
             assertThat(
                 action.modifiedKeys(parsedRequest),
                 containsInAnyOrder("indices.recovery.max_bytes_per_sec", "cluster.remote.cluster_one.seeds")
             );
         }
     }
+
+    public static ClusterUpdateSettingsRequest newTestRequest() {
+        return new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
+    }
 }
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateApiTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateApiTests.java
index b726910f5d8c..3c33e42ab94d 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateApiTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateApiTests.java
@@ -31,20 +31,20 @@ protected Settings nodeSettings() {
     }
 
     public void testWaitForMetadataVersion() throws Exception {
-        ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        ClusterStateRequest clusterStateRequest = new ClusterStateRequest(TEST_REQUEST_TIMEOUT);
         clusterStateRequest.waitForTimeout(TimeValue.timeValueHours(1));
         ClusterStateResponse response = clusterAdmin().state(clusterStateRequest).get(10L, TimeUnit.SECONDS);
         assertThat(response.isWaitForTimedOut(), is(false));
         long metadataVersion = response.getState().getMetadata().version();
 
         // Verify that cluster state api returns after the cluster settings have been updated:
-        clusterStateRequest = new ClusterStateRequest();
+        clusterStateRequest = new ClusterStateRequest(TEST_REQUEST_TIMEOUT);
         clusterStateRequest.waitForMetadataVersion(metadataVersion + 1);
 
         ActionFuture<ClusterStateResponse> future2 = clusterAdmin().state(clusterStateRequest);
         assertThat(future2.isDone(), is(false));
 
-        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         // Pick an arbitrary dynamic cluster setting and change it. Just to get metadata version incremented:
         updateSettingsRequest.transientSettings(Settings.builder().put("cluster.max_shards_per_node", 999));
         assertAcked(clusterAdmin().updateSettings(updateSettingsRequest).actionGet());
@@ -63,7 +63,7 @@ public void testWaitForMetadataVersion() throws Exception {
         assertThat(response.getState(), nullValue());
 
         // Remove transient setting, otherwise test fails with the reason that this test leaves state behind:
-        updateSettingsRequest = new ClusterUpdateSettingsRequest();
+        updateSettingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         updateSettingsRequest.transientSettings(Settings.builder().put("cluster.max_shards_per_node", (String) null));
         assertAcked(clusterAdmin().updateSettings(updateSettingsRequest).actionGet());
     }
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java
index 1b1535185bef..f30653fd7e6d 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java
@@ -29,7 +29,7 @@ public void testSerialization() throws Exception {
         for (int i = 0; i < iterations; i++) {
 
             IndicesOptions indicesOptions = IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean());
-            ClusterStateRequest clusterStateRequest = new ClusterStateRequest().routingTable(randomBoolean())
+            ClusterStateRequest clusterStateRequest = new ClusterStateRequest(TEST_REQUEST_TIMEOUT).routingTable(randomBoolean())
                 .metadata(randomBoolean())
                 .nodes(randomBoolean())
                 .blocks(randomBoolean())
@@ -68,7 +68,7 @@ public void testSerialization() throws Exception {
     }
 
     public void testWaitForMetadataVersion() {
-        ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        ClusterStateRequest clusterStateRequest = new ClusterStateRequest(TEST_REQUEST_TIMEOUT);
         expectThrows(
             IllegalArgumentException.class,
             () -> clusterStateRequest.waitForMetadataVersion(randomLongBetween(Long.MIN_VALUE, 0))
@@ -84,21 +84,27 @@ private static void assertOptionsMatch(IndicesOptions in, IndicesOptions out) {
     }
 
     public void testDescription() {
-        assertThat(new ClusterStateRequest().clear().getDescription(), equalTo("cluster state [master timeout [30s]]"));
+        assertThat(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).clear().getDescription(), equalTo("cluster state [master timeout [30s]]"));
         assertThat(
-            new ClusterStateRequest().masterNodeTimeout(TimeValue.timeValueMinutes(5)).getDescription(),
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).masterNodeTimeout(TimeValue.timeValueMinutes(5)).getDescription(),
             equalTo("cluster state [routing table, nodes, metadata, blocks, customs, master timeout [5m]]")
         );
-        assertThat(new ClusterStateRequest().clear().routingTable(true).getDescription(), containsString("routing table"));
-        assertThat(new ClusterStateRequest().clear().nodes(true).getDescription(), containsString("nodes"));
-        assertThat(new ClusterStateRequest().clear().metadata(true).getDescription(), containsString("metadata"));
-        assertThat(new ClusterStateRequest().clear().blocks(true).getDescription(), containsString("blocks"));
-        assertThat(new ClusterStateRequest().clear().customs(true).getDescription(), containsString("customs"));
-        assertThat(new ClusterStateRequest().local(true).getDescription(), containsString("local"));
         assertThat(
-            new ClusterStateRequest().waitForMetadataVersion(23L).getDescription(),
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).clear().routingTable(true).getDescription(),
+            containsString("routing table")
+        );
+        assertThat(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).clear().nodes(true).getDescription(), containsString("nodes"));
+        assertThat(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).clear().metadata(true).getDescription(), containsString("metadata"));
+        assertThat(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).clear().blocks(true).getDescription(), containsString("blocks"));
+        assertThat(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).clear().customs(true).getDescription(), containsString("customs"));
+        assertThat(new ClusterStateRequest(TEST_REQUEST_TIMEOUT).local(true).getDescription(), containsString("local"));
+        assertThat(
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(23L).getDescription(),
             containsString("wait for metadata version [23] with timeout [1m]")
         );
-        assertThat(new ClusterStateRequest().indices("foo", "bar").getDescription(), containsString("indices [foo, bar]"));
+        assertThat(
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).indices("foo", "bar").getDescription(),
+            containsString("indices [foo, bar]")
+        );
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/VersionStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/VersionStatsTests.java
index 20eae9833e4b..4ff99d17195a 100644
--- a/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/VersionStatsTests.java
+++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/VersionStatsTests.java
@@ -54,7 +54,7 @@ protected VersionStats mutateInstance(VersionStats instance) {
         return new VersionStats(instance.versionStats().stream().map(svs -> {
             return switch (randomIntBetween(1, 4)) {
                 case 1 -> new VersionStats.SingleVersionStats(
-                    IndexVersions.V_7_3_0,
+                    IndexVersions.V_8_3_0,
                     svs.indexCount,
                     svs.primaryShardCount,
                     svs.totalPrimaryByteCount
@@ -89,12 +89,12 @@ public void testCreation() {
 
         metadata = new Metadata.Builder().put(indexMeta("foo", IndexVersion.current(), 4), true)
             .put(indexMeta("bar", IndexVersion.current(), 3), true)
-            .put(indexMeta("baz", IndexVersions.V_7_0_0, 2), true)
+            .put(indexMeta("baz", IndexVersions.V_8_0_0, 2), true)
             .build();
         stats = VersionStats.of(metadata, Collections.emptyList());
         assertThat(stats.versionStats().size(), equalTo(2));
         VersionStats.SingleVersionStats s1 = new VersionStats.SingleVersionStats(IndexVersion.current(), 2, 7, 0);
-        VersionStats.SingleVersionStats s2 = new VersionStats.SingleVersionStats(IndexVersions.V_7_0_0, 1, 2, 0);
+        VersionStats.SingleVersionStats s2 = new VersionStats.SingleVersionStats(IndexVersions.V_8_0_0, 1, 2, 0);
         assertThat(stats.versionStats(), containsInAnyOrder(s1, s2));
 
         ShardId shardId = new ShardId("bar", "uuid", 0);
@@ -128,13 +128,14 @@ public void testCreation() {
             null,
             new ShardStats[] { shardStats },
             new SearchUsageStats(),
-            RepositoryUsageStats.EMPTY
+            RepositoryUsageStats.EMPTY,
+            null
         );
 
         stats = VersionStats.of(metadata, Collections.singletonList(nodeResponse));
         assertThat(stats.versionStats().size(), equalTo(2));
         s1 = new VersionStats.SingleVersionStats(IndexVersion.current(), 2, 7, 100);
-        s2 = new VersionStats.SingleVersionStats(IndexVersions.V_7_0_0, 1, 2, 0);
+        s2 = new VersionStats.SingleVersionStats(IndexVersions.V_8_0_0, 1, 2, 0);
         assertThat(stats.versionStats(), containsInAnyOrder(s1, s2));
     }
 
@@ -143,7 +144,7 @@ private static IndexMetadata indexMeta(String name, IndexVersion version, int pr
     }
 
     public static VersionStats randomInstance() {
-        List<IndexVersion> versions = List.of(IndexVersion.current(), IndexVersions.V_7_0_0, IndexVersions.V_7_1_0, IndexVersions.V_7_2_0);
+        List<IndexVersion> versions = List.of(IndexVersion.current(), IndexVersions.V_8_0_0, IndexVersions.V_8_1_0, IndexVersions.V_8_2_0);
         List<VersionStats.SingleVersionStats> stats = new ArrayList<>();
         for (IndexVersion v : versions) {
             VersionStats.SingleVersionStats s = new VersionStats.SingleVersionStats(
diff --git a/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeResponseTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeResponseTests.java
index c39cc6ebfd66..4edc6ce58948 100644
--- a/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeResponseTests.java
+++ b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeResponseTests.java
@@ -10,10 +10,8 @@
 
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.Version;
 import org.elasticsearch.common.Randomness;
 import org.elasticsearch.common.UUIDs;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.index.IndexMode;
@@ -23,7 +21,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -37,8 +34,6 @@
 import static org.elasticsearch.action.fieldcaps.FieldCapabilitiesIndexResponseTests.randomIndexResponsesWithMappingHash;
 import static org.elasticsearch.action.fieldcaps.FieldCapabilitiesIndexResponseTests.randomIndexResponsesWithoutMappingHash;
 import static org.elasticsearch.action.fieldcaps.FieldCapabilitiesIndexResponseTests.randomMappingHashToIndices;
-import static org.hamcrest.Matchers.anEmptyMap;
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.nullValue;
@@ -191,49 +186,6 @@ public void testSerializeNodeResponseBetweenOldNodes() throws IOException {
         }
     }
 
-    public void testReadNodeResponseFromPre82() throws Exception {
-        final Version minCompactVersion = Version.CURRENT.minimumCompatibilityVersion();
-        assertTrue("Remove this test once minCompactVersion >= 8.2.0", minCompactVersion.before(Version.V_8_2_0));
-        String base64 = "AwhpbmRleF8wMQIKYmx1ZV9maWVsZApibHVlX2ZpZWxkBGxvbmcAAQEAAAAJcmVkX2ZpZWxkCXJlZF9maWVsZAR0ZXh0AAEAAAAAAQhpbm"
-            + "RleF8wMgAACGluZGV4XzAzAgdfc2VxX25vB19zZXFfbm8EbG9uZwEBAQAAAAx5ZWxsb3dfZmllbGQMeWVsbG93X2ZpZWxkB2tleXdvcmQAAQEAAAABAAEI"
-            + "aW5kZXhfMTAGdXVpZF9hAQ==";
-        StreamInput in = StreamInput.wrap(Base64.getDecoder().decode(base64));
-        in.setTransportVersion(TransportVersions.V_8_1_0);
-        FieldCapabilitiesNodeResponse nodeResp = new FieldCapabilitiesNodeResponse(in);
-        assertThat(nodeResp.getUnmatchedShardIds(), equalTo(Set.of(new ShardId("index_10", "uuid_a", 1))));
-        assertThat(nodeResp.getFailures(), anEmptyMap());
-        assertThat(
-            nodeResp.getIndexResponses(),
-            contains(
-                new FieldCapabilitiesIndexResponse(
-                    "index_01",
-                    null,
-                    Map.of(
-                        "red_field",
-                        new IndexFieldCapabilities("red_field", "text", false, true, false, false, null, Map.of()),
-                        "blue_field",
-                        new IndexFieldCapabilities("blue_field", "long", false, true, true, false, null, Map.of())
-                    ),
-                    true,
-                    IndexMode.STANDARD
-                ),
-                new FieldCapabilitiesIndexResponse("index_02", null, Map.of(), false, IndexMode.STANDARD),
-                new FieldCapabilitiesIndexResponse(
-                    "index_03",
-                    null,
-                    Map.of(
-                        "yellow_field",
-                        new IndexFieldCapabilities("yellow_field", "keyword", false, true, true, false, null, Map.of()),
-                        "_seq_no",
-                        new IndexFieldCapabilities("_seq_no", "long", true, true, true, false, null, Map.of())
-                    ),
-                    true,
-                    IndexMode.STANDARD
-                )
-            )
-        );
-    }
-
     private static FieldCapabilitiesNodeResponse randomNodeResponse(List<FieldCapabilitiesIndexResponse> indexResponses) {
         int numUnmatched = randomIntBetween(0, 3);
         final Set<ShardId> unmatchedShardIds = new HashSet<>();
diff --git a/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java
index cc4d4de1e0f3..bdeef56eca89 100644
--- a/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java
+++ b/server/src/test/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesResponseTests.java
@@ -11,10 +11,8 @@
 import org.elasticsearch.ElasticsearchExceptionTests;
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
-import org.elasticsearch.Version;
 import org.elasticsearch.common.Randomness;
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.xcontent.ChunkedToXContent;
@@ -29,7 +27,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -40,8 +37,6 @@
 import static org.elasticsearch.action.fieldcaps.FieldCapabilitiesIndexResponseTests.randomIndexResponsesWithMappingHash;
 import static org.elasticsearch.action.fieldcaps.FieldCapabilitiesIndexResponseTests.randomIndexResponsesWithoutMappingHash;
 import static org.elasticsearch.action.fieldcaps.FieldCapabilitiesIndexResponseTests.randomMappingHashToIndices;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.nullValue;
@@ -246,46 +241,4 @@ public void testSerializeCCSResponseBetweenOldClusters() throws IOException {
             }
         }
     }
-
-    public void testReadCCSResponseFromPre82() throws Exception {
-        final Version minCompactVersion = Version.CURRENT.minimumCompatibilityVersion();
-        assertTrue("Remove this test once minCompactVersion >= 8.2.0", minCompactVersion.before(Version.V_8_2_0));
-        String base64 = "AAADCGluZGV4XzAxAgpibHVlX2ZpZWxkCmJsdWVfZmllbGQEbG9uZwABAQAAAAlyZWRfZmllbGQJcmVkX2ZpZWxkBHRleHQAAQAAAAABC"
-            + "GluZGV4XzAyAAAIaW5kZXhfMDMCDHllbGxvd19maWVsZAx5ZWxsb3dfZmllbGQHa2V5d29yZAABAQAAAAdfc2VxX25vB19zZXFfbm8EbG9uZwEBAQAAAA"
-            + "EAAAAAAAAAAAA=";
-        StreamInput in = StreamInput.wrap(Base64.getDecoder().decode(base64));
-        in.setTransportVersion(TransportVersions.V_8_1_0);
-        FieldCapabilitiesResponse nodeResp = new FieldCapabilitiesResponse(in);
-        assertThat(nodeResp.getFailures(), empty());
-        assertThat(
-            nodeResp.getIndexResponses(),
-            contains(
-                new FieldCapabilitiesIndexResponse(
-                    "index_01",
-                    null,
-                    Map.of(
-                        "red_field",
-                        new IndexFieldCapabilities("red_field", "text", false, true, false, false, null, Map.of()),
-                        "blue_field",
-                        new IndexFieldCapabilities("blue_field", "long", false, true, true, false, null, Map.of())
-                    ),
-                    true,
-                    IndexMode.STANDARD
-                ),
-                new FieldCapabilitiesIndexResponse("index_02", null, Map.of(), false, IndexMode.STANDARD),
-                new FieldCapabilitiesIndexResponse(
-                    "index_03",
-                    null,
-                    Map.of(
-                        "yellow_field",
-                        new IndexFieldCapabilities("yellow_field", "keyword", false, true, true, false, null, Map.of()),
-                        "_seq_no",
-                        new IndexFieldCapabilities("_seq_no", "long", true, true, true, false, null, Map.of())
-                    ),
-                    true,
-                    IndexMode.STANDARD
-                )
-            )
-        );
-    }
 }
diff --git a/server/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java b/server/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java
index 576b9fb7224d..9e021e4ec1b9 100644
--- a/server/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.action.ingest;
 
-import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -19,12 +18,13 @@
 import org.elasticsearch.xcontent.XContentType;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+
+import static org.elasticsearch.ingest.IngestPipelineTestUtils.putJsonPipelineRequest;
 
 public class PutPipelineRequestTests extends ESTestCase {
 
     public void testSerializationWithXContent() throws IOException {
-        PutPipelineRequest request = new PutPipelineRequest("1", new BytesArray("{}".getBytes(StandardCharsets.UTF_8)), XContentType.JSON);
+        PutPipelineRequest request = putJsonPipelineRequest("1", "{}");
         assertEquals(XContentType.JSON, request.getXContentType());
 
         BytesStreamOutput output = new BytesStreamOutput();
diff --git a/server/src/test/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportActionTests.java b/server/src/test/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportActionTests.java
index c2ff59f0ccbe..64bde9f8cc0b 100644
--- a/server/src/test/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportActionTests.java
+++ b/server/src/test/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportActionTests.java
@@ -56,9 +56,9 @@ public void testRejectImmutableConflictClusterStateUpdate() {
         handler.doExecute(mock(Task.class), new DummyRequest(), future);
         assertNotNull(future.actionGet());
 
-        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest().persistentSettings(
-            Settings.builder().put("a", "a value").build()
-        ).transientSettings(Settings.builder().put("e", "e value").build());
+        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .persistentSettings(Settings.builder().put("a", "a value").build())
+            .transientSettings(Settings.builder().put("e", "e value").build());
 
         FakeReservedStateAwareAction action = new FakeReservedStateAwareAction(
             "internal:testClusterSettings",
@@ -80,9 +80,9 @@ public void onFailure(Exception e) {
             }
         })).getMessage().contains("with errors: [[a] set as read-only by [namespace_one], " + "[e] set as read-only by [namespace_two]"));
 
-        ClusterUpdateSettingsRequest okRequest = new ClusterUpdateSettingsRequest().persistentSettings(
-            Settings.builder().put("m", "m value").build()
-        ).transientSettings(Settings.builder().put("n", "n value").build());
+        ClusterUpdateSettingsRequest okRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .persistentSettings(Settings.builder().put("m", "m value").build())
+            .transientSettings(Settings.builder().put("n", "n value").build());
 
         // this should just work, no conflicts
         action.doExecute(mock(Task.class), okRequest, new ActionListener<>() {
diff --git a/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java
index 6568464705d9..890614fc8021 100644
--- a/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java
+++ b/server/src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java
@@ -840,9 +840,9 @@ public void testRejectImmutableConflictClusterStateUpdate() {
         // nothing should happen here, since the request doesn't touch any of the immutable state keys
         noHandler.validateForReservedState(new Request(), clusterState);
 
-        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest().persistentSettings(
-            Settings.builder().put("a", "a value").build()
-        ).transientSettings(Settings.builder().put("e", "e value").build());
+        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .persistentSettings(Settings.builder().put("a", "a value").build())
+            .transientSettings(Settings.builder().put("e", "e value").build());
 
         FakeClusterStateUpdateAction action = new FakeClusterStateUpdateAction(
             "internal:testClusterSettings",
@@ -859,9 +859,9 @@ public void testRejectImmutableConflictClusterStateUpdate() {
                 .contains("with errors: [[a] set as read-only by [namespace_one], " + "[e] set as read-only by [namespace_two]")
         );
 
-        ClusterUpdateSettingsRequest okRequest = new ClusterUpdateSettingsRequest().persistentSettings(
-            Settings.builder().put("m", "m value").build()
-        ).transientSettings(Settings.builder().put("n", "n value").build());
+        ClusterUpdateSettingsRequest okRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .persistentSettings(Settings.builder().put("m", "m value").build())
+            .transientSettings(Settings.builder().put("n", "n value").build());
 
         // this should just work, no conflicts
         action.validateForReservedState(okRequest, clusterState);
diff --git a/server/src/test/java/org/elasticsearch/client/internal/ParentTaskAssigningClientTests.java b/server/src/test/java/org/elasticsearch/client/internal/ParentTaskAssigningClientTests.java
index 600c09be2c12..8446fed6dddd 100644
--- a/server/src/test/java/org/elasticsearch/client/internal/ParentTaskAssigningClientTests.java
+++ b/server/src/test/java/org/elasticsearch/client/internal/ParentTaskAssigningClientTests.java
@@ -98,7 +98,11 @@ public <Request extends ActionRequest, Response extends TransportResponse> void
                     UnsupportedOperationException.class,
                     safeAwaitFailure(
                         ClusterStateResponse.class,
-                        listener -> remoteClusterClient.execute(ClusterStateAction.REMOTE_TYPE, new ClusterStateRequest(), listener)
+                        listener -> remoteClusterClient.execute(
+                            ClusterStateAction.REMOTE_TYPE,
+                            new ClusterStateRequest(TEST_REQUEST_TIMEOUT),
+                            listener
+                        )
                     )
                 ).getMessage()
             );
diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java
index 4b96e7d44747..a225d8282124 100644
--- a/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java
@@ -343,7 +343,7 @@ private static ClusterState createState(final int numNodes, final boolean isLoca
         return ClusterState.builder(TEST_CLUSTER_NAME)
             .nodes(createDiscoveryNodes(numNodes, isLocalMaster))
             .metadata(metadata)
-            .routingTable(createRoutingTable(1, metadata))
+            .routingTable(createRoutingTable(metadata))
             .build();
     }
 
@@ -498,8 +498,8 @@ private static IndexMetadata createIndexMetadata(final Index index, final long v
     }
 
     // Create the routing table for a cluster state.
-    private static RoutingTable createRoutingTable(final long version, final Metadata metadata) {
-        final RoutingTable.Builder builder = RoutingTable.builder(TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY).version(version);
+    private static RoutingTable createRoutingTable(final Metadata metadata) {
+        final RoutingTable.Builder builder = RoutingTable.builder(TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY);
         for (IndexMetadata indexMetadata : metadata.indices().values()) {
             builder.addAsNew(indexMetadata);
         }
diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java
index 7ef9e44eb8e7..bc673b735c18 100644
--- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java
@@ -159,7 +159,7 @@ public void testClusterHealthWaitsForClusterStateApplication() throws Interrupte
         ActionTestUtils.execute(
             action,
             new CancellableTask(1, "direct", TransportClusterHealthAction.NAME, "", TaskId.EMPTY_TASK_ID, Map.of()),
-            new ClusterHealthRequest().waitForGreenStatus(),
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT).waitForGreenStatus(),
             listener
         );
 
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamFailureStoreTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamFailureStoreTests.java
new file mode 100644
index 000000000000..f5334f903af6
--- /dev/null
+++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamFailureStoreTests.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.cluster.metadata;
+
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.test.AbstractXContentSerializingTestCase;
+import org.elasticsearch.xcontent.XContentParser;
+
+import java.io.IOException;
+
+public class DataStreamFailureStoreTests extends AbstractXContentSerializingTestCase<DataStreamFailureStore> {
+
+    @Override
+    protected Writeable.Reader<DataStreamFailureStore> instanceReader() {
+        return DataStreamFailureStore::new;
+    }
+
+    @Override
+    protected DataStreamFailureStore createTestInstance() {
+        return randomFailureStore();
+    }
+
+    @Override
+    protected DataStreamFailureStore mutateInstance(DataStreamFailureStore instance) throws IOException {
+        return new DataStreamFailureStore(instance.enabled() == false);
+    }
+
+    @Override
+    protected DataStreamFailureStore doParseInstance(XContentParser parser) throws IOException {
+        return DataStreamFailureStore.fromXContent(parser);
+    }
+
+    static DataStreamFailureStore randomFailureStore() {
+        return new DataStreamFailureStore(randomBoolean());
+    }
+}
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamOptionsTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamOptionsTests.java
new file mode 100644
index 000000000000..8a7cf2329b86
--- /dev/null
+++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamOptionsTests.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.cluster.metadata;
+
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.test.AbstractXContentSerializingTestCase;
+import org.elasticsearch.xcontent.XContentParser;
+
+import java.io.IOException;
+
+public class DataStreamOptionsTests extends AbstractXContentSerializingTestCase<DataStreamOptions> {
+
+    @Override
+    protected Writeable.Reader<DataStreamOptions> instanceReader() {
+        return DataStreamOptions::read;
+    }
+
+    @Override
+    protected DataStreamOptions createTestInstance() {
+        return new DataStreamOptions(randomBoolean() ? null : DataStreamFailureStoreTests.randomFailureStore());
+    }
+
+    @Override
+    protected DataStreamOptions mutateInstance(DataStreamOptions instance) throws IOException {
+        var failureStore = instance.getFailureStore();
+        if (failureStore == null) {
+            failureStore = DataStreamFailureStoreTests.randomFailureStore();
+        } else {
+            failureStore = randomBoolean() ? null : new DataStreamFailureStore(failureStore.enabled() == false);
+        }
+        return new DataStreamOptions(failureStore);
+    }
+
+    @Override
+    protected DataStreamOptions doParseInstance(XContentParser parser) throws IOException {
+        return DataStreamOptions.fromXContent(parser);
+    }
+}
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodesTestCase.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodesTestCase.java
index d99d787a1d24..8da7418a4d42 100644
--- a/server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodesTestCase.java
+++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DesiredNodesTestCase.java
@@ -117,6 +117,8 @@ public static void assertDesiredNodesStatusIsCorrect(
 
     public static UpdateDesiredNodesRequest randomUpdateDesiredNodesRequest() {
         return new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
             UUIDs.randomBase64UUID(random()),
             randomLongBetween(0, Long.MAX_VALUE - 1000),
             randomList(1, 100, DesiredNodesTestCase::randomDesiredNode),
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java
index 01394a7abbcd..2190f8f20e76 100644
--- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java
@@ -39,6 +39,7 @@
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexModule;
 import org.elasticsearch.index.IndexNotFoundException;
@@ -1313,6 +1314,8 @@ public void testRejectTranslogRetentionSettings() {
         );
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "looks like a test that's not applicable to 9.0 after version bump")
     public void testDeprecateTranslogRetentionSettings() {
         request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test");
         final Settings.Builder settings = Settings.builder();
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java
index e66dd32b718b..c6eb65381fab 100644
--- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java
@@ -248,7 +248,7 @@ public void testIndexTemplateWithAlias() throws Exception {
         List<Throwable> errors = putTemplateDetail(request);
         assertThat(errors, is(empty()));
 
-        final Metadata metadata = clusterAdmin().prepareState().get().getState().metadata();
+        final Metadata metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         IndexTemplateMetadata template = metadata.templates().get(templateName);
         Map<String, AliasMetadata> aliasMap = template.getAliases();
         assertThat(aliasMap.size(), equalTo(1));
@@ -266,7 +266,7 @@ public void testFindTemplates() throws Exception {
         putTemplateDetail(new PutRequest("test", "foo-1").patterns(singletonList("foo-*")).order(1));
         putTemplateDetail(new PutRequest("test", "foo-2").patterns(singletonList("foo-*")).order(2));
         putTemplateDetail(new PutRequest("test", "bar").patterns(singletonList("bar-*")).order(between(0, 100)));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(
             MetadataIndexTemplateService.findV1Templates(state.metadata(), "foo-1234", randomBoolean())
                 .stream()
@@ -296,7 +296,7 @@ public void testFindTemplatesWithHiddenIndices() throws Exception {
             new PutRequest("testFindTemplatesWithHiddenIndices", "sneaky-hidden").patterns(singletonList("sneaky*"))
                 .settings(Settings.builder().put("index.hidden", true).build())
         );
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         // hidden
         assertThat(
@@ -380,7 +380,7 @@ public void testFindTemplatesWithHiddenIndices() throws Exception {
     public void testFindTemplatesWithDateMathIndex() throws Exception {
         client().admin().indices().prepareDeleteTemplate("*").get(); // Delete all existing templates
         putTemplateDetail(new PutRequest("testFindTemplatesWithDateMathIndex", "foo-1").patterns(singletonList("test-*")).order(1));
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
 
         assertThat(
             MetadataIndexTemplateService.findV1Templates(state.metadata(), "<test-{now/d}>", false)
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java
index 955d7d2de688..0faff63a7268 100644
--- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java
@@ -33,6 +33,7 @@
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.Predicates;
 import org.elasticsearch.core.SuppressForbidden;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.index.IndexSettings;
@@ -866,20 +867,23 @@ public void testFindMappingsWithFilters() throws IOException {
 
     public void testOldestIndexComputation() {
         Metadata metadata = buildIndicesWithVersions(
-            IndexVersions.V_7_0_0,
+            IndexVersions.MINIMUM_COMPATIBLE,
             IndexVersion.current(),
             IndexVersion.fromId(IndexVersion.current().id() + 1)
         ).build();
 
-        assertEquals(IndexVersions.V_7_0_0, metadata.oldestIndexVersion());
+        assertEquals(IndexVersions.MINIMUM_COMPATIBLE, metadata.oldestIndexVersion());
 
         Metadata.Builder b = Metadata.builder();
         assertEquals(IndexVersion.current(), b.build().oldestIndexVersion());
 
         Throwable ex = expectThrows(
             IllegalArgumentException.class,
-            () -> buildIndicesWithVersions(IndexVersions.V_7_0_0, IndexVersions.ZERO, IndexVersion.fromId(IndexVersion.current().id() + 1))
-                .build()
+            () -> buildIndicesWithVersions(
+                IndexVersions.MINIMUM_COMPATIBLE,
+                IndexVersions.ZERO,
+                IndexVersion.fromId(IndexVersion.current().id() + 1)
+            ).build()
         );
 
         assertEquals("[index.version.created] is not present in the index settings for index with UUID [null]", ex.getMessage());
@@ -1962,6 +1966,8 @@ public void testHiddenAliasValidation() {
         }
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this test needs to be updated or removed after the version 9.0 bump")
     public void testSystemAliasValidationMixedVersionSystemAndRegularFails() {
         final IndexVersion random7xVersion = IndexVersionUtils.randomVersionBetween(
             random(),
@@ -2012,6 +2018,8 @@ public void testSystemAliasValidationNewSystemAndRegularFails() {
         );
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this test needs to be updated or removed after the version 9.0 bump")
     public void testSystemAliasOldSystemAndNewRegular() {
         final IndexVersion random7xVersion = IndexVersionUtils.randomVersionBetween(
             random(),
@@ -2025,6 +2033,8 @@ public void testSystemAliasOldSystemAndNewRegular() {
         metadataWithIndices(oldVersionSystem, regularIndex);
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this test needs to be updated or removed after the version 9.0 bump")
     public void testSystemIndexValidationAllRegular() {
         final IndexVersion random7xVersion = IndexVersionUtils.randomVersionBetween(
             random(),
@@ -2039,6 +2049,8 @@ public void testSystemIndexValidationAllRegular() {
         metadataWithIndices(currentVersionSystem, currentVersionSystem2, oldVersionSystem);
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this test needs to be updated or removed after the version 9.0 bump")
     public void testSystemAliasValidationAllSystemSomeOld() {
         final IndexVersion random7xVersion = IndexVersionUtils.randomVersionBetween(
             random(),
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java
index d12633a8554f..534249cdb108 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/PrimaryTermsTests.java
@@ -119,9 +119,7 @@ private void applyRerouteResult(ClusterState newClusterState) {
         ClusterState previousClusterState = this.clusterState;
         ClusterState.Builder builder = ClusterState.builder(newClusterState).incrementVersion();
         if (previousClusterState.routingTable() != newClusterState.routingTable()) {
-            builder.routingTable(
-                RoutingTable.builder(newClusterState.routingTable()).version(newClusterState.routingTable().version() + 1).build()
-            );
+            builder.routingTable(RoutingTable.builder(newClusterState.routingTable()).build());
         }
         if (previousClusterState.metadata() != newClusterState.metadata()) {
             builder.metadata(Metadata.builder(newClusterState.metadata()).version(newClusterState.metadata().version() + 1));
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java
index de9918b1d2b3..fa9d2819585f 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java
@@ -497,7 +497,7 @@ public void testRemoveReplicasInRightOrder() {
     public void testRoutingNodesRoundtrip() {
         final RoutingTable originalTable = clusterState.getRoutingTable();
         final RoutingNodes routingNodes = clusterState.getRoutingNodes();
-        final RoutingTable fromNodes = RoutingTable.of(originalTable.version(), routingNodes);
+        final RoutingTable fromNodes = RoutingTable.of(routingNodes);
         // we don't have an equals implementation for the routing table so we assert equality by checking for a noop diff
         final Diff<RoutingTable> routingTableDiff = fromNodes.diff(originalTable);
         assertSame(originalTable, routingTableDiff.apply(originalTable));
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java
index e863aca526da..762a88a93197 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java
@@ -320,7 +320,7 @@ private static ClusterState updateClusterState(ClusterState state, RoutingAlloca
         if (allocation.routingNodesChanged() == false) {
             return state;
         }
-        final RoutingTable newRoutingTable = RoutingTable.of(state.routingTable().version(), allocation.routingNodes());
+        final RoutingTable newRoutingTable = RoutingTable.of(allocation.routingNodes());
         final Metadata newMetadata = allocation.updateMetadataWithRoutingChanges(newRoutingTable);
         assert newRoutingTable.validate(newMetadata);
 
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsAvailabilityActionGuideTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsAvailabilityActionGuideTests.java
index 994e892e3ac3..150884d3d503 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsAvailabilityActionGuideTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsAvailabilityActionGuideTests.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.cluster.routing.allocation.shards.ShardsAvailabilityHealthIndicatorService;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.ClusterSettings;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.indices.SystemIndices;
 import org.elasticsearch.test.ESTestCase;
 
@@ -43,6 +44,7 @@ public class ShardsAvailabilityActionGuideTests extends ESTestCase {
     public ShardsAvailabilityActionGuideTests() {
         ClusterService clusterService = mock(ClusterService.class);
         when(clusterService.getClusterSettings()).thenReturn(ClusterSettings.createBuiltInClusterSettings());
+        when(clusterService.getSettings()).thenReturn(Settings.EMPTY);
         service = new ShardsAvailabilityHealthIndicatorService(clusterService, mock(AllocationService.class), mock(SystemIndices.class));
     }
 
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocatorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocatorTests.java
index e03183e43239..6177b571fd59 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocatorTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocatorTests.java
@@ -116,7 +116,7 @@ public void testBalanceByForecastWriteLoad() {
         );
 
         var clusterState = applyStartedShardsUntilNoChange(
-            stateWithStartedIndices(
+            createStateWithIndices(
                 anIndex("heavy-index").indexWriteLoadForecast(8.0),
                 anIndex("light-index-1").indexWriteLoadForecast(1.0),
                 anIndex("light-index-2").indexWriteLoadForecast(2.0),
@@ -151,7 +151,7 @@ public void testBalanceByForecastDiskUsage() {
         var allocationService = createAllocationService(WITH_DISK_BALANCING);
 
         var clusterState = applyStartedShardsUntilNoChange(
-            stateWithStartedIndices(
+            createStateWithIndices(
                 anIndex("heavy-index").shardSizeInBytesForecast(ByteSizeValue.ofGb(8).getBytes()),
                 anIndex("light-index-1").shardSizeInBytesForecast(ByteSizeValue.ofGb(1).getBytes()),
                 anIndex("light-index-2").shardSizeInBytesForecast(ByteSizeValue.ofGb(2).getBytes()),
@@ -196,7 +196,7 @@ public void testBalanceByActualDiskUsage() {
         );
 
         var clusterState = applyStartedShardsUntilNoChange(
-            stateWithStartedIndices(
+            createStateWithIndices(
                 anIndex("heavy-index"),
                 anIndex("light-index-1"),
                 anIndex("light-index-2"),
@@ -232,7 +232,7 @@ public void testBalanceByActualAndForecastDiskUsage() {
         );
 
         var clusterState = applyStartedShardsUntilNoChange(
-            stateWithStartedIndices(
+            createStateWithIndices(
                 anIndex("heavy-index"),// size is set in cluster info
                 anIndex("light-index-1").shardSizeInBytesForecast(ByteSizeValue.ofGb(1).getBytes()),
                 anIndex("light-index-2").shardSizeInBytesForecast(ByteSizeValue.ofGb(2).getBytes()),
@@ -268,7 +268,7 @@ public void testDoNotBalancePartialIndicesByDiskUsage() {
             .put(SETTING_IGNORE_DISK_WATERMARKS.getKey(), true);
 
         var clusterState = applyStartedShardsUntilNoChange(
-            stateWithStartedIndices(
+            createStateWithIndices(
                 anIndex("frozen-index-1", partialSearchableSnapshotSettings).shardSizeInBytesForecast(ByteSizeValue.ofGb(1).getBytes()),
                 anIndex("frozen-index-2", partialSearchableSnapshotSettings).shardSizeInBytesForecast(ByteSizeValue.ofGb(1).getBytes()),
                 anIndex("frozen-index-3", partialSearchableSnapshotSettings).shardSizeInBytesForecast(ByteSizeValue.ofGb(1).getBytes()),
@@ -536,13 +536,32 @@ private static IndexMetadata.Builder anIndex(String name, Settings.Builder setti
         return IndexMetadata.builder(name).settings(settings);
     }
 
-    private static ClusterState stateWithStartedIndices(IndexMetadata.Builder... indices) {
+    private static ClusterState createStateWithIndices(IndexMetadata.Builder... indexMetadataBuilders) {
         var metadataBuilder = Metadata.builder();
         var routingTableBuilder = RoutingTable.builder(TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY);
-        for (var index : indices) {
-            var build = index.build();
-            metadataBuilder.put(build, false);
-            routingTableBuilder.addAsNew(build);
+        if (randomBoolean()) {
+            // allocate all shards from scratch
+            for (var index : indexMetadataBuilders) {
+                var indexMetadata = index.build();
+                metadataBuilder.put(indexMetadata, false);
+                routingTableBuilder.addAsNew(indexMetadata);
+            }
+        } else {
+            // ensure unbalanced cluster cloud be properly balanced
+            // simulates a case when we add a second node and ensure shards could be evenly spread across all available nodes
+            for (var index : indexMetadataBuilders) {
+                var inSyncId = UUIDs.randomBase64UUID();
+                var indexMetadata = index.putInSyncAllocationIds(0, Set.of(inSyncId)).build();
+                metadataBuilder.put(indexMetadata, false);
+                routingTableBuilder.add(
+                    IndexRoutingTable.builder(indexMetadata.getIndex())
+                        .addShard(
+                            shardRoutingBuilder(new ShardId(indexMetadata.getIndex(), 0), "node-1", true, ShardRoutingState.STARTED)
+                                .withAllocationId(AllocationId.newInitializing(inSyncId))
+                                .build()
+                        )
+                );
+            }
         }
 
         return ClusterState.builder(ClusterName.DEFAULT)
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java
index 6c3a4157bb4b..f57d3dbd1b6b 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java
@@ -234,9 +234,7 @@ public void testAssignShardsToTheirPreviousLocationIfAvailable() {
                 );
             }
         }
-        clusterState = ClusterState.builder(clusterState)
-            .routingTable(RoutingTable.of(clusterState.routingTable().version(), routingNodes))
-            .build();
+        clusterState = ClusterState.builder(clusterState).routingTable(RoutingTable.of(routingNodes)).build();
 
         var ignored = randomBoolean()
             ? new ShardRouting[0]
@@ -284,9 +282,7 @@ public void testRespectsAssignmentOfUnknownPrimaries() {
                 break;
             }
         }
-        clusterState = ClusterState.builder(clusterState)
-            .routingTable(RoutingTable.of(clusterState.routingTable().version(), routingNodes))
-            .build();
+        clusterState = ClusterState.builder(clusterState).routingTable(RoutingTable.of(routingNodes)).build();
 
         var desiredBalance = desiredBalanceComputer.compute(DesiredBalance.INITIAL, createInput(clusterState), queue(), input -> true);
 
@@ -333,9 +329,7 @@ public void testRespectsAssignmentOfUnknownReplicas() {
                 break;
             }
         }
-        clusterState = ClusterState.builder(clusterState)
-            .routingTable(RoutingTable.of(clusterState.routingTable().version(), routingNodes))
-            .build();
+        clusterState = ClusterState.builder(clusterState).routingTable(RoutingTable.of(routingNodes)).build();
 
         var desiredBalance = desiredBalanceComputer.compute(DesiredBalance.INITIAL, createInput(clusterState), queue(), input -> true);
 
@@ -431,9 +425,7 @@ public ShardAllocationDecision decideShardAllocation(ShardRouting shard, Routing
                 0L
             );
         }
-        clusterState = ClusterState.builder(clusterState)
-            .routingTable(RoutingTable.of(clusterState.routingTable().version(), desiredRoutingNodes))
-            .build();
+        clusterState = ClusterState.builder(clusterState).routingTable(RoutingTable.of(desiredRoutingNodes)).build();
 
         var desiredBalance1 = desiredBalanceComputer.compute(DesiredBalance.INITIAL, createInput(clusterState), queue(), input -> true);
         assertDesiredAssignments(
@@ -500,9 +492,7 @@ public ShardAllocationDecision decideShardAllocation(ShardRouting shard, Routing
                 }
             }
         }
-        clusterState = ClusterState.builder(clusterState)
-            .routingTable(RoutingTable.of(clusterState.routingTable().version(), randomRoutingNodes))
-            .build();
+        clusterState = ClusterState.builder(clusterState).routingTable(RoutingTable.of(randomRoutingNodes)).build();
 
         allocateCalled.set(false);
 
@@ -539,9 +529,7 @@ public void testAppliesMoveCommands() {
             var shardRouting = iterator.next();
             routingNodes.startShard(iterator.initialize(shardRouting.primary() ? "node-0" : "node-1", null, 0L, changes), changes, 0L);
         }
-        clusterState = ClusterState.builder(clusterState)
-            .routingTable(RoutingTable.of(clusterState.routingTable().version(), routingNodes))
-            .build();
+        clusterState = ClusterState.builder(clusterState).routingTable(RoutingTable.of(routingNodes)).build();
 
         var desiredBalance = desiredBalanceComputer.compute(
             DesiredBalance.INITIAL,
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconcilerTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconcilerTests.java
index 326cda70dde8..af05bdc542b7 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconcilerTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceReconcilerTests.java
@@ -1249,9 +1249,7 @@ public void testRebalanceDoesNotCauseHotSpots() {
             );
 
             totalOutgoingMoves.keySet().removeIf(nodeId -> isReconciled(allocation.routingNodes().node(nodeId), balance));
-            clusterState = ClusterState.builder(clusterState)
-                .routingTable(RoutingTable.of(allocation.routingTable().version(), allocation.routingNodes()))
-                .build();
+            clusterState = ClusterState.builder(clusterState).routingTable(RoutingTable.of(allocation.routingNodes())).build();
         }
     }
 
diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorServiceTests.java
index ad30c79a0133..95803a55399b 100644
--- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/shards/ShardsAvailabilityHealthIndicatorServiceTests.java
@@ -1983,6 +1983,7 @@ public void testMappedFieldsForTelemetry() {
         );
         ClusterService clusterService = mock(ClusterService.class);
         when(clusterService.getClusterSettings()).thenReturn(ClusterSettings.createBuiltInClusterSettings());
+        when(clusterService.getSettings()).thenReturn(Settings.EMPTY);
         var service = new ShardsAvailabilityHealthIndicatorService(
             clusterService,
             mock(AllocationService.class),
@@ -2557,6 +2558,7 @@ private static ShardsAvailabilityHealthIndicatorService createAllocationHealthIn
         when(clusterService.state()).thenReturn(clusterState);
         var clusterSettings = new ClusterSettings(nodeSettings, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
         when(clusterService.getClusterSettings()).thenReturn(clusterSettings);
+        when(clusterService.getSettings()).thenReturn(Settings.EMPTY);
         var allocationService = mock(AllocationService.class);
         when(allocationService.explainShardAllocation(any(), any())).thenAnswer((Answer<ShardAllocationDecision>) invocation -> {
             ShardRouting shardRouting = invocation.getArgument(0);
diff --git a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java
index 26faa295cf72..69d0456a3434 100644
--- a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java
@@ -33,7 +33,6 @@
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
-import org.elasticsearch.cluster.routing.RoutingTable;
 import org.elasticsearch.common.Priority;
 import org.elasticsearch.common.Randomness;
 import org.elasticsearch.common.component.Lifecycle;
@@ -2607,16 +2606,6 @@ public void testVersionNumberProtection() {
                 b -> b.version(randomFrom(currentState.metadata().version() - 1, currentState.metadata().version() + 1))
             )
         );
-
-        runVersionNumberProtectionTest(
-            currentState -> ClusterState.builder(currentState)
-                .routingTable(
-                    RoutingTable.builder(currentState.routingTable())
-                        .version(randomFrom(currentState.routingTable().version() - 1, currentState.routingTable().version() + 1))
-                        .build()
-                )
-                .build()
-        );
     }
 
     private void runVersionNumberProtectionTest(UnaryOperator<ClusterState> updateOperator) {
diff --git a/server/src/test/java/org/elasticsearch/common/ReferenceDocsTests.java b/server/src/test/java/org/elasticsearch/common/ReferenceDocsTests.java
index 0fabf7801730..49208f234170 100644
--- a/server/src/test/java/org/elasticsearch/common/ReferenceDocsTests.java
+++ b/server/src/test/java/org/elasticsearch/common/ReferenceDocsTests.java
@@ -66,7 +66,7 @@ public void testResourceValidation() throws Exception {
             builder.startObject("UNEXPECTED").endObject().endObject();
 
             try (var stream = BytesReference.bytes(builder).streamInput()) {
-                expectThrows(IllegalStateException.class, () -> ReferenceDocs.readLinksBySymbol(stream));
+                expectThrows(IllegalArgumentException.class, () -> ReferenceDocs.readLinksBySymbol(stream));
             }
         }
 
diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java
index 7e42653952a9..52541f136623 100644
--- a/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java
+++ b/server/src/test/java/org/elasticsearch/common/io/stream/DelayableWriteableTests.java
@@ -14,6 +14,7 @@
 import org.elasticsearch.test.TransportVersionUtils;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import static java.util.Collections.singletonList;
 import static org.hamcrest.Matchers.equalTo;
@@ -57,19 +58,23 @@ public int hashCode() {
     }
 
     private static class NamedHolder implements Writeable {
-        private final Example e;
+        private final Example e1;
+        private final Example e2;
 
         NamedHolder(Example e) {
-            this.e = e;
+            this.e1 = e;
+            this.e2 = e;
         }
 
         NamedHolder(StreamInput in) throws IOException {
-            e = in.readNamedWriteable(Example.class);
+            e1 = ((DelayableWriteable.Deduplicator) in).deduplicate(in.readNamedWriteable(Example.class));
+            e2 = ((DelayableWriteable.Deduplicator) in).deduplicate(in.readNamedWriteable(Example.class));
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            out.writeNamedWriteable(e);
+            out.writeNamedWriteable(e1);
+            out.writeNamedWriteable(e2);
         }
 
         @Override
@@ -78,12 +83,12 @@ public boolean equals(Object obj) {
                 return false;
             }
             NamedHolder other = (NamedHolder) obj;
-            return e.equals(other.e);
+            return e1.equals(other.e1) && e2.equals(other.e2);
         }
 
         @Override
         public int hashCode() {
-            return e.hashCode();
+            return Objects.hash(e1, e2);
         }
     }
 
@@ -130,6 +135,9 @@ public void testRoundTripFromDelayedWithNamedWriteable() throws IOException {
         DelayableWriteable<NamedHolder> original = DelayableWriteable.referencing(n).asSerialized(NamedHolder::new, writableRegistry());
         assertTrue(original.isSerialized());
         roundTripTestCase(original, NamedHolder::new);
+        NamedHolder copy = original.expand();
+        // objects have been deduplicated
+        assertSame(copy.e1, copy.e2);
     }
 
     public void testRoundTripFromDelayedFromOldVersion() throws IOException {
diff --git a/server/src/test/java/org/elasticsearch/common/xcontent/CompatibleNamedXContentRegistryTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/CompatibleNamedXContentRegistryTests.java
index aa62553447db..47da6f8cdc0f 100644
--- a/server/src/test/java/org/elasticsearch/common/xcontent/CompatibleNamedXContentRegistryTests.java
+++ b/server/src/test/java/org/elasticsearch/common/xcontent/CompatibleNamedXContentRegistryTests.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.core.RestApiVersion;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.rest.FakeRestRequest;
@@ -114,6 +115,8 @@ public static NewSubObject parse(XContentParser parser) {
         }
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this can be re-enabled once our rest api version is bumped to V_9")
     public void testNotCompatibleRequest() throws IOException {
         NamedXContentRegistry registry = new NamedXContentRegistry(
             List.of(
diff --git a/server/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java b/server/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java
index dc08fffa49c1..39bc392b2ad4 100644
--- a/server/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java
+++ b/server/src/test/java/org/elasticsearch/discovery/AbstractDisruptionTestCase.java
@@ -130,7 +130,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
     }
 
     ClusterState getNodeClusterState(String node) {
-        return client(node).admin().cluster().prepareState().setLocal(true).get().getState();
+        return client(node).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
     }
 
     void assertNoMaster(final String node) throws Exception {
diff --git a/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java
index adab51a37d2b..b7dea50ee438 100644
--- a/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java
+++ b/server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java
@@ -29,6 +29,7 @@
 import org.elasticsearch.core.IOUtils;
 import org.elasticsearch.core.PathUtils;
 import org.elasticsearch.core.SuppressForbidden;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.gateway.MetadataStateFormat;
 import org.elasticsearch.gateway.PersistedClusterStateService;
 import org.elasticsearch.index.Index;
@@ -537,6 +538,8 @@ public void testBlocksDowngradeToVersionWithMultipleNodesInDataPath() throws IOE
         }
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "test won't work until we remove and bump minimum index versions")
     public void testIndexCompatibilityChecks() throws IOException {
         final Settings settings = buildEnvSettings(Settings.EMPTY);
 
@@ -634,6 +637,8 @@ public void testSymlinkDataDirectory() throws Exception {
         env.close();
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "test won't work until we remove and bump minimum index versions")
     public void testGetBestDowngradeVersion() {
         assertThat(NodeEnvironment.getBestDowngradeVersion("7.17.0"), Matchers.equalTo("7.17.0"));
         assertThat(NodeEnvironment.getBestDowngradeVersion("7.17.5"), Matchers.equalTo("7.17.5"));
diff --git a/server/src/test/java/org/elasticsearch/env/NodeMetadataTests.java b/server/src/test/java/org/elasticsearch/env/NodeMetadataTests.java
index f60812977d57..499861ceb346 100644
--- a/server/src/test/java/org/elasticsearch/env/NodeMetadataTests.java
+++ b/server/src/test/java/org/elasticsearch/env/NodeMetadataTests.java
@@ -10,6 +10,7 @@
 import org.elasticsearch.Build;
 import org.elasticsearch.Version;
 import org.elasticsearch.core.Tuple;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.gateway.MetadataStateFormat;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -78,6 +79,8 @@ public void testEqualsHashcodeSerialization() {
         );
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "as mentioned in the comment below, the behavior here is changing for 9.0 so this test needs updating")
     public void testReadsFormatWithoutVersion() throws IOException {
         // the behaviour tested here is only appropriate if the current version is compatible with versions 7 and earlier
         assertTrue(IndexVersions.MINIMUM_COMPATIBLE.onOrBefore(IndexVersions.V_7_0_0));
@@ -151,6 +154,8 @@ public void testDoesNotUpgradeAncientVersion() {
         );
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "Needs to be updated for 9.0 version bump")
     public void testUpgradeMarksPreviousVersion() {
         final String nodeId = randomAlphaOfLength(10);
         final Version version = VersionUtils.randomVersionBetween(random(), Version.CURRENT.minimumCompatibilityVersion(), Version.V_8_0_0);
diff --git a/server/src/test/java/org/elasticsearch/gateway/ClusterStateUpdatersTests.java b/server/src/test/java/org/elasticsearch/gateway/ClusterStateUpdatersTests.java
index 5112556fe79a..f119cbfa6744 100644
--- a/server/src/test/java/org/elasticsearch/gateway/ClusterStateUpdatersTests.java
+++ b/server/src/test/java/org/elasticsearch/gateway/ClusterStateUpdatersTests.java
@@ -142,7 +142,6 @@ public void testUpdateRoutingTable() {
         {
             final ClusterState newState = updateRoutingTable(initialState, TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY);
             assertTrue(newState.routingTable().hasIndex(index));
-            assertThat(newState.routingTable().version(), is(0L));
             assertThat(newState.routingTable().allShards(index.getName()).size(), is(numOfShards));
         }
         {
@@ -179,7 +178,6 @@ public void testUpdateRoutingTable() {
                 TestShardRoutingRoleStrategies.DEFAULT_ROLE_ONLY
             );
             assertTrue(newState.routingTable().hasIndex(index));
-            assertThat(newState.routingTable().version(), is(0L));
             assertThat(newState.routingTable().allShards(index.getName()).size(), is(numOfShards));
         }
     }
diff --git a/server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java
index 0524412cff70..a8de654cf9b8 100644
--- a/server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java
@@ -20,7 +20,6 @@
 import org.elasticsearch.cluster.node.DiscoveryNodeUtils;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
 import org.elasticsearch.cluster.routing.RerouteService;
-import org.elasticsearch.cluster.routing.RoutingTable;
 import org.elasticsearch.cluster.routing.ShardRoutingRoleStrategy;
 import org.elasticsearch.cluster.service.ClusterApplierService;
 import org.elasticsearch.cluster.service.ClusterService;
@@ -502,15 +501,10 @@ private MasterServiceTaskQueue<SetClusterStateTask> createSetClusterStateTaskQue
                 taskContext.success(() -> {});
             }
             // fix up the version numbers
-            final var finalStateBuilder = ClusterState.builder(targetState)
+            return ClusterState.builder(targetState)
                 .version(initialState.version())
-                .metadata(Metadata.builder(targetState.metadata()).version(initialState.metadata().version()));
-            if (initialState.clusterRecovered() || targetState.clusterRecovered() == false) {
-                finalStateBuilder.routingTable(
-                    RoutingTable.builder(targetState.routingTable()).version(initialState.routingTable().version())
-                );
-            }
-            return finalStateBuilder.build();
+                .metadata(Metadata.builder(targetState.metadata()).version(initialState.metadata().version()))
+                .build();
         });
     }
 }
diff --git a/server/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java b/server/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java
index a74a00792d70..97bf9444dc85 100644
--- a/server/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java
+++ b/server/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java
@@ -533,7 +533,7 @@ private RoutingAllocation routingAllocationWithOnePrimaryNoReplicas(
     private void assertClusterHealthStatus(RoutingAllocation allocation, ClusterHealthStatus expectedStatus) {
         RoutingTable oldRoutingTable = allocation.routingTable();
         RoutingNodes newRoutingNodes = allocation.routingNodes();
-        final RoutingTable newRoutingTable = RoutingTable.of(oldRoutingTable.version(), newRoutingNodes);
+        final RoutingTable newRoutingTable = RoutingTable.of(newRoutingNodes);
         ClusterState clusterState = ClusterState.builder(new ClusterName("test-cluster")).routingTable(newRoutingTable).build();
         ClusterStateHealth clusterStateHealth = new ClusterStateHealth(clusterState);
         assertThat(clusterStateHealth.getStatus().ordinal(), lessThanOrEqualTo(expectedStatus.ordinal()));
diff --git a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java
index d3e480eb766a..07d455477b73 100644
--- a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java
@@ -449,14 +449,14 @@ public void testUpdateSyncIntervalDynamically() {
         assertNotNull(indexService.getFsyncTask());
         assertTrue(indexService.getFsyncTask().mustReschedule());
 
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertEquals("5s", indexMetadata.getSettings().get(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey()));
 
         indicesAdmin().prepareClose("test").get();
         indicesAdmin().prepareUpdateSettings("test")
             .setSettings(Settings.builder().put(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey(), "20s"))
             .get();
-        indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("test");
+        indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("test");
         assertEquals("20s", indexMetadata.getSettings().get(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey()));
     }
 
diff --git a/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java
index 379adc9ce517..b2db13c1481e 100644
--- a/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java
+++ b/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java
@@ -159,20 +159,6 @@ public void testSortingAgainstAliases() {
         assertEquals("Cannot use alias [field] as an index sort field", e.getMessage());
     }
 
-    public void testSortingAgainstAliasesPre713() {
-        IndexSettings indexSettings = indexSettings(
-            Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersions.V_7_12_0).put("index.sort.field", "field").build()
-        );
-        MappedFieldType aliased = new KeywordFieldMapper.KeywordFieldType("aliased");
-        Sort sort = buildIndexSort(indexSettings, Map.of("field", aliased));
-        assertThat(sort.getSort(), arrayWithSize(1));
-        assertThat(sort.getSort()[0].getField(), equalTo("aliased"));
-        assertWarnings(
-            "Index sort for index [test] defined on field [field] which resolves to field [aliased]. "
-                + "You will not be able to define an index sort over aliased fields in new indexes"
-        );
-    }
-
     public void testTimeSeriesMode() {
         IndexSettings indexSettings = indexSettings(
             Settings.builder()
diff --git a/server/src/test/java/org/elasticsearch/index/IndexVersionTests.java b/server/src/test/java/org/elasticsearch/index/IndexVersionTests.java
index dcf73ec617e6..d37d03407f69 100644
--- a/server/src/test/java/org/elasticsearch/index/IndexVersionTests.java
+++ b/server/src/test/java/org/elasticsearch/index/IndexVersionTests.java
@@ -10,6 +10,7 @@
 
 import org.apache.lucene.util.Version;
 import org.elasticsearch.common.lucene.Lucene;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.index.IndexVersionUtils;
 import org.hamcrest.Matchers;
@@ -32,27 +33,27 @@
 public class IndexVersionTests extends ESTestCase {
 
     public void testVersionComparison() {
-        IndexVersion V_7_2_0 = IndexVersions.V_7_2_0;
-        IndexVersion V_8_0_0 = IndexVersions.V_8_0_0;
-        assertThat(V_7_2_0.before(V_8_0_0), is(true));
-        assertThat(V_7_2_0.before(V_7_2_0), is(false));
-        assertThat(V_8_0_0.before(V_7_2_0), is(false));
-
-        assertThat(V_7_2_0.onOrBefore(V_8_0_0), is(true));
-        assertThat(V_7_2_0.onOrBefore(V_7_2_0), is(true));
-        assertThat(V_8_0_0.onOrBefore(V_7_2_0), is(false));
-
-        assertThat(V_7_2_0.after(V_8_0_0), is(false));
-        assertThat(V_7_2_0.after(V_7_2_0), is(false));
-        assertThat(V_8_0_0.after(V_7_2_0), is(true));
-
-        assertThat(V_7_2_0.onOrAfter(V_8_0_0), is(false));
-        assertThat(V_7_2_0.onOrAfter(V_7_2_0), is(true));
-        assertThat(V_8_0_0.onOrAfter(V_7_2_0), is(true));
-
-        assertThat(V_7_2_0, is(lessThan(V_8_0_0)));
-        assertThat(V_7_2_0.compareTo(V_7_2_0), is(0));
-        assertThat(V_8_0_0, is(greaterThan(V_7_2_0)));
+        IndexVersion V_8_2_0 = IndexVersions.V_8_2_0;
+        IndexVersion current = IndexVersion.current();
+        assertThat(V_8_2_0.before(current), is(true));
+        assertThat(V_8_2_0.before(V_8_2_0), is(false));
+        assertThat(current.before(V_8_2_0), is(false));
+
+        assertThat(V_8_2_0.onOrBefore(current), is(true));
+        assertThat(V_8_2_0.onOrBefore(V_8_2_0), is(true));
+        assertThat(current.onOrBefore(V_8_2_0), is(false));
+
+        assertThat(V_8_2_0.after(current), is(false));
+        assertThat(V_8_2_0.after(V_8_2_0), is(false));
+        assertThat(current.after(V_8_2_0), is(true));
+
+        assertThat(V_8_2_0.onOrAfter(current), is(false));
+        assertThat(V_8_2_0.onOrAfter(V_8_2_0), is(true));
+        assertThat(current.onOrAfter(V_8_2_0), is(true));
+
+        assertThat(V_8_2_0, is(lessThan(current)));
+        assertThat(V_8_2_0.compareTo(V_8_2_0), is(0));
+        assertThat(current, is(greaterThan(V_8_2_0)));
     }
 
     public static class CorrectFakeVersion {
@@ -149,6 +150,8 @@ public void testMax() {
         }
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "believe this fails because index version has not yet been bumped to 9.0")
     public void testMinimumCompatibleVersion() {
         assertThat(IndexVersion.getMinimumCompatibleIndexVersion(7170099), equalTo(IndexVersion.fromId(6000099)));
         assertThat(IndexVersion.getMinimumCompatibleIndexVersion(8000099), equalTo(IndexVersion.fromId(7000099)));
@@ -189,6 +192,8 @@ public void testParseLenient() {
         }
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "can be unmuted once lucene is bumped to version 10")
     public void testLuceneVersionOnUnknownVersions() {
         // between two known versions, should use the lucene version of the previous version
         IndexVersion previousVersion = IndexVersionUtils.getPreviousVersion();
diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
index 77f5fa301c78..818dafcfeeda 100644
--- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
+++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
@@ -130,6 +130,7 @@
 import org.elasticsearch.index.translog.TranslogDeletionPolicy;
 import org.elasticsearch.index.translog.TranslogOperationsUtils;
 import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
+import org.elasticsearch.indices.recovery.RecoverySettings;
 import org.elasticsearch.test.IndexSettingsModule;
 import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -174,7 +175,6 @@
 import java.util.function.ToLongBiFunction;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
-import java.util.stream.StreamSupport;
 
 import static java.util.Collections.shuffle;
 import static org.elasticsearch.cluster.routing.TestShardRouting.shardRoutingBuilder;
@@ -6615,117 +6615,6 @@ public void testRebuildLocalCheckpointTrackerAndVersionMap() throws Exception {
         }
     }
 
-    public void testRecoverFromHardDeletesIndex() throws Exception {
-        IndexWriterFactory hardDeletesWriter = (directory, iwc) -> new IndexWriter(directory, iwc) {
-            boolean isTombstone(Iterable<? extends IndexableField> doc) {
-                return StreamSupport.stream(doc.spliterator(), false).anyMatch(d -> d.name().equals(Lucene.SOFT_DELETES_FIELD));
-            }
-
-            @Override
-            public long addDocument(Iterable<? extends IndexableField> doc) throws IOException {
-                if (isTombstone(doc)) {
-                    return 0;
-                }
-                return super.addDocument(doc);
-            }
-
-            @Override
-            public long addDocuments(Iterable<? extends Iterable<? extends IndexableField>> docs) throws IOException {
-                if (StreamSupport.stream(docs.spliterator(), false).anyMatch(this::isTombstone)) {
-                    return 0;
-                }
-                return super.addDocuments(docs);
-            }
-
-            @Override
-            public long softUpdateDocument(Term term, Iterable<? extends IndexableField> doc, Field... softDeletes) throws IOException {
-                if (isTombstone(doc)) {
-                    return super.deleteDocuments(term);
-                } else {
-                    return super.updateDocument(term, doc);
-                }
-            }
-
-            @Override
-            public long softUpdateDocuments(Term term, Iterable<? extends Iterable<? extends IndexableField>> docs, Field... softDeletes)
-                throws IOException {
-                if (StreamSupport.stream(docs.spliterator(), false).anyMatch(this::isTombstone)) {
-                    return super.deleteDocuments(term);
-                } else {
-                    return super.updateDocuments(term, docs);
-                }
-            }
-        };
-        final AtomicLong globalCheckpoint = new AtomicLong(SequenceNumbers.NO_OPS_PERFORMED);
-        Path translogPath = createTempDir();
-        List<Engine.Operation> operations = generateHistoryOnReplica(between(1, 500), randomBoolean(), randomBoolean(), randomBoolean());
-        final IndexMetadata indexMetadata = IndexMetadata.builder(defaultSettings.getIndexMetadata())
-            .settings(
-                Settings.builder()
-                    .put(defaultSettings.getSettings())
-                    .put(
-                        IndexMetadata.SETTING_VERSION_CREATED,
-                        IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.V_8_0_0)
-                    )
-                    .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), false)
-            )
-            .build();
-        final IndexSettings indexSettings = IndexSettingsModule.newIndexSettings(indexMetadata);
-        try (Store store = createStore()) {
-            EngineConfig config = config(indexSettings, store, translogPath, NoMergePolicy.INSTANCE, null, null, globalCheckpoint::get);
-            final List<DocIdSeqNoAndSource> docs;
-            try (
-                InternalEngine hardDeletesEngine = createEngine(
-                    indexSettings,
-                    store,
-                    translogPath,
-                    newMergePolicy(),
-                    hardDeletesWriter,
-                    null,
-                    globalCheckpoint::get
-                )
-            ) {
-                for (Engine.Operation op : operations) {
-                    applyOperation(hardDeletesEngine, op);
-                    if (randomBoolean()) {
-                        hardDeletesEngine.syncTranslog();
-                        globalCheckpoint.set(randomLongBetween(globalCheckpoint.get(), hardDeletesEngine.getPersistedLocalCheckpoint()));
-                    }
-                    if (randomInt(100) < 10) {
-                        hardDeletesEngine.refresh("test");
-                    }
-                    if (randomInt(100) < 5) {
-                        hardDeletesEngine.flush(true, true);
-                    }
-                }
-                docs = getDocIds(hardDeletesEngine, true);
-            }
-            // We need to remove min_retained_seq_no commit tag as the actual hard-deletes engine does not have it.
-            store.trimUnsafeCommits(translogPath);
-            Map<String, String> userData = new HashMap<>(store.readLastCommittedSegmentsInfo().userData);
-            userData.remove(Engine.MIN_RETAINED_SEQNO);
-            IndexWriterConfig indexWriterConfig = new IndexWriterConfig(null).setOpenMode(IndexWriterConfig.OpenMode.APPEND)
-                .setIndexCreatedVersionMajor(IndexVersion.current().luceneVersion().major)
-                .setSoftDeletesField(Lucene.SOFT_DELETES_FIELD)
-                .setCommitOnClose(false)
-                .setMergePolicy(NoMergePolicy.INSTANCE);
-            try (IndexWriter writer = new IndexWriter(store.directory(), indexWriterConfig)) {
-                writer.setLiveCommitData(userData.entrySet());
-                writer.commit();
-            }
-            try (InternalEngine softDeletesEngine = new InternalEngine(config)) { // do not recover from translog
-                assertThat(softDeletesEngine.getLastCommittedSegmentInfos().userData, equalTo(userData));
-                assertThat(softDeletesEngine.getVersionMap().keySet(), empty());
-                recoverFromTranslog(softDeletesEngine, translogHandler, Long.MAX_VALUE);
-                if (randomBoolean()) {
-                    engine.forceMerge(randomBoolean(), 1, false, UUIDs.randomBase64UUID());
-                }
-                assertThat(getDocIds(softDeletesEngine, true), equalTo(docs));
-                assertConsistentHistoryBetweenTranslogAndLuceneIndex(softDeletesEngine);
-            }
-        }
-    }
-
     void assertLuceneOperations(InternalEngine engine, long expectedAppends, long expectedUpdates, long expectedDeletes) {
         String message = "Lucene operations mismatched;"
             + " appends [actual:"
@@ -7499,14 +7388,14 @@ public void testTrimUnsafeCommitHasESVersionInUserData() throws IOException {
                 .setIndexDeletionPolicy(NoDeletionPolicy.INSTANCE);
             try (IndexWriter indexWriter = new IndexWriter(store.directory(), indexWriterConfig)) {
                 Map<String, String> commitUserDataWithOlderVersion = new HashMap<>(committedSegmentsInfo.userData);
-                commitUserDataWithOlderVersion.put(ES_VERSION, IndexVersions.V_7_0_0.toString());
+                commitUserDataWithOlderVersion.put(ES_VERSION, IndexVersions.MINIMUM_COMPATIBLE.toString());
                 indexWriter.setLiveCommitData(commitUserDataWithOlderVersion.entrySet());
                 indexWriter.commit();
             }
 
             Map<String, String> userDataBeforeTrimUnsafeCommits = store.readLastCommittedSegmentsInfo().getUserData();
             assertThat(userDataBeforeTrimUnsafeCommits, hasKey(ES_VERSION));
-            assertThat(userDataBeforeTrimUnsafeCommits.get(ES_VERSION), is(equalTo(IndexVersions.V_7_0_0.toString())));
+            assertThat(userDataBeforeTrimUnsafeCommits.get(ES_VERSION), is(equalTo(IndexVersions.MINIMUM_COMPATIBLE.toString())));
 
             store.trimUnsafeCommits(config.getTranslogConfig().getTranslogPath());
 
@@ -7773,6 +7662,24 @@ protected void commitIndexWriter(IndexWriter writer, Translog translog) throws I
         }
     }
 
+    public void testDisableRecoverySource() throws Exception {
+        Settings settings = Settings.builder()
+            .put(defaultSettings.getNodeSettings())
+            .put(RecoverySettings.INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey(), false)
+            .build();
+        IndexSettings indexSettings = new IndexSettings(defaultSettings.getIndexMetadata(), settings, defaultSettings.getScopedSettings());
+        try (
+            Store store = createStore();
+            InternalEngine engine = createEngine(indexSettings, store, createTempDir(), NoMergePolicy.INSTANCE)
+        ) {
+            IllegalStateException exc = expectThrows(
+                IllegalStateException.class,
+                () -> engine.newChangesSnapshot("test", 0, 1000, true, true, true)
+            );
+            assertThat(exc.getMessage(), containsString("unavailable"));
+        }
+    }
+
     private static void assertCommitGenerations(Map<IndexCommit, Engine.IndexCommitRef> commits, List<Long> expectedGenerations) {
         assertCommitGenerations(commits.values().stream().map(Engine.IndexCommitRef::getIndexCommit).toList(), expectedGenerations);
     }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java
index 77b37b2bde86..0c5590ff0709 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java
@@ -31,7 +31,6 @@
 import java.util.stream.Collectors;
 
 import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 
 public class BinaryFieldMapperTests extends MapperTestCase {
@@ -228,16 +227,7 @@ public SyntheticSourceExample example(int maxValues) throws IOException {
 
             @Override
             public List<SyntheticSourceInvalidExample> invalidExample() throws IOException {
-                return List.of(
-                    new SyntheticSourceInvalidExample(
-                        equalTo("field [field] of type [binary] doesn't support synthetic source because it doesn't have doc values"),
-                        b -> b.field("type", "binary")
-                    ),
-                    new SyntheticSourceInvalidExample(
-                        equalTo("field [field] of type [binary] doesn't support synthetic source because it doesn't have doc values"),
-                        b -> b.field("type", "binary").field("doc_values", false)
-                    )
-                );
+                return List.of();
             }
 
             private Tuple<String, byte[]> generateValue() {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java
index 03f030a26992..86bf5404faf6 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java
@@ -344,12 +344,7 @@ private void mapping(XContentBuilder b) throws IOException {
 
             @Override
             public List<SyntheticSourceInvalidExample> invalidExample() throws IOException {
-                return List.of(
-                    new SyntheticSourceInvalidExample(
-                        equalTo("field [field] of type [boolean] doesn't support synthetic source because it doesn't have doc values"),
-                        b -> b.field("type", "boolean").field("doc_values", false)
-                    )
-                );
+                return List.of();
             }
         };
     }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java
index 4efdd43b5cd7..ff4f7e3c2e52 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java
@@ -19,9 +19,7 @@
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType;
 import org.elasticsearch.script.DateFieldScript;
-import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -30,7 +28,6 @@
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Function;
@@ -46,7 +43,6 @@
 import static org.hamcrest.Matchers.lessThan;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.mockito.Mockito.mock;
 
 public class DateFieldMapperTests extends MapperTestCase {
 
@@ -248,10 +244,6 @@ public void testBadNullValue() throws IOException {
                     + "failed to parse date field [foo] with format [strict_date_optional_time||epoch_millis]"
             )
         );
-
-        createDocumentMapper(IndexVersions.V_7_9_0, fieldMapping(b -> b.field("type", "date").field("null_value", "foo")));
-
-        assertWarnings("Error parsing [foo] as date in [null_value] on field [field]); [null_value] will be ignored");
     }
 
     public void testNullConfigValuesFail() {
@@ -675,20 +667,7 @@ private void mapping(XContentBuilder b) throws IOException {
 
             @Override
             public List<SyntheticSourceInvalidExample> invalidExample() throws IOException {
-                List<SyntheticSourceInvalidExample> examples = new ArrayList<>();
-                for (String fieldType : new String[] { "date", "date_nanos" }) {
-                    examples.add(
-                        new SyntheticSourceInvalidExample(
-                            equalTo(
-                                "field [field] of type ["
-                                    + fieldType
-                                    + "] doesn't support synthetic source because it doesn't have doc values"
-                            ),
-                            b -> b.field("type", fieldType).field("doc_values", false)
-                        )
-                    );
-                }
-                return examples;
+                return List.of();
             }
         };
     }
@@ -767,51 +746,4 @@ public void testLegacyField() throws Exception {
         assertNotEquals(DEFAULT_DATE_TIME_FORMATTER, ((DateFieldType) service.fieldType("mydate")).dateTimeFormatter);
     }
 
-    public void testLegacyDateFormatName() {
-        DateFieldMapper.Builder builder = new DateFieldMapper.Builder(
-            "format",
-            DateFieldMapper.Resolution.MILLISECONDS,
-            null,
-            mock(ScriptService.class),
-            true,
-            // BWC compatible index, e.g 7.x
-            IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.V_7_0_0,
-                IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0)
-            )
-        );
-
-        // Check that we allow the use of camel case date formats on 7.x indices
-        @SuppressWarnings("unchecked")
-        FieldMapper.Parameter<String> formatParam = (FieldMapper.Parameter<String>) builder.getParameters()[3];
-        formatParam.parse("date_time_format", mock(MappingParserContext.class), "strictDateOptionalTime");
-        builder.buildFormatter(); // shouldn't throw exception
-
-        formatParam.parse("date_time_format", mock(MappingParserContext.class), "strictDateOptionalTime||strictDateOptionalTimeNanos");
-        builder.buildFormatter(); // shouldn't throw exception
-
-        DateFieldMapper.Builder newFieldBuilder = new DateFieldMapper.Builder(
-            "format",
-            DateFieldMapper.Resolution.MILLISECONDS,
-            null,
-            mock(ScriptService.class),
-            true,
-            IndexVersion.current()
-        );
-
-        @SuppressWarnings("unchecked")
-        final FieldMapper.Parameter<String> newFormatParam = (FieldMapper.Parameter<String>) newFieldBuilder.getParameters()[3];
-
-        // Check that we don't allow the use of camel case date formats on 8.x indices
-        assertEquals(
-            "Error parsing [format] on field [format]: Invalid format: [strictDateOptionalTime]: Unknown pattern letter: t",
-            expectThrows(IllegalArgumentException.class, () -> {
-                newFormatParam.parse("date_time_format", mock(MappingParserContext.class), "strictDateOptionalTime");
-                assertEquals("strictDateOptionalTime", newFormatParam.getValue());
-                newFieldBuilder.buildFormatter();
-            }).getMessage()
-        );
-
-    }
 }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java
index 07a1f732d818..8c99e51d02cc 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java
@@ -3244,14 +3244,16 @@ protected String contentType() {
             }
 
             @Override
-            public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-                return new StringStoredFieldFieldLoader(fullPath(), leafName()) {
+            protected SyntheticSourceSupport syntheticSourceSupport() {
+                var loader = new StringStoredFieldFieldLoader(fullPath(), leafName()) {
                     @Override
                     protected void write(XContentBuilder b, Object value) throws IOException {
                         BytesRef ref = (BytesRef) value;
                         b.utf8Value(ref.bytes, ref.offset, ref.length);
                     }
                 };
+
+                return new SyntheticSourceSupport.Native(loader);
             }
 
             private static final TypeParser PARSER = new FixedTypeParser(c -> new MockMetadataMapper());
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicFieldsBuilderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicFieldsBuilderTests.java
index 878bdc91bba0..ada6fe035ac0 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicFieldsBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicFieldsBuilderTests.java
@@ -68,7 +68,7 @@ public void testCreateDynamicStringFieldAsKeywordForDimension() throws IOExcepti
         XContentParser parser = createParser(JsonXContent.jsonXContent, source);
         SourceToParse sourceToParse = new SourceToParse("test", new BytesArray(source), XContentType.JSON);
 
-        SourceFieldMapper sourceMapper = new SourceFieldMapper.Builder(null, Settings.EMPTY, false).setSynthetic().build();
+        SourceFieldMapper sourceMapper = new SourceFieldMapper.Builder(null, Settings.EMPTY, false, true).setSynthetic().build();
         RootObjectMapper root = new RootObjectMapper.Builder("_doc", Optional.empty()).add(
             new PassThroughObjectMapper.Builder("labels").setPriority(0).setContainsDimensions().dynamic(ObjectMapper.Dynamic.TRUE)
         ).build(MapperBuilderContext.root(false, false));
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java
index a5a5d9726f23..4d6e730afded 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java
@@ -20,10 +20,8 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.plugins.internal.XContentMeteringParserDecorator;
 import org.elasticsearch.test.XContentTestUtils;
-import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentParser;
@@ -221,61 +219,25 @@ public void testSimpleWithXContentTraverse() throws Exception {
     }
 
     public void testDynamicMapperWithBadMapping() throws IOException {
-        {
-            // in 7.x versions this will issue a deprecation warning
-            IndexVersion version = IndexVersionUtils.randomVersionBetween(
-                random(),
-                IndexVersions.V_7_0_0,
-                IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0)
-            );
-            DocumentMapper mapper = createDocumentMapper(version, topMapping(b -> {
-                b.startArray("dynamic_templates");
-                {
-                    b.startObject();
-                    {
-                        b.startObject("test");
-                        {
-                            b.field("match_mapping_type", "string");
-                            b.startObject("mapping").field("badparam", false).endObject();
-                        }
-                        b.endObject();
-                    }
-                    b.endObject();
-                }
-                b.endArray();
-            }));
-            assertWarnings(
-                "Parameter [badparam] is used in a dynamic template mapping and has no effect on type [null]. "
-                    + "Usage will result in an error in future major versions and should be removed."
-            );
-            mapper.parse(source(b -> b.field("field", "foo")));
-            assertWarnings(
-                "Parameter [badparam] is used in a dynamic template mapping and has no effect on type [null]. "
-                    + "Usage will result in an error in future major versions and should be removed."
-            );
-        }
-
-        {
-            // in 8.x it will error out
-            Exception e = expectThrows(MapperParsingException.class, () -> createMapperService(topMapping(b -> {
-                b.startArray("dynamic_templates");
+        // in 8.x it will error out
+        Exception e = expectThrows(MapperParsingException.class, () -> createMapperService(topMapping(b -> {
+            b.startArray("dynamic_templates");
+            {
+                b.startObject();
                 {
-                    b.startObject();
+                    b.startObject("test");
                     {
-                        b.startObject("test");
-                        {
-                            b.field("match_mapping_type", "string");
-                            b.startObject("mapping").field("badparam", false).endObject();
-                        }
-                        b.endObject();
+                        b.field("match_mapping_type", "string");
+                        b.startObject("mapping").field("badparam", false).endObject();
                     }
                     b.endObject();
                 }
-                b.endArray();
-            })));
-            assertThat(e.getMessage(), containsString("dynamic template [test] has invalid content"));
-            assertThat(e.getCause().getMessage(), containsString("badparam"));
-        }
+                b.endObject();
+            }
+            b.endArray();
+        })));
+        assertThat(e.getMessage(), containsString("dynamic template [test] has invalid content"));
+        assertThat(e.getCause().getMessage(), containsString("badparam"));
     }
 
     public void testDynamicRuntimeWithBadMapping() {
@@ -677,35 +639,6 @@ public void testIllegalDynamicTemplateNoMappingTypeRuntime() throws Exception {
         assertEquals("unknown parameter [foo] on runtime field [__dynamic__my_template] of type [date]", e.getRootCause().getMessage());
     }
 
-    public void testIllegalDynamicTemplate7DotXIndex() throws Exception {
-        XContentBuilder mapping = XContentFactory.jsonBuilder();
-        mapping.startObject();
-        {
-            mapping.startObject(MapperService.SINGLE_MAPPING_NAME);
-            mapping.startArray("dynamic_templates");
-            {
-                mapping.startObject();
-                mapping.startObject("my_template");
-                mapping.field("match_mapping_type", "string");
-                mapping.startObject("mapping");
-                mapping.field("type", "string");
-                mapping.endObject();
-                mapping.endObject();
-                mapping.endObject();
-            }
-            mapping.endArray();
-            mapping.endObject();
-        }
-        mapping.endObject();
-        IndexVersion createdVersion = IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_7_0);
-        MapperService mapperService = createMapperService(createdVersion, mapping);
-        assertThat(mapperService.documentMapper().mappingSource().toString(), containsString("\"type\":\"string\""));
-        assertWarnings("""
-            dynamic template [my_template] has invalid content \
-            [{"match_mapping_type":"string","mapping":{"type":"string"}}], attempted to validate it \
-            with the following match_mapping_type: [string], last error: [No mapper found for type [string]]""");
-    }
-
     public void testTemplateWithoutMatchPredicates() throws Exception {
         XContentBuilder mapping = XContentFactory.jsonBuilder();
         mapping.startObject();
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java
index 0b5fef2b5971..11544d81a691 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java
@@ -9,9 +9,7 @@
 package org.elasticsearch.index.mapper;
 
 import org.elasticsearch.common.bytes.BytesReference;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.termvectors.TermVectorsService;
-import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.XContentFactory;
 import org.elasticsearch.xcontent.XContentType;
 
@@ -80,39 +78,4 @@ public void testUsingEnabledSettingThrows() {
         );
     }
 
-    /**
-     * disabling the _field_names should still work for indices before 8.0
-     */
-    public void testUsingEnabledBefore8() throws Exception {
-
-        DocumentMapper docMapper = createDocumentMapper(
-            IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.V_8_0_0),
-            topMapping(b -> b.startObject("_field_names").field("enabled", false).endObject())
-        );
-
-        assertWarnings(FieldNamesFieldMapper.ENABLED_DEPRECATION_MESSAGE);
-        FieldNamesFieldMapper fieldNamesMapper = docMapper.metadataMapper(FieldNamesFieldMapper.class);
-        assertFalse(fieldNamesMapper.fieldType().isEnabled());
-
-        ParsedDocument doc = docMapper.parse(source(b -> b.field("field", "value")));
-        assertNull(doc.rootDoc().get("_field_names"));
-    }
-
-    /**
-     * Merging the "_field_names" enabled setting is forbidden in 8.0, but we still want to tests the behavior on pre-8 indices
-     */
-    public void testMergingMappingsBefore8() throws Exception {
-        MapperService mapperService = createMapperService(
-            IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.V_8_0_0),
-            mapping(b -> {})
-        );
-
-        merge(mapperService, topMapping(b -> b.startObject("_field_names").field("enabled", false).endObject()));
-        assertFalse(mapperService.documentMapper().metadataMapper(FieldNamesFieldMapper.class).fieldType().isEnabled());
-        assertWarnings(FieldNamesFieldMapper.ENABLED_DEPRECATION_MESSAGE);
-
-        merge(mapperService, topMapping(b -> b.startObject("_field_names").field("enabled", true).endObject()));
-        assertTrue(mapperService.documentMapper().metadataMapper(FieldNamesFieldMapper.class).fieldType().isEnabled());
-        assertWarnings(FieldNamesFieldMapper.ENABLED_DEPRECATION_MESSAGE);
-    }
 }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java
index a389e803e66b..621bc1cd0515 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java
@@ -726,16 +726,7 @@ private void mapping(XContentBuilder b) throws IOException {
 
             @Override
             public List<SyntheticSourceInvalidExample> invalidExample() throws IOException {
-                return List.of(
-                    new SyntheticSourceInvalidExample(
-                        equalTo("field [field] of type [geo_point] doesn't support synthetic source because it doesn't have doc values"),
-                        b -> b.field("type", "geo_point").field("doc_values", false)
-                    ),
-                    new SyntheticSourceInvalidExample(
-                        equalTo("field [field] of type [geo_point] doesn't support synthetic source because it declares copy_to"),
-                        b -> b.field("type", "geo_point").field("copy_to", "foo")
-                    )
-                );
+                return List.of();
             }
         };
     }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapperTests.java
index 61c4068cedf4..a10b47cc06a7 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapperTests.java
@@ -221,6 +221,18 @@ public void testMultipleIgnoredFieldsManyObjects() throws IOException {
         );
     }
 
+    public void testIgnoredDynamicArrayNestedInObject() throws IOException {
+        int intValue = randomInt();
+
+        String syntheticSource = getSyntheticSourceWithFieldLimit(b -> {
+            b.startObject("bar");
+            b.field("a", List.of(intValue, intValue));
+            b.endObject();
+        });
+        assertEquals(String.format(Locale.ROOT, """
+            {"bar":{"a":[%s,%s]}}""", intValue, intValue), syntheticSource);
+    }
+
     public void testDisabledRootObjectSingleField() throws IOException {
         String name = randomAlphaOfLength(20);
         DocumentMapper documentMapper = createMapperService(topMapping(b -> {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
index 296871e258cd..1fc5b370e461 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java
@@ -20,7 +20,6 @@
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.IndexMode;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.script.IpFieldScript;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -208,12 +207,6 @@ public void testNullValue() throws IOException {
             e.getMessage(),
             "Failed to parse mapping: Error parsing [null_value] on field [field]: ':1' is not an IP string literal."
         );
-
-        createDocumentMapper(IndexVersions.V_7_9_0, fieldMapping(b -> {
-            b.field("type", "ip");
-            b.field("null_value", ":1");
-        }));
-        assertWarnings("Error parsing [:1] as IP in [null_value] on field [field]); [null_value] will be ignored");
     }
 
     public void testDimension() throws IOException {
@@ -395,12 +388,7 @@ private void mapping(XContentBuilder b) throws IOException {
 
         @Override
         public List<SyntheticSourceInvalidExample> invalidExample() throws IOException {
-            return List.of(
-                new SyntheticSourceInvalidExample(
-                    equalTo("field [field] of type [ip] doesn't support synthetic source because it doesn't have doc values"),
-                    b -> b.field("type", "ip").field("doc_values", false)
-                )
-            );
+            return List.of();
         }
     }
 
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java
index 0bfa04a95f1f..b5755854a9d5 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 
 public class IpRangeFieldMapperTests extends RangeFieldMapperTests {
@@ -202,19 +201,6 @@ private void inclusiveTo(Map<String, Object> output, String to) {
         }
     }
 
-    public void testInvalidSyntheticSource() {
-        Exception e = expectThrows(IllegalArgumentException.class, () -> createDocumentMapper(syntheticSourceMapping(b -> {
-            b.startObject("field");
-            b.field("type", "ip_range");
-            b.field("doc_values", false);
-            b.endObject();
-        })));
-        assertThat(
-            e.getMessage(),
-            equalTo("field [field] of type [ip_range] doesn't support synthetic source because it doesn't have doc values")
-        );
-    }
-
     @Override
     protected SyntheticSourceSupport syntheticSourceSupport(boolean ignoreMalformed) {
         throw new AssumptionViolatedException("custom version of synthetic source tests is implemented");
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupInferenceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupInferenceFieldMapperTests.java
index 0946d547c0ad..af9d905d8023 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupInferenceFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupInferenceFieldMapperTests.java
@@ -96,7 +96,7 @@ private static class TestInferenceFieldMapper extends FieldMapper implements Inf
         public static final String CONTENT_TYPE = "test_inference_field";
 
         TestInferenceFieldMapper(String simpleName) {
-            super(simpleName, new TestInferenceFieldMapperFieldType(simpleName), MultiFields.empty(), CopyTo.empty());
+            super(simpleName, new TestInferenceFieldMapperFieldType(simpleName), BuilderParams.empty());
         }
 
         @Override
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupTests.java
index 6a790f7e9111..9eac3f0c112e 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/MappingLookupTests.java
@@ -257,7 +257,7 @@ static class FakeFieldMapper extends FieldMapper {
         final String indexedValue;
 
         FakeFieldMapper(FakeFieldType fieldType, String indexedValue) {
-            super(fieldType.name(), fieldType, MultiFields.empty(), CopyTo.empty());
+            super(fieldType.name(), fieldType, BuilderParams.empty());
             this.indexedValue = indexedValue;
         }
 
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NonDynamicFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NonDynamicFieldMapperTests.java
index 8c6486804549..d0b100950c22 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/NonDynamicFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/NonDynamicFieldMapperTests.java
@@ -69,7 +69,7 @@ public NonDynamicFieldMapper build(MapperBuilderContext context) {
         }
 
         private NonDynamicFieldMapper(String simpleName, MappedFieldType mappedFieldType) {
-            super(simpleName, mappedFieldType, MultiFields.empty(), CopyTo.empty());
+            super(simpleName, mappedFieldType, BuilderParams.empty());
         }
 
         @Override
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java
index ea6ddf0257d6..b292df40cf4d 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java
@@ -187,7 +187,7 @@ public void testMergedFieldNamesMultiFieldsWithinSubobjectsFalse() {
         final TextFieldMapper textFieldMapper = (TextFieldMapper) metrics.getMapper("host.name");
         assertEquals("foo.metrics.host.name", textFieldMapper.fullPath());
         assertEquals("host.name", textFieldMapper.leafName());
-        FieldMapper fieldMapper = textFieldMapper.multiFields.iterator().next();
+        FieldMapper fieldMapper = textFieldMapper.multiFields().iterator().next();
         assertEquals("foo.metrics.host.name.keyword", fieldMapper.fullPath());
         assertEquals("keyword", fieldMapper.leafName());
     }
@@ -361,7 +361,7 @@ private ObjectMapper.Builder createObjectSubobjectsFalseLeafWithMultiField() {
         );
         assertEquals("host.name", textKeywordMultiField.leafName());
         assertEquals("foo.metrics.host.name", textKeywordMultiField.fullPath());
-        FieldMapper fieldMapper = textKeywordMultiField.multiFields.iterator().next();
+        FieldMapper fieldMapper = textKeywordMultiField.multiFields().iterator().next();
         assertEquals("keyword", fieldMapper.leafName());
         assertEquals("foo.metrics.host.name.keyword", fieldMapper.fullPath());
         return new ObjectMapper.Builder("foo", ObjectMapper.Defaults.SUBOBJECTS).add(
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java
index 55761e5ec339..5579a8522a45 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java
@@ -16,6 +16,7 @@
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -26,8 +27,6 @@
 import org.elasticsearch.plugins.MapperPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.ScriptCompiler;
-import org.elasticsearch.test.TransportVersionUtils;
-import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.json.JsonXContent;
@@ -176,7 +175,7 @@ protected Parameter<?>[] getParameters() {
 
         @Override
         public FieldMapper build(MapperBuilderContext context) {
-            return new TestMapper(leafName(), context.buildFullName(leafName()), multiFieldsBuilder.build(this, context), copyTo, this);
+            return new TestMapper(leafName(), context.buildFullName(leafName()), builderParams(this, context), this);
         }
     }
 
@@ -205,14 +204,8 @@ public static class TestMapper extends FieldMapper {
         private final DummyEnumType enumField;
         private final DummyEnumType restrictedEnumField;
 
-        protected TestMapper(
-            String simpleName,
-            String fullName,
-            MultiFields multiFields,
-            CopyTo copyTo,
-            ParametrizedMapperTests.Builder builder
-        ) {
-            super(simpleName, new KeywordFieldMapper.KeywordFieldType(fullName), multiFields, copyTo);
+        protected TestMapper(String simpleName, String fullName, BuilderParams builderParams, ParametrizedMapperTests.Builder builder) {
+            super(simpleName, new KeywordFieldMapper.KeywordFieldType(fullName), builderParams);
             this.fixed = builder.fixed.getValue();
             this.fixed2 = builder.fixed2.getValue();
             this.variable = builder.variable.getValue();
@@ -433,6 +426,28 @@ public void testCopyTo() {
             {"field":{"type":"test_mapper","variable":"updated","required":"value"}}""", Strings.toString(noCopyTo));
     }
 
+    public void testStoredSource() {
+        String mapping = """
+            {"type":"test_mapper","variable":"foo","required":"value","synthetic_source_keep":"none"}""";
+        TestMapper mapper = fromMapping(mapping);
+        assertEquals("{\"field\":" + mapping + "}", Strings.toString(mapper));
+
+        mapping = """
+            {"type":"test_mapper","variable":"foo","required":"value","synthetic_source_keep":"arrays"}""";
+        mapper = fromMapping(mapping);
+        assertEquals("{\"field\":" + mapping + "}", Strings.toString(mapper));
+
+        mapping = """
+            {"type":"test_mapper","variable":"foo","required":"value","synthetic_source_keep":"all"}""";
+        mapper = fromMapping(mapping);
+        assertEquals("{\"field\":" + mapping + "}", Strings.toString(mapper));
+
+        String mappingThrows = """
+            {"type":"test_mapper","variable":"foo","required":"value","synthetic_source_keep":"no-such-value"}""";
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> fromMapping(mappingThrows));
+        assertEquals("Unknown synthetic_source_keep value [no-such-value], accepted values are [none,arrays,all]", e.getMessage());
+    }
+
     public void testNullables() {
         String mapping = """
             {"type":"test_mapper","fixed":null,"required":"value"}""";
@@ -531,37 +546,6 @@ public void testDeprecatedParameterName() {
             {"field":{"type":"test_mapper","fixed2":true,"required":"value"}}""", Strings.toString(mapper));
     }
 
-    /**
-     * test parsing mapping from dynamic templates, should ignore unknown parameters for bwc and log warning before 8.0.0
-     */
-    public void testBWCunknownParametersfromDynamicTemplates() {
-        String mapping = """
-            {"type":"test_mapper","some_unknown_parameter":true,"required":"value"}""";
-        TestMapper mapper = fromMapping(
-            mapping,
-            IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.V_8_0_0),
-            TransportVersionUtils.randomVersionBetween(
-                random(),
-                TransportVersions.V_7_0_0,
-                TransportVersionUtils.getPreviousVersion(TransportVersions.V_8_0_0)
-            ),
-            true
-        );
-        assertNotNull(mapper);
-        assertWarnings(
-            "Parameter [some_unknown_parameter] is used in a dynamic template mapping and has no effect on type [test_mapper]. "
-                + "Usage will result in an error in future major versions and should be removed."
-        );
-        assertEquals("""
-            {"field":{"type":"test_mapper","required":"value"}}""", Strings.toString(mapper));
-
-        MapperParsingException ex = expectThrows(
-            MapperParsingException.class,
-            () -> fromMapping(mapping, IndexVersions.V_8_0_0, TransportVersions.V_8_0_0, true)
-        );
-        assertEquals("unknown parameter [some_unknown_parameter] on mapper [field] of type [test_mapper]", ex.getMessage());
-    }
-
     public void testAnalyzers() {
         String mapping = """
             {"type":"test_mapper","analyzer":"_standard","required":"value"}""";
@@ -593,6 +577,8 @@ public void testAnalyzers() {
         );
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this is testing legacy functionality so can likely be removed in 9.0")
     public void testDeprecatedParameters() {
         // 'index' is declared explicitly, 'store' is not, but is one of the previously always-accepted params
         String mapping = """
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java
index cda594326464..0275d7bfe0e3 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java
@@ -25,7 +25,6 @@
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 import static org.elasticsearch.index.query.RangeQueryBuilder.GTE_FIELD;
@@ -34,7 +33,6 @@
 import static org.elasticsearch.index.query.RangeQueryBuilder.LT_FIELD;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
 
 public abstract class RangeFieldMapperTests extends MapperTestCase {
@@ -291,18 +289,7 @@ private void mapping(XContentBuilder b) throws IOException {
 
             @Override
             public List<SyntheticSourceInvalidExample> invalidExample() throws IOException {
-                return List.of(
-                    new SyntheticSourceInvalidExample(
-                        equalTo(
-                            String.format(
-                                Locale.ROOT,
-                                "field [field] of type [%s] doesn't support synthetic source because it doesn't have doc values",
-                                rangeType().name
-                            )
-                        ),
-                        b -> b.field("type", rangeType().name).field("doc_values", false)
-                    )
-                );
+                return List.of();
             }
         };
     }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java
index d0350c1d92a8..bbffc497d6ad 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java
@@ -9,10 +9,14 @@
 package org.elasticsearch.index.mapper;
 
 import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.index.IndexMode;
+import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -22,8 +26,10 @@
 import org.elasticsearch.xcontent.json.JsonXContent;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
+import static org.elasticsearch.indices.recovery.RecoverySettings.INDICES_RECOVERY_SOURCE_ENABLED_SETTING;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;
@@ -347,4 +353,195 @@ public void testBypassCheckForNonDefaultParameterValuesInEarlierVersions() throw
             assertThat(sourceFieldMapper, notNullValue());
         }
     }
+
+    public void testRecoverySourceWithSourceExcludes() throws IOException {
+        {
+            MapperService mapperService = createMapperService(
+                topMapping(b -> b.startObject(SourceFieldMapper.NAME).field("excludes", List.of("field1")).endObject())
+            );
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> { b.field("field1", "value1"); }));
+
+            assertNotNull(doc.rootDoc().getField("_recovery_source"));
+            assertThat(doc.rootDoc().getField("_recovery_source").binaryValue(), equalTo(new BytesRef("{\"field1\":\"value1\"}")));
+        }
+        {
+            Settings settings = Settings.builder().put(INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey(), false).build();
+            MapperService mapperService = createMapperService(
+                settings,
+                topMapping(b -> b.startObject(SourceFieldMapper.NAME).field("enabled", false).endObject())
+            );
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> b.field("field1", "value1")));
+            assertNull(doc.rootDoc().getField("_recovery_source"));
+        }
+    }
+
+    public void testRecoverySourceWithSourceDisabled() throws IOException {
+        {
+            MapperService mapperService = createMapperService(
+                topMapping(b -> b.startObject(SourceFieldMapper.NAME).field("enabled", false).endObject())
+            );
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> { b.field("field1", "value1"); }));
+            assertNotNull(doc.rootDoc().getField("_recovery_source"));
+            assertThat(doc.rootDoc().getField("_recovery_source").binaryValue(), equalTo(new BytesRef("{\"field1\":\"value1\"}")));
+        }
+        {
+            Settings settings = Settings.builder().put(INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey(), false).build();
+            MapperService mapperService = createMapperService(
+                settings,
+                topMapping(b -> b.startObject(SourceFieldMapper.NAME).field("enabled", false).endObject())
+            );
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> b.field("field1", "value1")));
+            assertNull(doc.rootDoc().getField("_recovery_source"));
+        }
+    }
+
+    public void testRecoverySourceWithSyntheticSource() throws IOException {
+        {
+            MapperService mapperService = createMapperService(
+                topMapping(b -> b.startObject(SourceFieldMapper.NAME).field("mode", "synthetic").endObject())
+            );
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> { b.field("field1", "value1"); }));
+            assertNotNull(doc.rootDoc().getField("_recovery_source"));
+            assertThat(doc.rootDoc().getField("_recovery_source").binaryValue(), equalTo(new BytesRef("{\"field1\":\"value1\"}")));
+        }
+        {
+            Settings settings = Settings.builder().put(INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey(), false).build();
+            MapperService mapperService = createMapperService(
+                settings,
+                topMapping(b -> b.startObject(SourceFieldMapper.NAME).field("mode", "synthetic").endObject())
+            );
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> b.field("field1", "value1")));
+            assertNull(doc.rootDoc().getField("_recovery_source"));
+        }
+    }
+
+    public void testRecoverySourceWithLogs() throws IOException {
+        {
+            Settings settings = Settings.builder().put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.getName()).build();
+            MapperService mapperService = createMapperService(settings, mapping(b -> {}));
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> { b.field("@timestamp", "2012-02-13"); }));
+            assertNotNull(doc.rootDoc().getField("_recovery_source"));
+            assertThat(doc.rootDoc().getField("_recovery_source").binaryValue(), equalTo(new BytesRef("{\"@timestamp\":\"2012-02-13\"}")));
+        }
+        {
+            Settings settings = Settings.builder()
+                .put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.getName())
+                .put(INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey(), false)
+                .build();
+            MapperService mapperService = createMapperService(settings, mapping(b -> {}));
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> b.field("@timestamp", "2012-02-13")));
+            assertNull(doc.rootDoc().getField("_recovery_source"));
+        }
+    }
+
+    public void testRecoverySourceWithLogsCustom() throws IOException {
+        XContentBuilder mappings = topMapping(b -> b.startObject(SourceFieldMapper.NAME).field("mode", "synthetic").endObject());
+        {
+            Settings settings = Settings.builder().put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.getName()).build();
+            MapperService mapperService = createMapperService(settings, mappings);
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> { b.field("@timestamp", "2012-02-13"); }));
+            assertNotNull(doc.rootDoc().getField("_recovery_source"));
+            assertThat(doc.rootDoc().getField("_recovery_source").binaryValue(), equalTo(new BytesRef("{\"@timestamp\":\"2012-02-13\"}")));
+        }
+        {
+            Settings settings = Settings.builder()
+                .put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.getName())
+                .put(INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey(), false)
+                .build();
+            MapperService mapperService = createMapperService(settings, mappings);
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source(b -> b.field("@timestamp", "2012-02-13")));
+            assertNull(doc.rootDoc().getField("_recovery_source"));
+        }
+    }
+
+    public void testRecoverySourceWithTimeSeries() throws IOException {
+        {
+            Settings settings = Settings.builder()
+                .put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES.getName())
+                .put(IndexMetadata.INDEX_ROUTING_PATH.getKey(), "field")
+                .build();
+            MapperService mapperService = createMapperService(settings, fieldMapping(b -> {
+                b.field("type", "keyword");
+                b.field("time_series_dimension", true);
+            }));
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source("123", b -> b.field("@timestamp", "2012-02-13").field("field", "value1"), null));
+            assertNotNull(doc.rootDoc().getField("_recovery_source"));
+            assertThat(
+                doc.rootDoc().getField("_recovery_source").binaryValue(),
+                equalTo(new BytesRef("{\"@timestamp\":\"2012-02-13\",\"field\":\"value1\"}"))
+            );
+        }
+        {
+            Settings settings = Settings.builder()
+                .put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES.getName())
+                .put(IndexMetadata.INDEX_ROUTING_PATH.getKey(), "field")
+                .put(INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey(), false)
+                .build();
+            MapperService mapperService = createMapperService(settings, fieldMapping(b -> {
+                b.field("type", "keyword");
+                b.field("time_series_dimension", true);
+            }));
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(
+                source("123", b -> b.field("@timestamp", "2012-02-13").field("field", randomAlphaOfLength(5)), null)
+            );
+            assertNull(doc.rootDoc().getField("_recovery_source"));
+        }
+    }
+
+    public void testRecoverySourceWithTimeSeriesCustom() throws IOException {
+        String mappings = """
+                {
+                    "_doc" : {
+                        "_source" : {
+                            "mode" : "synthetic"
+                        },
+                        "properties": {
+                            "field": {
+                                "type": "keyword",
+                                "time_series_dimension": true
+                            }
+                        }
+                    }
+                }
+            """;
+        {
+            Settings settings = Settings.builder()
+                .put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES.getName())
+                .put(IndexMetadata.INDEX_ROUTING_PATH.getKey(), "field")
+                .build();
+            MapperService mapperService = createMapperService(settings, mappings);
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(source("123", b -> b.field("@timestamp", "2012-02-13").field("field", "value1"), null));
+            assertNotNull(doc.rootDoc().getField("_recovery_source"));
+            assertThat(
+                doc.rootDoc().getField("_recovery_source").binaryValue(),
+                equalTo(new BytesRef("{\"@timestamp\":\"2012-02-13\",\"field\":\"value1\"}"))
+            );
+        }
+        {
+            Settings settings = Settings.builder()
+                .put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES.getName())
+                .put(IndexMetadata.INDEX_ROUTING_PATH.getKey(), "field")
+                .put(INDICES_RECOVERY_SOURCE_ENABLED_SETTING.getKey(), false)
+                .build();
+            MapperService mapperService = createMapperService(settings, mappings);
+            DocumentMapper docMapper = mapperService.documentMapper();
+            ParsedDocument doc = docMapper.parse(
+                source("123", b -> b.field("@timestamp", "2012-02-13").field("field", randomAlphaOfLength(5)), null)
+            );
+            assertNull(doc.rootDoc().getField("_recovery_source"));
+        }
+    }
 }
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMetricsTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMetricsTests.java
index f569a69246d9..769347985cfa 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMetricsTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMetricsTests.java
@@ -60,10 +60,8 @@ public void testSyntheticSourceLoadLatency() throws IOException {
     }
 
     public void testSyntheticSourceIncompatibleMapping() throws IOException {
-        var mapping = syntheticSourceMapping(b -> b.startObject("kwd").field("type", "text").field("store", "false").endObject());
         var mapperMetrics = createTestMapperMetrics();
-        var mapperService = new TestMapperServiceBuilder().mapperMetrics(mapperMetrics).build();
-        assertThrows(IllegalArgumentException.class, () -> withMapping(mapperService, mapping));
+        mapperMetrics.sourceFieldMetrics().recordSyntheticSourceIncompatibleMapping();
 
         var measurements = telemetryPlugin.getLongCounterMeasurement(SourceFieldMetrics.SYNTHETIC_SOURCE_INCOMPATIBLE_MAPPING);
         assertEquals(1, measurements.size());
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/SourceLoaderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceLoaderTests.java
index 848f8878ffb9..a454ddeb721d 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/SourceLoaderTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/SourceLoaderTests.java
@@ -33,20 +33,6 @@ public void testEmptyObject() throws IOException {
             {"kwd":"foo"}"""));
     }
 
-    public void testUnsupported() throws IOException {
-        Exception e = expectThrows(
-            IllegalArgumentException.class,
-            () -> createDocumentMapper(syntheticSourceMapping(b -> b.startObject("txt").field("type", "text").endObject()))
-        );
-        assertThat(
-            e.getMessage(),
-            equalTo(
-                "field [txt] of type [text] doesn't support synthetic source unless it is stored or has a sub-field "
-                    + "of type [keyword] with doc values or stored and without a normalizer"
-            )
-        );
-    }
-
     public void testDotsInFieldName() throws IOException {
         DocumentMapper mapper = createDocumentMapper(
             syntheticSourceMapping(b -> b.startObject("foo.bar.baz").field("type", "keyword").endObject())
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java
index 035466d93ab0..8013a9358175 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java
@@ -70,9 +70,6 @@ public void testMultiFieldWithinMultiField() throws IOException {
 
         Mapper.TypeParser typeParser = KeywordFieldMapper.PARSER;
 
-        // For indices created prior to 8.0, we should only emit a warning and not fail parsing.
-        Map<String, Object> fieldNode = XContentHelper.convertToMap(BytesReference.bytes(mapping), true, mapping.contentType()).v2();
-
         MapperService mapperService = mock(MapperService.class);
         IndexAnalyzers indexAnalyzers = IndexAnalyzers.of(defaultAnalyzers());
         when(mapperService.getIndexAnalyzers()).thenReturn(indexAnalyzers);
@@ -86,32 +83,6 @@ public void testMultiFieldWithinMultiField() throws IOException {
         IndexSettings indexSettings = new IndexSettings(metadata, Settings.EMPTY);
         when(mapperService.getIndexSettings()).thenReturn(indexSettings);
 
-        IndexVersion olderVersion = IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.V_8_0_0);
-        MappingParserContext olderContext = new MappingParserContext(
-            null,
-            type -> typeParser,
-            type -> null,
-            olderVersion,
-            () -> TransportVersions.MINIMUM_COMPATIBLE,
-            null,
-            ScriptCompiler.NONE,
-            mapperService.getIndexAnalyzers(),
-            mapperService.getIndexSettings(),
-            ProvidedIdFieldMapper.NO_FIELD_DATA,
-            query -> {
-                throw new UnsupportedOperationException();
-            }
-        );
-
-        TextFieldMapper.PARSER.parse("some-field", fieldNode, olderContext);
-        assertWarnings(
-            "At least one multi-field, [sub-field], "
-                + "was encountered that itself contains a multi-field. Defining multi-fields within a multi-field is deprecated "
-                + "and is not supported for indices created in 8.0 and later. To migrate the mappings, all instances of [fields] "
-                + "that occur within a [fields] block should be removed from the mappings, either by flattening the chained "
-                + "[fields] blocks into a single level, or switching to [copy_to] if appropriate."
-        );
-
         // For indices created in 8.0 or later, we should throw an error.
         Map<String, Object> fieldNodeCopy = XContentHelper.convertToMap(BytesReference.bytes(mapping), true, mapping.contentType()).v2();
 
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapperTests.java
index 7b7044f528c8..3a0952afaed5 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldMapperTests.java
@@ -749,12 +749,7 @@ public SyntheticSourceExample example(int maxValues) throws IOException {
 
         @Override
         public List<SyntheticSourceInvalidExample> invalidExample() throws IOException {
-            return List.of(
-                new SyntheticSourceInvalidExample(
-                    equalTo("field [field] of type [flattened] doesn't support synthetic " + "source because it doesn't have doc values"),
-                    b -> b.field("type", "flattened").field("doc_values", false)
-                )
-            );
+            return List.of();
         }
 
         private void mapping(XContentBuilder b) throws IOException {
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/BinaryDenseVectorScriptDocValuesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/BinaryDenseVectorScriptDocValuesTests.java
index 1df42368041a..a3fd002e68a1 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/vectors/BinaryDenseVectorScriptDocValuesTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/vectors/BinaryDenseVectorScriptDocValuesTests.java
@@ -11,13 +11,13 @@
 import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.ElementType;
 import org.elasticsearch.script.field.vectors.BinaryDenseVectorDocValuesField;
 import org.elasticsearch.script.field.vectors.ByteBinaryDenseVectorDocValuesField;
 import org.elasticsearch.script.field.vectors.DenseVector;
 import org.elasticsearch.script.field.vectors.DenseVectorDocValuesField;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.index.IndexVersionUtils;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -32,7 +32,7 @@ public void testFloatGetVectorValueAndGetMagnitude() throws IOException {
         float[][] vectors = { { 1, 1, 1 }, { 1, 1, 2 }, { 1, 1, 3 } };
         float[] expectedMagnitudes = { 1.7320f, 2.4495f, 3.3166f };
 
-        for (IndexVersion indexVersion : List.of(IndexVersions.V_7_4_0, IndexVersion.current())) {
+        for (IndexVersion indexVersion : List.of(IndexVersionUtils.randomCompatibleVersion(random()), IndexVersion.current())) {
             BinaryDocValues docValues = wrap(vectors, ElementType.FLOAT, indexVersion);
             DenseVectorDocValuesField field = new BinaryDenseVectorDocValuesField(docValues, "test", ElementType.FLOAT, dims, indexVersion);
             DenseVectorScriptDocValues scriptDocValues = field.toScriptDocValues();
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java
index 83b8a8fa991c..ad719e398ae3 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java
@@ -1321,24 +1321,6 @@ public void testDefaultParamsIndexByDefault() throws Exception {
         assertEquals(VectorSimilarity.COSINE, denseVectorFieldType.getSimilarity());
     }
 
-    public void testAddDocumentsToIndexBefore_V_7_5_0() throws Exception {
-        IndexVersion indexVersion = IndexVersions.V_7_4_0;
-        DocumentMapper mapper = createDocumentMapper(
-            indexVersion,
-            fieldMapping(b -> b.field("index", false).field("type", "dense_vector").field("dims", 3))
-        );
-
-        float[] validVector = { -12.1f, 100.7f, -4 };
-        ParsedDocument doc1 = mapper.parse(source(b -> b.array("field", validVector)));
-        List<IndexableField> fields = doc1.rootDoc().getFields("field");
-        assertEquals(1, fields.size());
-        assertThat(fields.get(0), instanceOf(BinaryDocValuesField.class));
-        // assert that after decoding the indexed value is equal to expected
-        BytesRef vectorBR = fields.get(0).binaryValue();
-        float[] decodedValues = decodeDenseVector(indexVersion, vectorBR);
-        assertArrayEquals("Decoded dense vector values is not equal to the indexed one.", validVector, decodedValues, 0.001f);
-    }
-
     public void testValidateOnBuild() {
         final MapperBuilderContext context = MapperBuilderContext.root(false, false);
 
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java
index 271f0c12be61..2bfd8740a971 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/vectors/SparseVectorFieldMapperTests.java
@@ -13,7 +13,6 @@
 import org.apache.lucene.document.FeatureField;
 import org.apache.lucene.index.IndexableField;
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.DocumentMapper;
@@ -22,11 +21,8 @@
 import org.elasticsearch.index.mapper.MapperParsingException;
 import org.elasticsearch.index.mapper.MapperTestCase;
 import org.elasticsearch.index.mapper.ParsedDocument;
-import org.elasticsearch.index.mapper.SourceToParse;
 import org.elasticsearch.test.index.IndexVersionUtils;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentFactory;
-import org.elasticsearch.xcontent.XContentType;
 import org.hamcrest.Matchers;
 import org.junit.AssumptionViolatedException;
 
@@ -111,12 +107,26 @@ public void testDefaults() throws Exception {
 
     public void testDotInFieldName() throws Exception {
         DocumentMapper mapper = createDocumentMapper(fieldMapping(this::minimalMapping));
-        DocumentParsingException ex = expectThrows(
-            DocumentParsingException.class,
-            () -> mapper.parse(source(b -> b.field("field", Map.of("politi.cs", 10, "sports", 20))))
-        );
-        assertThat(ex.getCause().getMessage(), containsString("do not support dots in feature names"));
-        assertThat(ex.getCause().getMessage(), containsString("politi.cs"));
+        ParsedDocument parsedDocument = mapper.parse(source(b -> b.field("field", Map.of("foo.bar", 10, "foobar", 20))));
+
+        List<IndexableField> fields = parsedDocument.rootDoc().getFields("field");
+        assertEquals(2, fields.size());
+        assertThat(fields.get(0), Matchers.instanceOf(FeatureField.class));
+        FeatureField featureField1 = null;
+        FeatureField featureField2 = null;
+        for (IndexableField field : fields) {
+            if (field.stringValue().equals("foo.bar")) {
+                featureField1 = (FeatureField) field;
+            } else if (field.stringValue().equals("foobar")) {
+                featureField2 = (FeatureField) field;
+            } else {
+                throw new UnsupportedOperationException();
+            }
+        }
+
+        int freq1 = getFrequency(featureField1.tokenStream(null, null));
+        int freq2 = getFrequency(featureField2.tokenStream(null, null));
+        assertTrue(freq1 < freq2);
     }
 
     public void testHandlesMultiValuedFields() throws MapperParsingException, IOException {
@@ -156,7 +166,7 @@ public void testHandlesMultiValuedFields() throws MapperParsingException, IOExce
         }));
 
         // then validate that the generate document stored both values appropriately and we have only the max value stored
-        FeatureField barField = ((FeatureField) doc1.rootDoc().getByKey("foo.field.bar"));
+        FeatureField barField = ((FeatureField) doc1.rootDoc().getByKey("foo.field\\.bar"));
         assertEquals(20, barField.getFeatureValue(), 1);
 
         FeatureField storedBarField = ((FeatureField) doc1.rootDoc().getFields("foo.field").get(1));
@@ -212,44 +222,6 @@ protected IndexVersion boostNotAllowedIndexVersion() {
         return NEW_SPARSE_VECTOR_INDEX_VERSION;
     }
 
-    public void testSparseVectorWith7xIndex() throws Exception {
-        IndexVersion version = IndexVersionUtils.randomPreviousCompatibleVersion(random(), PREVIOUS_SPARSE_VECTOR_INDEX_VERSION);
-
-        XContentBuilder builder = XContentFactory.jsonBuilder()
-            .startObject()
-            .startObject("_doc")
-            .startObject("properties")
-            .startObject("my-vector")
-            .field("type", "sparse_vector")
-            .endObject()
-            .endObject()
-            .endObject()
-            .endObject();
-
-        DocumentMapper mapper = createDocumentMapper(version, builder);
-        assertWarnings(SparseVectorFieldMapper.ERROR_MESSAGE_7X);
-
-        // Check that new vectors cannot be indexed.
-        int[] indexedDims = { 65535, 50, 2 };
-        float[] indexedValues = { 0.5f, 1800f, -34567.11f };
-        BytesReference source = BytesReference.bytes(
-            XContentFactory.jsonBuilder()
-                .startObject()
-                .startObject("my-vector")
-                .field(Integer.toString(indexedDims[0]), indexedValues[0])
-                .field(Integer.toString(indexedDims[1]), indexedValues[1])
-                .field(Integer.toString(indexedDims[2]), indexedValues[2])
-                .endObject()
-                .endObject()
-        );
-
-        DocumentParsingException indexException = expectThrows(
-            DocumentParsingException.class,
-            () -> mapper.parse(new SourceToParse("id", source, XContentType.JSON))
-        );
-        assertThat(indexException.getCause().getMessage(), containsString(SparseVectorFieldMapper.ERROR_MESSAGE_7X));
-    }
-
     public void testSparseVectorUnsupportedIndex() throws Exception {
         IndexVersion version = IndexVersionUtils.randomVersionBetween(
             random(),
diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/VectorEncoderDecoderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/VectorEncoderDecoderTests.java
index 80b08f907be8..9e581aa7711e 100644
--- a/server/src/test/java/org/elasticsearch/index/mapper/vectors/VectorEncoderDecoderTests.java
+++ b/server/src/test/java/org/elasticsearch/index/mapper/vectors/VectorEncoderDecoderTests.java
@@ -10,6 +10,7 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.index.IndexVersion;
+import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.index.IndexVersionUtils;
 
@@ -27,7 +28,7 @@ public void testVectorDecodingWithOffset() {
         for (IndexVersion version : List.of(
             IndexVersionUtils.randomVersionBetween(
                 random(),
-                DenseVectorFieldMapper.MAGNITUDE_STORED_INDEX_VERSION,
+                IndexVersions.MINIMUM_COMPATIBLE,
                 IndexVersionUtils.getPreviousVersion(DenseVectorFieldMapper.LITTLE_ENDIAN_FLOAT_STORED_INDEX_VERSION)
             ),
             DenseVectorFieldMapper.LITTLE_ENDIAN_FLOAT_STORED_INDEX_VERSION
diff --git a/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java
index 278d4ae505bd..48e8f0ef1167 100644
--- a/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java
@@ -373,7 +373,7 @@ public void testParseFailsWithTermsArray() {
                 "message1" : ["term1", "term2"]
               }
             }""";
-        expectThrows(IllegalStateException.class, () -> parseQuery(json2));
+        expectThrows(IllegalArgumentException.class, () -> parseQuery(json2));
     }
 
     public void testExceptionUsingAnalyzerOnNumericField() {
diff --git a/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java b/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java
index ffca4352f0ae..1f01b6bb45e6 100644
--- a/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java
+++ b/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java
@@ -383,7 +383,7 @@ public void testSearchRequestRuntimeFieldsAndMultifieldDetection() {
 
     public void testSyntheticSourceSearchLookup() throws IOException {
         // Build a mapping using synthetic source
-        SourceFieldMapper sourceMapper = new SourceFieldMapper.Builder(null, Settings.EMPTY, false).setSynthetic().build();
+        SourceFieldMapper sourceMapper = new SourceFieldMapper.Builder(null, Settings.EMPTY, false, true).setSynthetic().build();
         RootObjectMapper root = new RootObjectMapper.Builder("_doc", Optional.empty()).add(
             new KeywordFieldMapper.Builder("cat", IndexVersion.current()).ignoreAbove(100)
         ).build(MapperBuilderContext.root(true, false));
diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
index 28497dc4a8a6..63bd1fd6cdef 100644
--- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
+++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
@@ -1793,6 +1793,7 @@ public void testShardFieldStats() throws IOException {
         assertNotNull(stats);
         assertThat(stats.numSegments(), equalTo(0));
         assertThat(stats.totalFields(), equalTo(0));
+        assertThat(stats.fieldUsages(), equalTo(0L));
         // index some documents
         int numDocs = between(1, 10);
         for (int i = 0; i < numDocs; i++) {
@@ -1809,6 +1810,9 @@ public void testShardFieldStats() throws IOException {
         assertThat(stats.numSegments(), equalTo(1));
         // _id, _source, _version, _primary_term, _seq_no, f1, f1.keyword, f2, f2.keyword,
         assertThat(stats.totalFields(), equalTo(9));
+        // _id(term), _source(0), _version(dv), _primary_term(dv), _seq_no(point,dv), f1(postings,norms),
+        // f1.keyword(term,dv), f2(postings,norms), f2.keyword(term,dv),
+        assertThat(stats.fieldUsages(), equalTo(13L));
         // don't re-compute on refresh without change
         if (randomBoolean()) {
             shard.refresh("test");
@@ -1838,10 +1842,15 @@ public void testShardFieldStats() throws IOException {
         assertThat(stats.numSegments(), equalTo(2));
         // 9 + _id, _source, _version, _primary_term, _seq_no, f1, f1.keyword, f2, f2.keyword, f3, f3.keyword
         assertThat(stats.totalFields(), equalTo(21));
+        // first segment: 13, second segment: 13 + f3(postings,norms) + f3.keyword(term,dv), and __soft_deletes to previous segment
+        assertThat(stats.fieldUsages(), equalTo(31L));
         shard.forceMerge(new ForceMergeRequest().maxNumSegments(1).flush(true));
         stats = shard.getShardFieldStats();
         assertThat(stats.numSegments(), equalTo(1));
         assertThat(stats.totalFields(), equalTo(12));
+        // _id(term), _source(0), _version(dv), _primary_term(dv), _seq_no(point,dv), f1(postings,norms),
+        // f1.keyword(term,dv), f2(postings,norms), f2.keyword(term,dv), f3(postings,norms), f3.keyword(term,dv), __soft_deletes
+        assertThat(stats.fieldUsages(), equalTo(18L));
         closeShards(shard);
     }
 
diff --git a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java
index a003436fc052..f45b349d0770 100644
--- a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java
@@ -73,7 +73,7 @@ public float score(float freq, long norm) {
         };
         IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
-            () -> SimilarityService.validateSimilarity(IndexVersions.V_7_0_0, negativeScoresSim)
+            () -> SimilarityService.validateSimilarity(IndexVersions.MINIMUM_COMPATIBLE, negativeScoresSim)
         );
         assertThat(e.getMessage(), Matchers.containsString("Similarities should not return negative scores"));
 
@@ -98,7 +98,7 @@ public float score(float freq, long norm) {
         };
         e = expectThrows(
             IllegalArgumentException.class,
-            () -> SimilarityService.validateSimilarity(IndexVersions.V_7_0_0, decreasingScoresWithFreqSim)
+            () -> SimilarityService.validateSimilarity(IndexVersions.MINIMUM_COMPATIBLE, decreasingScoresWithFreqSim)
         );
         assertThat(e.getMessage(), Matchers.containsString("Similarity scores should not decrease when term frequency increases"));
 
@@ -123,7 +123,7 @@ public float score(float freq, long norm) {
         };
         e = expectThrows(
             IllegalArgumentException.class,
-            () -> SimilarityService.validateSimilarity(IndexVersions.V_7_0_0, increasingScoresWithNormSim)
+            () -> SimilarityService.validateSimilarity(IndexVersions.MINIMUM_COMPATIBLE, increasingScoresWithNormSim)
         );
         assertThat(e.getMessage(), Matchers.containsString("Similarity scores should not increase when norm increases"));
     }
diff --git a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java
index 00a657b7fdcf..dce54b11b720 100644
--- a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java
+++ b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java
@@ -16,6 +16,7 @@
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.Random;
 
 import static org.hamcrest.Matchers.equalTo;
@@ -75,7 +76,123 @@ protected InputStream openSlice(int slice) throws IOException {
         for (int i = 0; i < streams.length; i++) {
             assertTrue(streams[i].closed);
         }
+    }
+
+    public void testRandomMarkReset() throws IOException {
+        final int slices = randomIntBetween(1, 20);
+        final var bytes = randomByteArrayOfLength(randomIntBetween(1000, 10000));
+        final int sliceSize = bytes.length / slices;
+
+        final var streamsOpened = new ArrayList<CheckClosedInputStream>();
+        SlicedInputStream input = new SlicedInputStream(slices) {
+            @Override
+            protected InputStream openSlice(int slice) throws IOException {
+                final int sliceOffset = slice * sliceSize;
+                final int length = slice == slices - 1 ? bytes.length - sliceOffset : sliceSize;
+                final var stream = new CheckClosedInputStream(new ByteArrayInputStream(bytes, sliceOffset, length));
+                streamsOpened.add(stream);
+                return stream;
+            }
+        };
+
+        // Read up to a random point
+        final int mark = randomIntBetween(0, bytes.length);
+        if (mark > 0) {
+            final var bytesReadUntilMark = new byte[mark];
+            input.readNBytes(bytesReadUntilMark, 0, mark);
+            final var expectedBytesUntilMark = new ByteArrayInputStream(bytes, 0, mark).readAllBytes();
+            assertArrayEquals(expectedBytesUntilMark, bytesReadUntilMark);
+        }
+
+        // Reset should throw since there is no mark
+        expectThrows(IOException.class, input::reset);
+
+        // Mark
+        input.mark(randomNonNegativeInt());
+
+        // Read up to another random point
+        final int moreBytes = randomIntBetween(0, bytes.length - mark);
+        if (moreBytes > 0) {
+            final var moreBytesRead = new byte[moreBytes];
+            input.readNBytes(moreBytesRead, 0, moreBytes);
+            final var expectedMoreBytes = new ByteArrayInputStream(bytes, mark, moreBytes).readAllBytes();
+            assertArrayEquals(expectedMoreBytes, moreBytesRead);
+        }
+
+        // Reset
+        input.reset();
+
+        // Read all remaining bytes, which should be the bytes from mark up to the end
+        final int remainingBytes = bytes.length - mark;
+        if (remainingBytes > 0) {
+            final var remainingBytesRead = new byte[remainingBytes];
+            input.readNBytes(remainingBytesRead, 0, remainingBytes);
+            final var expectedRemainingBytes = new ByteArrayInputStream(bytes, mark, remainingBytes).readAllBytes();
+            assertArrayEquals(expectedRemainingBytes, remainingBytesRead);
+        }
+
+        // Confirm we reached the end and close the stream
+        assertThat(input.read(), equalTo(-1));
+        input.close();
+        streamsOpened.forEach(stream -> assertTrue(stream.closed));
+    }
+
+    public void testMarkResetClosedStream() throws IOException {
+        final int slices = randomIntBetween(1, 20);
+        SlicedInputStream input = new SlicedInputStream(slices) {
+            @Override
+            protected InputStream openSlice(int slice) throws IOException {
+                return new ByteArrayInputStream(new byte[] { 0 }, 0, 1);
+            }
+        };
+
+        input.skip(randomIntBetween(1, slices));
+        input.mark(randomNonNegativeInt());
+        input.close();
+        // SlicedInputStream supports reading -1 after close without throwing
+        assertThat(input.read(), equalTo(-1));
+        expectThrows(IOException.class, input::reset);
+        assertThat(input.read(), equalTo(-1));
+        input.mark(randomNonNegativeInt());
+        assertThat(input.read(), equalTo(-1));
+    }
+
+    public void testMarkResetUnsupportedStream() throws IOException {
+        final int slices = randomIntBetween(1, 20);
+        SlicedInputStream input = new SlicedInputStream(slices) {
+            @Override
+            protected InputStream openSlice(int slice) throws IOException {
+                return new ByteArrayInputStream(new byte[] { 0 }, 0, 1);
+            }
+
+            @Override
+            public boolean markSupported() {
+                return false;
+            }
+        };
 
+        input.mark(randomNonNegativeInt());
+        expectThrows(IOException.class, input::reset);
+        input.close();
+    }
+
+    public void testMarkResetZeroSlices() throws IOException {
+        SlicedInputStream input = new SlicedInputStream(0) {
+            @Override
+            protected InputStream openSlice(int slice) throws IOException {
+                throw new AssertionError("should not be called");
+            }
+        };
+
+        if (randomBoolean()) {
+            // randomly initialize the stream
+            assertThat(input.read(), equalTo(-1));
+        }
+
+        input.mark(randomNonNegativeInt());
+        input.reset();
+        assertThat(input.read(), equalTo(-1));
+        input.close();
     }
 
     private int readFully(InputStream stream, byte[] buffer) throws IOException {
diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java
index 628ff4b99b13..686acc367ade 100644
--- a/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java
+++ b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java
@@ -8,6 +8,7 @@
 
 package org.elasticsearch.indices;
 
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.DataStreamTimestampFieldMapper;
@@ -96,6 +97,8 @@ public Map<String, MetadataFieldMapper.TypeParser> getMetadataMappers() {
         DataStreamTimestampFieldMapper.NAME,
         FieldNamesFieldMapper.NAME };
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "test is referencing 7.x index versions so needs to be updated for 9.0 bump")
     public void testBuiltinMappers() {
         IndicesModule module = new IndicesModule(Collections.emptyList());
         {
diff --git a/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java b/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java
index c4d6cb6be502..ff65464085c0 100644
--- a/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java
+++ b/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java
@@ -21,7 +21,6 @@
 import org.elasticsearch.index.IndexService.IndexCreationContext;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.analysis.Analysis;
 import org.elasticsearch.index.analysis.AnalysisRegistry;
 import org.elasticsearch.index.analysis.CharFilterFactory;
@@ -187,34 +186,6 @@ public void testUnderscoreInAnalyzerName() throws IOException {
         }
     }
 
-    public void testStandardFilterBWC() throws IOException {
-        // standard tokenfilter should have been removed entirely in the 7x line. However, a
-        // cacheing bug meant that it was still possible to create indexes using a standard
-        // filter until 7.6
-        {
-            IndexVersion version = IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_6_0, IndexVersion.current());
-            final Settings settings = Settings.builder()
-                .put("index.analysis.analyzer.my_standard.tokenizer", "standard")
-                .put("index.analysis.analyzer.my_standard.filter", "standard")
-                .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
-                .put(IndexMetadata.SETTING_VERSION_CREATED, version)
-                .build();
-            IllegalArgumentException exc = expectThrows(IllegalArgumentException.class, () -> getIndexAnalyzers(settings));
-            assertThat(exc.getMessage(), equalTo("The [standard] token filter has been removed."));
-        }
-        {
-            IndexVersion version = IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_5_2);
-            final Settings settings = Settings.builder()
-                .put("index.analysis.analyzer.my_standard.tokenizer", "standard")
-                .put("index.analysis.analyzer.my_standard.filter", "standard")
-                .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
-                .put(IndexMetadata.SETTING_VERSION_CREATED, version)
-                .build();
-            getIndexAnalyzers(settings);
-            assertWarnings("The [standard] token filter is deprecated and will be removed in a future version.");
-        }
-    }
-
     /**
      * Tests that plugins can register pre-configured char filters that vary in behavior based on Elasticsearch version, Lucene version,
      * and that do not vary based on version at all.
diff --git a/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java b/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
index 5c07c2344cf1..635be15ff899 100644
--- a/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java
@@ -97,6 +97,7 @@
 import static org.elasticsearch.cluster.service.ClusterStateTaskExecutorUtils.executeAndAssertSuccessful;
 import static org.elasticsearch.core.Tuple.tuple;
 import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException;
+import static org.elasticsearch.ingest.IngestPipelineTestUtils.putJsonPipelineRequest;
 import static org.elasticsearch.ingest.IngestService.NOOP_PIPELINE_NAME;
 import static org.elasticsearch.ingest.IngestService.hasPipeline;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -422,8 +423,8 @@ public void testDelete() {
 
     public void testValidateNoIngestInfo() throws Exception {
         IngestService ingestService = createWithProcessors();
-        PutPipelineRequest putRequest = new PutPipelineRequest("_id", new BytesArray("""
-            {"processors": [{"set" : {"field": "_field", "value": "_value"}}]}"""), XContentType.JSON);
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", """
+            {"processors": [{"set" : {"field": "_field", "value": "_value"}}]}""");
 
         var pipelineConfig = XContentHelper.convertToMap(putRequest.getSource(), false, putRequest.getXContentType()).v2();
         Exception e = expectThrows(
@@ -511,7 +512,7 @@ public void testGetProcessorsInPipeline() throws Exception {
         assertThat(pipeline, nullValue());
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
 
-        PutPipelineRequest putRequest = new PutPipelineRequest("_id", new BytesArray("""
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", """
             {
               "processors": [
                 {
@@ -528,7 +529,7 @@ public void testGetProcessorsInPipeline() throws Exception {
                   }
                 }
               ]
-            }"""), XContentType.JSON);
+            }""");
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -554,7 +555,7 @@ public void testGetPipelineWithProcessorType() throws Exception {
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build();
         ClusterState previousClusterState = clusterState;
 
-        PutPipelineRequest putRequest1 = new PutPipelineRequest("_id1", new BytesArray("""
+        PutPipelineRequest putRequest1 = putJsonPipelineRequest("_id1", """
             {
               "processors": [
                 {
@@ -571,10 +572,10 @@ public void testGetPipelineWithProcessorType() throws Exception {
                   }
                 }
               ]
-            }"""), XContentType.JSON);
+            }""");
         clusterState = executePut(putRequest1, clusterState);
-        PutPipelineRequest putRequest2 = new PutPipelineRequest("_id2", new BytesArray("""
-            {"processors": [{"set" : {"field": "_field", "value": "_value", "tag": "tag2"}}]}"""), XContentType.JSON);
+        PutPipelineRequest putRequest2 = putJsonPipelineRequest("_id2", """
+            {"processors": [{"set" : {"field": "_field", "value": "_value", "tag": "tag2"}}]}""");
         clusterState = executePut(putRequest2, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
 
@@ -611,8 +612,8 @@ public String getType() {
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build();
         ClusterState previousClusterState = clusterState;
 
-        PutPipelineRequest putRequest1 = new PutPipelineRequest("_id1", new BytesArray("""
-            {"processors": [{"set" : {"field": "_field", "value": "_value", "tag": "tag1"}}]}"""), XContentType.JSON);
+        PutPipelineRequest putRequest1 = putJsonPipelineRequest("_id1", """
+            {"processors": [{"set" : {"field": "_field", "value": "_value", "tag": "tag1"}}]}""");
         clusterState = executePut(putRequest1, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
 
@@ -676,8 +677,8 @@ public void testGetProcessorsInPipelineComplexConditional() throws Exception {
         assertThat(pipeline, nullValue());
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
 
-        PutPipelineRequest putRequest = new PutPipelineRequest(id, new BytesArray("""
-            {"processors": [{"complexSet" : {"field": "_field", "value": "_value"}}]}"""), XContentType.JSON);
+        PutPipelineRequest putRequest = putJsonPipelineRequest(id, """
+            {"processors": [{"complexSet" : {"field": "_field", "value": "_value"}}]}""");
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -699,8 +700,8 @@ public void testCrud() throws Exception {
         assertThat(pipeline, nullValue());
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
 
-        PutPipelineRequest putRequest = new PutPipelineRequest(id, new BytesArray("""
-            {"processors": [{"set" : {"field": "_field", "value": "_value"}}]}"""), XContentType.JSON);
+        PutPipelineRequest putRequest = putJsonPipelineRequest(id, """
+            {"processors": [{"set" : {"field": "_field", "value": "_value"}}]}""");
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -727,7 +728,7 @@ public void testPut() {
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build();
 
         // add a new pipeline:
-        PutPipelineRequest putRequest = new PutPipelineRequest(id, new BytesArray("{\"processors\": []}"), XContentType.JSON);
+        PutPipelineRequest putRequest = putJsonPipelineRequest(id, "{\"processors\": []}");
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -738,8 +739,8 @@ public void testPut() {
         assertThat(pipeline.getProcessors().size(), equalTo(0));
 
         // overwrite existing pipeline:
-        putRequest = new PutPipelineRequest(id, new BytesArray("""
-            {"processors": [], "description": "_description"}"""), XContentType.JSON);
+        putRequest = putJsonPipelineRequest(id, """
+            {"processors": [], "description": "_description"}""");
         previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -757,11 +758,7 @@ public void testPutWithErrorResponse() throws IllegalAccessException {
         assertThat(pipeline, nullValue());
         ClusterState previousClusterState = ClusterState.builder(new ClusterName("_name")).build();
 
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            id,
-            new BytesArray("{\"description\": \"empty processors\"}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest(id, "{\"description\": \"empty processors\"}");
         ClusterState clusterState = executePut(putRequest, previousClusterState);
         MockLog.assertThatLogger(
             () -> ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState)),
@@ -962,7 +959,7 @@ public void testGetPipelines() {
 
     public void testValidateProcessorTypeOnAllNodes() throws Exception {
         IngestService ingestService = createWithProcessors();
-        PutPipelineRequest putRequest = new PutPipelineRequest("_id", new BytesArray("""
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", """
             {
               "processors": [
                 {
@@ -979,7 +976,7 @@ public void testValidateProcessorTypeOnAllNodes() throws Exception {
                   }
                 }
               ]
-            }"""), XContentType.JSON);
+            }""");
         var pipelineConfig = XContentHelper.convertToMap(putRequest.getSource(), false, putRequest.getXContentType()).v2();
 
         DiscoveryNode node1 = DiscoveryNodeUtils.create("_node_id1", buildNewFakeTransportAddress(), Map.of(), Set.of());
@@ -1006,7 +1003,7 @@ public void testValidateConfigurationExceptions() {
             // ordinary validation issues happen at processor construction time
             throw newConfigurationException("fail_validation", tag, "no_property_name", "validation failure reason");
         }));
-        PutPipelineRequest putRequest = new PutPipelineRequest("_id", new BytesArray("""
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", """
             {
               "processors": [
                 {
@@ -1014,7 +1011,7 @@ public void testValidateConfigurationExceptions() {
                   }
                 }
               ]
-            }"""), XContentType.JSON);
+            }""");
         var pipelineConfig = XContentHelper.convertToMap(putRequest.getSource(), false, putRequest.getXContentType()).v2();
 
         // other validation actually consults this map, but this validation does not. however, it must not be empty.
@@ -1040,7 +1037,7 @@ public void extraValidation() throws Exception {
                 }
             };
         }));
-        PutPipelineRequest putRequest = new PutPipelineRequest("_id", new BytesArray("""
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", """
             {
               "processors": [
                 {
@@ -1048,7 +1045,7 @@ public void extraValidation() throws Exception {
                   }
                 }
               ]
-            }"""), XContentType.JSON);
+            }""");
         var pipelineConfig = XContentHelper.convertToMap(putRequest.getSource(), false, putRequest.getXContentType()).v2();
 
         // other validation actually consults this map, but this validation does not. however, it must not be empty.
@@ -1080,11 +1077,7 @@ public String getType() {
         );
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         String id = "_id";
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            id,
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest(id, "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -1129,11 +1122,7 @@ public void testExecuteBulkPipelineDoesNotExist() {
             Map.of("mock", (factories, tag, description, config) -> mockCompoundProcessor())
         );
 
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1201,11 +1190,7 @@ public XContentParser decorate(XContentParser xContentParser) {
             documentParsingProvider
         );
 
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1239,11 +1224,7 @@ public void testExecuteSuccess() {
         IngestService ingestService = createWithProcessors(
             Map.of("mock", (factories, tag, description, config) -> mockCompoundProcessor())
         );
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1282,11 +1263,7 @@ public void testDynamicTemplates() throws Exception {
                 )
             )
         );
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"set\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"set\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1314,8 +1291,8 @@ public void testDynamicTemplates() throws Exception {
 
     public void testExecuteEmptyPipeline() throws Exception {
         IngestService ingestService = createWithProcessors(Map.of());
-        PutPipelineRequest putRequest = new PutPipelineRequest("_id", new BytesArray("""
-            {"processors": [], "description": "_description"}"""), XContentType.JSON);
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", """
+            {"processors": [], "description": "_description"}""");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1345,11 +1322,7 @@ public void testExecuteEmptyPipeline() throws Exception {
     public void testExecutePropagateAllMetadataUpdates() throws Exception {
         final CompoundProcessor processor = mockCompoundProcessor();
         IngestService ingestService = createWithProcessors(Map.of("mock", (factories, tag, description, config) -> processor));
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1423,17 +1396,9 @@ public void testExecuteFailure() throws Exception {
                 (factories, tag, description, config) -> new FakeProcessor("set", "", "", (ingestDocument) -> fail())
             )
         );
-        PutPipelineRequest putRequest1 = new PutPipelineRequest(
-            "_id1",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest1 = putJsonPipelineRequest("_id1", "{\"processors\": [{\"mock\" : {}}]}");
         // given that set -> fail() above, it's a failure if a document executes against this pipeline
-        PutPipelineRequest putRequest2 = new PutPipelineRequest(
-            "_id2",
-            new BytesArray("{\"processors\": [{\"set\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest2 = putJsonPipelineRequest("_id2", "{\"processors\": [{\"set\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest1, clusterState);
@@ -1490,11 +1455,7 @@ public void testExecuteSuccessWithOnFailure() throws Exception {
             List.of(new CompoundProcessor(onFailureProcessor))
         );
         IngestService ingestService = createWithProcessors(Map.of("mock", (factories, tag, description, config) -> compoundProcessor));
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1536,11 +1497,7 @@ public void testExecuteFailureWithNestedOnFailure() throws Exception {
             List.of(new CompoundProcessor(false, processors, onFailureProcessors))
         );
         IngestService ingestService = createWithProcessors(Map.of("mock", (factories, tag, description, config) -> compoundProcessor));
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1608,11 +1565,7 @@ public void testBulkRequestExecutionWithFailures() throws Exception {
             return null;
         }).when(processor).execute(any(), any());
         IngestService ingestService = createWithProcessors(Map.of("mock", (factories, tag, description, config) -> processor));
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1647,17 +1600,9 @@ public void testExecuteFailureRedirection() throws Exception {
                 (factories, tag, description, config) -> new FakeProcessor("set", "", "", (ingestDocument) -> fail())
             )
         );
-        PutPipelineRequest putRequest1 = new PutPipelineRequest(
-            "_id1",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest1 = putJsonPipelineRequest("_id1", "{\"processors\": [{\"mock\" : {}}]}");
         // given that set -> fail() above, it's a failure if a document executes against this pipeline
-        PutPipelineRequest putRequest2 = new PutPipelineRequest(
-            "_id2",
-            new BytesArray("{\"processors\": [{\"set\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest2 = putJsonPipelineRequest("_id2", "{\"processors\": [{\"set\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest1, clusterState);
@@ -1707,11 +1652,7 @@ public void testExecuteFailureRedirectionWithNestedOnFailure() throws Exception
             List.of(new CompoundProcessor(false, processors, onFailureProcessors))
         );
         IngestService ingestService = createWithProcessors(Map.of("mock", (factories, tag, description, config) -> compoundProcessor));
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1783,11 +1724,7 @@ public void testBulkRequestExecutionWithRedirectedFailures() throws Exception {
             return null;
         }).when(processor).execute(any(), any());
         IngestService ingestService = createWithProcessors(Map.of("mock", (factories, tag, description, config) -> processor));
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1849,8 +1786,8 @@ public void testBulkRequestExecution() throws Exception {
         map.put("mock", (factories, tag, description, config) -> processor);
 
         IngestService ingestService = createWithProcessors(map);
-        PutPipelineRequest putRequest = new PutPipelineRequest("_id", new BytesArray("""
-            {"processors": [{"mock": {}}], "description": "_description"}"""), XContentType.JSON);
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", """
+            {"processors": [{"mock": {}}], "description": "_description"}""");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build();
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -1929,22 +1866,10 @@ public String execute() {
         }
 
         // put some pipelines, and now there are pipeline and processor stats, too
-        PutPipelineRequest putRequest1 = new PutPipelineRequest(
-            "_id1",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest1 = putJsonPipelineRequest("_id1", "{\"processors\": [{\"mock\" : {}}]}");
         // n.b. this 'pipeline' processor will always run the '_id3' pipeline, see the mocking/plumbing above and below
-        PutPipelineRequest putRequest2 = new PutPipelineRequest(
-            "_id2",
-            new BytesArray("{\"processors\": [{\"pipeline\" : {}}]}"),
-            XContentType.JSON
-        );
-        PutPipelineRequest putRequest3 = new PutPipelineRequest(
-            "_id3",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest2 = putJsonPipelineRequest("_id2", "{\"processors\": [{\"pipeline\" : {}}]}");
+        PutPipelineRequest putRequest3 = putJsonPipelineRequest("_id3", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest1, clusterState);
@@ -2035,16 +1960,12 @@ public void testStats() throws Exception {
         assertThat(initialStats.pipelineStats().size(), equalTo(0));
         assertStats(initialStats.totalStats(), 0, 0, 0);
 
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id1",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id1", "{\"processors\": [{\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
-        putRequest = new PutPipelineRequest("_id2", new BytesArray("{\"processors\": [{\"mock\" : {}}]}"), XContentType.JSON);
+        putRequest = putJsonPipelineRequest("_id2", "{\"processors\": [{\"mock\" : {}}]}");
         previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -2109,11 +2030,7 @@ public void testStats() throws Exception {
         assertProcessorStats(0, afterSecondRequestStats, "_id2", 1, 0, 0);
 
         // update cluster state and ensure that new stats are added to old stats
-        putRequest = new PutPipelineRequest(
-            "_id1",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}, {\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        putRequest = putJsonPipelineRequest("_id1", "{\"processors\": [{\"mock\" : {}}, {\"mock\" : {}}]}");
         previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -2146,8 +2063,8 @@ public void testStats() throws Exception {
         assertProcessorStats(0, afterThirdRequestStats, "_id2", 1, 0, 0);
 
         // test a failure, and that the processor stats are added from the old stats
-        putRequest = new PutPipelineRequest("_id1", new BytesArray("""
-            {"processors": [{"failure-mock" : { "on_failure": [{"mock" : {}}]}}, {"mock" : {}}]}"""), XContentType.JSON);
+        putRequest = putJsonPipelineRequest("_id1", """
+            {"processors": [{"failure-mock" : { "on_failure": [{"mock" : {}}]}}, {"mock" : {}}]}""");
         previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -2177,7 +2094,7 @@ public void testStats() throws Exception {
         assertProcessorStats(0, afterForthRequestStats, "_id2", 1, 0, 0);
 
         // test with drop processor
-        putRequest = new PutPipelineRequest("_id3", new BytesArray("{\"processors\": [{\"drop\" : {}}]}"), XContentType.JSON);
+        putRequest = putJsonPipelineRequest("_id3", "{\"processors\": [{\"drop\" : {}}]}");
         previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
@@ -2255,11 +2172,7 @@ public String getDescription() {
             }
         });
         IngestService ingestService = createWithProcessors(factories);
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"drop\" : {}}, {\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"drop\" : {}}, {\"mock\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -2330,11 +2243,7 @@ public Map<String, Processor.Factory> getProcessors(Processor.Parameters paramet
         ingestService.addIngestClusterStateListener(ingestClusterStateListener);
 
         // Create pipeline and apply the resulting cluster state, which should update the counter in the right order:
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"test\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"test\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest, clusterState);
@@ -2353,11 +2262,7 @@ public void testCBORParsing() throws Exception {
 
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build();
         ClusterState previousClusterState = clusterState;
-        PutPipelineRequest putRequest = new PutPipelineRequest(
-            "_id",
-            new BytesArray("{\"processors\": [{\"foo\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest = putJsonPipelineRequest("_id", "{\"processors\": [{\"foo\" : {}}]}");
         clusterState = executePut(putRequest, clusterState);
         ingestService.applyClusterState(new ClusterChangedEvent("", clusterState, previousClusterState));
         assertThat(ingestService.getPipeline("_id"), notNullValue());
@@ -2403,16 +2308,8 @@ public void testSetsRawTimestamp() {
             )
         );
 
-        PutPipelineRequest putRequest1 = new PutPipelineRequest(
-            "_id1",
-            new BytesArray("{\"processors\": [{\"mock\" : {}}]}"),
-            XContentType.JSON
-        );
-        PutPipelineRequest putRequest2 = new PutPipelineRequest(
-            "_id2",
-            new BytesArray("{\"processors\": [{\"set\" : {}}]}"),
-            XContentType.JSON
-        );
+        PutPipelineRequest putRequest1 = putJsonPipelineRequest("_id1", "{\"processors\": [{\"mock\" : {}}]}");
+        PutPipelineRequest putRequest2 = putJsonPipelineRequest("_id2", "{\"processors\": [{\"set\" : {}}]}");
         ClusterState clusterState = ClusterState.builder(new ClusterName("_name")).build(); // Start empty
         ClusterState previousClusterState = clusterState;
         clusterState = executePut(putRequest1, clusterState);
@@ -2724,7 +2621,7 @@ public long getExecutionCount() {
             }
         };
 
-        var request = new PutPipelineRequest(pipelineId, new BytesArray(pipelineString), XContentType.JSON);
+        var request = putJsonPipelineRequest(pipelineId, pipelineString);
         ingestService.putPipeline(request, listener, consumer);
         latch.await();
 
diff --git a/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryDeleteThrottlingTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryDeleteThrottlingTests.java
index 136138552137..f6baa21d583c 100644
--- a/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryDeleteThrottlingTests.java
+++ b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryDeleteThrottlingTests.java
@@ -128,7 +128,7 @@ protected BlobContainer wrapChild(BlobContainer child) {
         @Override
         public InputStream readBlob(OperationPurpose purpose, String blobName) throws IOException {
             final var pathParts = path().parts();
-            if (pathParts.size() == 2 && pathParts.get(0).equals("indices") && blobName.startsWith("meta-")) {
+            if (pathParts.size() == 2 && pathParts.get(0).equals("indices") && blobName.startsWith(BlobStoreRepository.METADATA_PREFIX)) {
                 // reading index metadata, so mark index as active
                 assertTrue(activeIndices.add(pathParts.get(1)));
                 assertThat(activeIndices.size(), lessThanOrEqualTo(MAX_SNAPSHOT_THREADS));
@@ -150,7 +150,7 @@ public void writeMetadataBlob(
             if (pathParts.size() == 3
                 && pathParts.get(0).equals("indices")
                 && pathParts.get(2).equals("0")
-                && blobName.startsWith("index-")) {
+                && blobName.startsWith(BlobStoreRepository.SNAPSHOT_INDEX_PREFIX)) {
                 // writing shard-level BlobStoreIndexShardSnapshots, mark index as inactive again
                 assertTrue(activeIndices.remove(pathParts.get(1)));
             }
diff --git a/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java
index 29c858d49a0b..4558c252abd2 100644
--- a/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java
+++ b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java
@@ -81,6 +81,10 @@
 import java.util.stream.Collectors;
 
 import static org.elasticsearch.repositories.RepositoryDataTests.generateRandomRepoData;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.INDEX_FILE_PREFIX;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.METADATA_BLOB_NAME_SUFFIX;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.METADATA_PREFIX;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.SNAPSHOT_PREFIX;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
@@ -550,7 +554,10 @@ public void testShardBlobsToDelete() {
                         expectedShardGenerations.put(indexId, shard, shardGeneration);
                         final var blobsToDelete = randomList(
                             100,
-                            () -> randomFrom("meta-", "index-", "snap-") + randomUUID() + randomFrom("", ".dat")
+                            () -> randomFrom(METADATA_PREFIX, INDEX_FILE_PREFIX, SNAPSHOT_PREFIX) + randomUUID() + randomFrom(
+                                "",
+                                METADATA_BLOB_NAME_SUFFIX
+                            )
                         );
                         blobCount += blobsToDelete.size();
                         final var indexPath = repo.basePath()
diff --git a/server/src/test/java/org/elasticsearch/rest/RestCompatibleVersionHelperTests.java b/server/src/test/java/org/elasticsearch/rest/RestCompatibleVersionHelperTests.java
index acefa2958ea0..796a16c00da5 100644
--- a/server/src/test/java/org/elasticsearch/rest/RestCompatibleVersionHelperTests.java
+++ b/server/src/test/java/org/elasticsearch/rest/RestCompatibleVersionHelperTests.java
@@ -9,6 +9,7 @@
 
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.core.RestApiVersion;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xcontent.ParsedMediaType;
 import org.hamcrest.CustomTypeSafeMatcher;
@@ -163,6 +164,8 @@ public void testAcceptAndContentTypeCombinations() {
         assertThat(requestWith(acceptHeader(null), contentTypeHeader("application/json"), bodyPresent()), not(isCompatible()));
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this can be re-enabled once our rest api version is bumped to V_9")
     public void testObsoleteVersion() {
         ElasticsearchStatusException e = expectThrows(
             ElasticsearchStatusException.class,
diff --git a/server/src/test/java/org/elasticsearch/rest/RestRequestTests.java b/server/src/test/java/org/elasticsearch/rest/RestRequestTests.java
index bb06dbe5d09a..e99d0d17f45c 100644
--- a/server/src/test/java/org/elasticsearch/rest/RestRequestTests.java
+++ b/server/src/test/java/org/elasticsearch/rest/RestRequestTests.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.rest;
 
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.common.ValidationException;
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.core.CheckedConsumer;
@@ -31,7 +32,9 @@
 
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
-import static org.elasticsearch.rest.RestRequest.PATH_RESTRICTED;
+import static org.elasticsearch.rest.RestRequest.OPERATOR_REQUEST;
+import static org.elasticsearch.rest.RestRequest.SERVERLESS_REQUEST;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
@@ -129,8 +132,8 @@ public void testContentOrSourceParam() throws IOException {
                 .contentOrSourceParam()
                 .v2()
         );
-        e = expectThrows(IllegalStateException.class, () -> contentRestRequest("", Map.of("source", "stuff2")).contentOrSourceParam());
-        assertEquals("source and source_content_type parameters are required", e.getMessage());
+        e = expectThrows(ValidationException.class, () -> contentRestRequest("", Map.of("source", "stuff2")).contentOrSourceParam());
+        assertThat(e.getMessage(), containsString("source and source_content_type parameters are required"));
     }
 
     public void testHasContentOrSourceParam() throws IOException {
@@ -245,20 +248,34 @@ public void testRequiredContent() {
                 .requiredContent()
         );
         assertEquals("request body is required", e.getMessage());
-        e = expectThrows(IllegalStateException.class, () -> contentRestRequest("test", null, Collections.emptyMap()).requiredContent());
-        assertEquals("unknown content type", e.getMessage());
+        e = expectThrows(ValidationException.class, () -> contentRestRequest("test", null, Collections.emptyMap()).requiredContent());
+        assertThat(e.getMessage(), containsString("unknown content type"));
     }
 
-    public void testMarkPathRestricted() {
+    public void testIsServerlessRequest() {
         RestRequest request1 = contentRestRequest("content", new HashMap<>());
-        request1.markPathRestricted("foo");
-        assertEquals(request1.param(PATH_RESTRICTED), "foo");
-        IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, () -> request1.markPathRestricted("foo"));
-        assertThat(exception.getMessage(), is("The parameter [" + PATH_RESTRICTED + "] is already defined."));
-
-        RestRequest request2 = contentRestRequest("content", Map.of(PATH_RESTRICTED, "foo"));
-        exception = expectThrows(IllegalArgumentException.class, () -> request2.markPathRestricted("bar"));
-        assertThat(exception.getMessage(), is("The parameter [" + PATH_RESTRICTED + "] is already defined."));
+        request1.markAsServerlessRequest();
+        assertEquals(request1.param(SERVERLESS_REQUEST), "true");
+        assertTrue(request1.isServerlessRequest());
+        IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, request1::markAsServerlessRequest);
+        assertThat(exception.getMessage(), is("The parameter [" + SERVERLESS_REQUEST + "] is already defined."));
+
+        RestRequest request2 = contentRestRequest("content", Map.of(SERVERLESS_REQUEST, "true"));
+        exception = expectThrows(IllegalArgumentException.class, request2::markAsServerlessRequest);
+        assertThat(exception.getMessage(), is("The parameter [" + SERVERLESS_REQUEST + "] is already defined."));
+    }
+
+    public void testIsOperatorRequest() {
+        RestRequest request1 = contentRestRequest("content", new HashMap<>());
+        request1.markAsOperatorRequest();
+        assertEquals(request1.param(OPERATOR_REQUEST), "true");
+        assertTrue(request1.isOperatorRequest());
+        IllegalArgumentException exception = expectThrows(IllegalArgumentException.class, request1::markAsOperatorRequest);
+        assertThat(exception.getMessage(), is("The parameter [" + OPERATOR_REQUEST + "] is already defined."));
+
+        RestRequest request2 = contentRestRequest("content", Map.of(OPERATOR_REQUEST, "true"));
+        exception = expectThrows(IllegalArgumentException.class, request2::markAsOperatorRequest);
+        assertThat(exception.getMessage(), is("The parameter [" + OPERATOR_REQUEST + "] is already defined."));
     }
 
     public static RestRequest contentRestRequest(String content, Map<String, String> params) {
diff --git a/server/src/test/java/org/elasticsearch/rest/RestUtilsTests.java b/server/src/test/java/org/elasticsearch/rest/RestUtilsTests.java
index 3226ca2bf51d..24d40fd1b95f 100644
--- a/server/src/test/java/org/elasticsearch/rest/RestUtilsTests.java
+++ b/server/src/test/java/org/elasticsearch/rest/RestUtilsTests.java
@@ -18,7 +18,7 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import static org.elasticsearch.rest.RestRequest.PATH_RESTRICTED;
+import static org.elasticsearch.rest.RestRequest.INTERNAL_MARKER_REQUEST_PARAMETERS;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
@@ -160,13 +160,15 @@ public void testCrazyURL() {
     }
 
     public void testReservedParameters() {
-        Map<String, String> params = new HashMap<>();
-        String uri = "something?" + PATH_RESTRICTED + "=value";
-        IllegalArgumentException exception = expectThrows(
-            IllegalArgumentException.class,
-            () -> RestUtils.decodeQueryString(uri, uri.indexOf('?') + 1, params)
-        );
-        assertEquals(exception.getMessage(), "parameter [" + PATH_RESTRICTED + "] is reserved and may not set");
+        for (var reservedParam : INTERNAL_MARKER_REQUEST_PARAMETERS) {
+            Map<String, String> params = new HashMap<>();
+            String uri = "something?" + reservedParam + "=value";
+            IllegalArgumentException exception = expectThrows(
+                IllegalArgumentException.class,
+                () -> RestUtils.decodeQueryString(uri, uri.indexOf('?') + 1, params)
+            );
+            assertEquals(exception.getMessage(), "parameter [" + reservedParam + "] is reserved and may not be set");
+        }
     }
 
     private void assertCorsSettingRegexIsNull(String settingsValue) {
diff --git a/server/src/test/java/org/elasticsearch/script/VectorScoreScriptUtilsTests.java b/server/src/test/java/org/elasticsearch/script/VectorScoreScriptUtilsTests.java
index 8bd53047b2dc..78e1d8f8440a 100644
--- a/server/src/test/java/org/elasticsearch/script/VectorScoreScriptUtilsTests.java
+++ b/server/src/test/java/org/elasticsearch/script/VectorScoreScriptUtilsTests.java
@@ -45,11 +45,15 @@ public void testFloatVectorClassBindings() throws IOException {
 
         List<DenseVectorDocValuesField> fields = List.of(
             new BinaryDenseVectorDocValuesField(
-                BinaryDenseVectorScriptDocValuesTests.wrap(new float[][] { docVector }, ElementType.FLOAT, IndexVersions.V_7_4_0),
+                BinaryDenseVectorScriptDocValuesTests.wrap(
+                    new float[][] { docVector },
+                    ElementType.FLOAT,
+                    IndexVersions.MINIMUM_COMPATIBLE
+                ),
                 "test",
                 ElementType.FLOAT,
                 dims,
-                IndexVersions.V_7_4_0
+                IndexVersions.MINIMUM_COMPATIBLE
             ),
             new BinaryDenseVectorDocValuesField(
                 BinaryDenseVectorScriptDocValuesTests.wrap(new float[][] { docVector }, ElementType.FLOAT, IndexVersion.current()),
@@ -238,11 +242,15 @@ public void testByteVsFloatSimilarity() throws IOException {
 
         List<DenseVectorDocValuesField> fields = List.of(
             new BinaryDenseVectorDocValuesField(
-                BinaryDenseVectorScriptDocValuesTests.wrap(new float[][] { docVector }, ElementType.FLOAT, IndexVersions.V_7_4_0),
+                BinaryDenseVectorScriptDocValuesTests.wrap(
+                    new float[][] { docVector },
+                    ElementType.FLOAT,
+                    IndexVersions.MINIMUM_COMPATIBLE
+                ),
                 "field0",
                 ElementType.FLOAT,
                 dims,
-                IndexVersions.V_7_4_0
+                IndexVersions.MINIMUM_COMPATIBLE
             ),
             new BinaryDenseVectorDocValuesField(
                 BinaryDenseVectorScriptDocValuesTests.wrap(new float[][] { docVector }, ElementType.FLOAT, IndexVersion.current()),
diff --git a/server/src/test/java/org/elasticsearch/script/field/vectors/DenseVectorTests.java b/server/src/test/java/org/elasticsearch/script/field/vectors/DenseVectorTests.java
index 2be338efd717..d06593d0349b 100644
--- a/server/src/test/java/org/elasticsearch/script/field/vectors/DenseVectorTests.java
+++ b/server/src/test/java/org/elasticsearch/script/field/vectors/DenseVectorTests.java
@@ -68,7 +68,7 @@ public void testFloatVsListQueryVector() {
         assertEquals(knn.cosineSimilarity(arrayQV), knn.cosineSimilarity(listQV), 0.001f);
         assertEquals(knn.cosineSimilarity((Object) listQV), knn.cosineSimilarity((Object) arrayQV), 0.001f);
 
-        for (IndexVersion indexVersion : List.of(IndexVersions.V_7_4_0, IndexVersion.current())) {
+        for (IndexVersion indexVersion : List.of(IndexVersions.MINIMUM_COMPATIBLE, IndexVersion.current())) {
             BytesRef value = BinaryDenseVectorScriptDocValuesTests.mockEncodeDenseVector(docVector, ElementType.FLOAT, indexVersion);
             BinaryDenseVector bdv = new BinaryDenseVector(docVector, value, dims, indexVersion);
 
diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
index 2617f82b09f0..787cd32b7e32 100644
--- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
+++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java
@@ -2719,7 +2719,7 @@ public void testEnableSearchWorkerThreads() throws IOException {
             try {
                 ClusterUpdateSettingsResponse response = client().admin()
                     .cluster()
-                    .prepareUpdateSettings()
+                    .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                     .setPersistentSettings(Settings.builder().put(SEARCH_WORKER_THREADS_ENABLED.getKey(), false).build())
                     .get();
                 assertTrue(response.isAcknowledged());
@@ -2730,7 +2730,7 @@ public void testEnableSearchWorkerThreads() throws IOException {
                 // reset original default setting
                 client().admin()
                     .cluster()
-                    .prepareUpdateSettings()
+                    .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                     .setPersistentSettings(Settings.builder().putNull(SEARCH_WORKER_THREADS_ENABLED.getKey()).build())
                     .get();
                 try (SearchContext searchContext = service.createContext(readerContext, request, task, ResultsType.DFS, randomBoolean())) {
@@ -2868,7 +2868,7 @@ public void testSlicingBehaviourForParallelCollection() throws Exception {
             try {
                 ClusterUpdateSettingsResponse response = client().admin()
                     .cluster()
-                    .prepareUpdateSettings()
+                    .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                     .setPersistentSettings(Settings.builder().put(QUERY_PHASE_PARALLEL_COLLECTION_ENABLED.getKey(), false).build())
                     .get();
                 assertTrue(response.isAcknowledged());
@@ -2891,7 +2891,7 @@ public void testSlicingBehaviourForParallelCollection() throws Exception {
                 // Reset to the original default setting and check to ensure it takes effect.
                 client().admin()
                     .cluster()
-                    .prepareUpdateSettings()
+                    .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                     .setPersistentSettings(Settings.builder().putNull(QUERY_PHASE_PARALLEL_COLLECTION_ENABLED.getKey()).build())
                     .get();
                 {
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/DelayedBucketTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/DelayedBucketTests.java
index 289da586b1b6..efa0c5e8dc41 100644
--- a/server/src/test/java/org/elasticsearch/search/aggregations/DelayedBucketTests.java
+++ b/server/src/test/java/org/elasticsearch/search/aggregations/DelayedBucketTests.java
@@ -27,29 +27,31 @@
 
 public class DelayedBucketTests extends ESTestCase {
     public void testToString() {
-        assertThat(new DelayedBucket<>(null, null, List.of(bucket("test", 1))).toString(), equalTo("Delayed[test]"));
+        assertThat(new DelayedBucket<>(List.of(bucket("test", 1))).toString(), equalTo("Delayed[test]"));
     }
 
     public void testReduced() {
         AtomicInteger buckets = new AtomicInteger();
         AggregationReduceContext context = new AggregationReduceContext.ForFinal(null, null, () -> false, null, buckets::addAndGet);
-        DelayedBucket<?> b = new DelayedBucket<>(mockReduce(context), context, List.of(bucket("test", 1), bucket("test", 2)));
+        BiFunction<List<InternalBucket>, AggregationReduceContext, InternalBucket> reduce = mockReduce(context);
+        DelayedBucket<InternalBucket> b = new DelayedBucket<>(List.of(bucket("test", 1), bucket("test", 2)));
         assertThat(b.getDocCount(), equalTo(3L));
-        assertThat(b.reduced(), sameInstance(b.reduced()));
-        assertThat(b.reduced().getKeyAsString(), equalTo("test"));
-        assertThat(b.reduced().getDocCount(), equalTo(3L));
+        assertThat(b.reduced(reduce, context), sameInstance(b.reduced(reduce, context)));
+        assertThat(b.reduced(reduce, context).getKeyAsString(), equalTo("test"));
+        assertThat(b.reduced(reduce, context).getDocCount(), equalTo(3L));
         assertEquals(1, buckets.get());
     }
 
     public void testCompareKey() {
         AggregationReduceContext context = InternalAggregationTestCase.emptyReduceContextBuilder().forFinalReduction();
-        DelayedBucket<?> a = new DelayedBucket<>(mockReduce(context), context, List.of(bucket("a", 1)));
-        DelayedBucket<?> b = new DelayedBucket<>(mockReduce(context), context, List.of(bucket("b", 1)));
+        BiFunction<List<InternalBucket>, AggregationReduceContext, InternalBucket> reduce = mockReduce(context);
+        DelayedBucket<InternalBucket> a = new DelayedBucket<>(List.of(bucket("a", 1)));
+        DelayedBucket<InternalBucket> b = new DelayedBucket<>(List.of(bucket("b", 1)));
         if (randomBoolean()) {
-            a.reduced();
+            a.reduced(reduce, context);
         }
         if (randomBoolean()) {
-            b.reduced();
+            b.reduced(reduce, context);
         }
         assertThat(a.compareKey(b), lessThan(0));
         assertThat(b.compareKey(a), greaterThan(0));
@@ -64,16 +66,17 @@ public void testNonCompetitiveNotReduced() {
             null,
             b -> fail("shouldn't be called")
         );
-        new DelayedBucket<>(mockReduce(context), context, List.of(bucket("test", 1))).nonCompetitive();
+        new DelayedBucket<>(List.of(bucket("test", 1))).nonCompetitive(context);
     }
 
     public void testNonCompetitiveReduced() {
         AtomicInteger buckets = new AtomicInteger();
         AggregationReduceContext context = new AggregationReduceContext.ForFinal(null, null, () -> false, null, buckets::addAndGet);
-        DelayedBucket<?> b = new DelayedBucket<>(mockReduce(context), context, List.of(bucket("test", 1)));
-        b.reduced();
+        BiFunction<List<InternalBucket>, AggregationReduceContext, InternalBucket> reduce = mockReduce(context);
+        DelayedBucket<InternalBucket> b = new DelayedBucket<>(List.of(bucket("test", 1)));
+        b.reduced(reduce, context);
         assertEquals(1, buckets.get());
-        b.nonCompetitive();
+        b.nonCompetitive(context);
         assertEquals(0, buckets.get());
     }
 
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java
index b6cdf1a2825d..1d21a1fe173d 100644
--- a/server/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java
+++ b/server/src/test/java/org/elasticsearch/search/aggregations/InternalOrderTests.java
@@ -7,6 +7,10 @@
  */
 package org.elasticsearch.search.aggregations;
 
+import org.elasticsearch.common.io.stream.BytesStreamOutput;
+import org.elasticsearch.common.io.stream.DelayableWriteable;
+import org.elasticsearch.common.io.stream.FilterStreamInput;
+import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.Writeable.Reader;
 import org.elasticsearch.search.aggregations.InternalOrder.CompoundOrder;
 import org.elasticsearch.test.AbstractXContentSerializingTestCase;
@@ -116,4 +120,32 @@ protected BucketOrder mutateInstance(BucketOrder instance) {
         }
     }
 
+    public void testInternalOrderDeduplicated() throws IOException {
+        BucketOrder testInstance = createTestInstance();
+        try (BytesStreamOutput output = new BytesStreamOutput()) {
+            instanceWriter().write(output, testInstance);
+            if (testInstance instanceof CompoundOrder || testInstance instanceof InternalOrder.Aggregation) {
+                assertNotSame(testInstance, instanceReader().read(output.bytes().streamInput()));
+            }
+            StreamInput dedupe = new DeduplicatorStreamInput(output.bytes().streamInput(), testInstance);
+            assertSame(testInstance, instanceReader().read(dedupe));
+        }
+    }
+
+    private static class DeduplicatorStreamInput extends FilterStreamInput implements DelayableWriteable.Deduplicator {
+
+        private final BucketOrder order;
+
+        protected DeduplicatorStreamInput(StreamInput delegate, BucketOrder order) {
+            super(delegate);
+            this.order = order;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public <T> T deduplicate(T object) {
+            return (T) order;
+        }
+    }
+
 }
diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/TopBucketBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/TopBucketBuilderTests.java
deleted file mode 100644
index a5be04ab92ed..000000000000
--- a/server/src/test/java/org/elasticsearch/search/aggregations/TopBucketBuilderTests.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-package org.elasticsearch.search.aggregations;
-
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.core.Strings;
-import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation.InternalBucket;
-import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
-import org.elasticsearch.test.ESTestCase;
-import org.elasticsearch.test.InternalAggregationTestCase;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.elasticsearch.search.aggregations.DelayedBucketTests.mockReduce;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-
-public class TopBucketBuilderTests extends ESTestCase {
-    public void testSizeOne() {
-        int count = between(1, 1000);
-        AggregationReduceContext context = InternalAggregationTestCase.emptyReduceContextBuilder().forFinalReduction();
-        List<String> nonCompetitive = new ArrayList<>();
-        TopBucketBuilder<InternalBucket> builder = TopBucketBuilder.build(1, BucketOrder.key(true), b -> nonCompetitive.add(b.toString()));
-
-        for (int i = 0; i < count; i++) {
-            builder.add(new DelayedBucket<>(mockReduce(context), context, List.of(bucket(i))));
-        }
-
-        List<InternalBucket> top = builder.build();
-        assertThat(top, hasSize(1));
-        assertThat(top.get(0).getKeyAsString(), equalTo("000000"));
-        assertThat(top.get(0).getDocCount(), equalTo(1L));
-        for (int i = 1; i < count; i++) {
-            assertThat(nonCompetitive.get(i - 1), equalTo("Delayed[" + bucketKey(i) + "]"));
-        }
-    }
-
-    public void testAllCompetitive() {
-        int size = between(3, 1000);
-        int count = between(1, size);
-        AggregationReduceContext context = InternalAggregationTestCase.emptyReduceContextBuilder().forFinalReduction();
-        TopBucketBuilder<InternalBucket> builder = TopBucketBuilder.build(
-            size,
-            BucketOrder.key(true),
-            b -> fail("unexpected uncompetitive bucket " + b)
-        );
-
-        for (int i = 0; i < count; i++) {
-            builder.add(new DelayedBucket<>(mockReduce(context), context, List.of(bucket(i))));
-        }
-
-        List<InternalBucket> top = builder.build();
-        assertThat(top, hasSize(count));
-        for (int i = 0; i < count; i++) {
-            assertThat(top.get(i).getKeyAsString(), equalTo(bucketKey(i)));
-            assertThat(top.get(i).getDocCount(), equalTo(1L));
-        }
-    }
-
-    public void someNonCompetitiveTestCase(int size) {
-        int count = between(size + 1, size * 30);
-        AggregationReduceContext context = InternalAggregationTestCase.emptyReduceContextBuilder().forFinalReduction();
-        List<String> nonCompetitive = new ArrayList<>();
-        TopBucketBuilder<InternalBucket> builder = TopBucketBuilder.build(
-            size,
-            BucketOrder.key(true),
-            b -> nonCompetitive.add(b.toString())
-        );
-
-        for (int i = 0; i < count; i++) {
-            builder.add(new DelayedBucket<>(mockReduce(context), context, List.of(bucket(i))));
-        }
-
-        List<InternalBucket> top = builder.build();
-        assertThat(top, hasSize(size));
-        for (int i = 0; i < count; i++) {
-            if (i < size) {
-                assertThat(top.get(i).getKeyAsString(), equalTo(bucketKey(i)));
-                assertThat(top.get(i).getDocCount(), equalTo(1L));
-            } else {
-                assertThat(nonCompetitive.get(i - size), equalTo("Delayed[" + bucketKey(i) + "]"));
-            }
-        }
-    }
-
-    public void testSomeNonCompetitiveSmall() {
-        someNonCompetitiveTestCase(between(2, TopBucketBuilder.USE_BUFFERING_BUILDER - 1));
-    }
-
-    public void testSomeNonCompetitiveLarge() {
-        someNonCompetitiveTestCase(between(TopBucketBuilder.USE_BUFFERING_BUILDER, TopBucketBuilder.USE_BUFFERING_BUILDER * 5));
-    }
-
-    public void testHuge() {
-        int count = between(1, 1000);
-        AggregationReduceContext context = InternalAggregationTestCase.emptyReduceContextBuilder().forFinalReduction();
-        TopBucketBuilder<InternalBucket> builder = TopBucketBuilder.build(
-            Integer.MAX_VALUE,
-            BucketOrder.key(true),
-            b -> fail("unexpected uncompetitive bucket " + b)
-        );
-
-        for (int i = 0; i < count; i++) {
-            builder.add(new DelayedBucket<>(mockReduce(context), context, List.of(bucket(i))));
-        }
-
-        List<InternalBucket> top = builder.build();
-        assertThat(top, hasSize(count));
-        assertThat(top.get(0).getKeyAsString(), equalTo("000000"));
-        assertThat(top.get(0).getDocCount(), equalTo(1L));
-        for (int i = 0; i < count; i++) {
-            assertThat(top.get(i).getKeyAsString(), equalTo(bucketKey(i)));
-            assertThat(top.get(i).getDocCount(), equalTo(1L));
-        }
-    }
-
-    public void testHugeQueueError() {
-        Exception e = expectThrows(
-            IllegalArgumentException.class,
-            () -> new TopBucketBuilder.PriorityQueueTopBucketBuilder<>(
-                ArrayUtil.MAX_ARRAY_LENGTH,
-                BucketOrder.key(true),
-                b -> fail("unexpected uncompetitive bucket " + b)
-            )
-        );
-        assertThat(e.getMessage(), equalTo("can't reduce more than [" + ArrayUtil.MAX_ARRAY_LENGTH + "] buckets"));
-    }
-
-    private String bucketKey(int index) {
-        return Strings.format("%06d", index);
-    }
-
-    private InternalBucket bucket(int index) {
-        return new StringTerms.Bucket(new BytesRef(bucketKey(index)), 1, InternalAggregations.EMPTY, false, 0, DocValueFormat.RAW);
-    }
-}
diff --git a/server/src/test/java/org/elasticsearch/search/retriever/rankdoc/RankDocsSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/retriever/rankdoc/RankDocsSortBuilderTests.java
index ba7728c5dc62..06d7a1e9d7be 100644
--- a/server/src/test/java/org/elasticsearch/search/retriever/rankdoc/RankDocsSortBuilderTests.java
+++ b/server/src/test/java/org/elasticsearch/search/retriever/rankdoc/RankDocsSortBuilderTests.java
@@ -44,7 +44,7 @@ private RankDoc[] randomRankDocs(int totalDocs) {
     @Override
     protected RankDocsSortBuilder mutate(RankDocsSortBuilder original) throws IOException {
         RankDocsSortBuilder mutated = new RankDocsSortBuilder(original);
-        mutated.rankDocs(randomRankDocs(original.rankDocs().length + randomInt(100)));
+        mutated.rankDocs(randomRankDocs(original.rankDocs().length + randomIntBetween(10, 100)));
         return mutated;
     }
 
diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
index f5e69a65a6d0..9a361b0ec2a9 100644
--- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
+++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
@@ -1036,7 +1036,9 @@ public void testSnapshotPrimaryRelocations() {
 
         continueOrDie(
             createRepoAndIndex(repoName, index, shards),
-            createIndexResponse -> client().admin().cluster().state(new ClusterStateRequest(), clusterStateResponseStepListener)
+            createIndexResponse -> client().admin()
+                .cluster()
+                .state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT), clusterStateResponseStepListener)
         );
 
         continueOrDie(clusterStateResponseStepListener, clusterStateResponse -> {
@@ -1048,7 +1050,8 @@ public void testSnapshotPrimaryRelocations() {
                 @Override
                 public void run() {
                     final SubscribableListener<ClusterStateResponse> updatedClusterStateResponseStepListener = new SubscribableListener<>();
-                    masterAdminClient.cluster().state(new ClusterStateRequest(), updatedClusterStateResponseStepListener);
+                    masterAdminClient.cluster()
+                        .state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT), updatedClusterStateResponseStepListener);
                     continueOrDie(updatedClusterStateResponseStepListener, updatedClusterState -> {
                         final ShardRouting shardRouting = updatedClusterState.getState()
                             .routingTable()
diff --git a/server/src/test/java/org/elasticsearch/transport/ClusterConnectionManagerTests.java b/server/src/test/java/org/elasticsearch/transport/ClusterConnectionManagerTests.java
index 27874d4311cd..675c3e63db7d 100644
--- a/server/src/test/java/org/elasticsearch/transport/ClusterConnectionManagerTests.java
+++ b/server/src/test/java/org/elasticsearch/transport/ClusterConnectionManagerTests.java
@@ -188,7 +188,10 @@ public void testDisconnectLogging() {
                     "remotely-triggered close message",
                     ClusterConnectionManager.class.getCanonicalName(),
                     Level.INFO,
-                    "transport connection to [" + remoteClose.descriptionWithoutAttributes() + "] closed by remote"
+                    "transport connection to ["
+                        + remoteClose.descriptionWithoutAttributes()
+                        + "] closed by remote; "
+                        + "if unexpected, see [https://www.elastic.co/guide/en/elasticsearch/reference/*] for troubleshooting guidance"
                 )
             );
             mockLog.addExpectation(
diff --git a/server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java b/server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java
index d2e885f8da4b..e9b483812540 100644
--- a/server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java
+++ b/server/src/test/java/org/elasticsearch/transport/RemoteClusterClientTests.java
@@ -104,7 +104,7 @@ public void testConnectAndExecuteRequest() throws Exception {
                 ClusterStateResponse clusterStateResponse = safeAwait(
                     listener -> client.execute(
                         ClusterStateAction.REMOTE_TYPE,
-                        new ClusterStateRequest(),
+                        new ClusterStateRequest(TEST_REQUEST_TIMEOUT),
                         ActionListener.runBefore(
                             listener,
                             () -> assertTrue(Thread.currentThread().getName().contains('[' + TEST_THREAD_POOL_NAME + ']'))
@@ -184,7 +184,7 @@ public void testEnsureWeReconnect() throws Exception {
                         )
                     );
                     ClusterStateResponse clusterStateResponse = safeAwait(
-                        listener -> client.execute(ClusterStateAction.REMOTE_TYPE, new ClusterStateRequest(), listener)
+                        listener -> client.execute(ClusterStateAction.REMOTE_TYPE, new ClusterStateRequest(TEST_REQUEST_TIMEOUT), listener)
                     );
                     assertNotNull(clusterStateResponse);
                     assertEquals("foo_bar_cluster", clusterStateResponse.getState().getClusterName().value());
@@ -273,7 +273,11 @@ public void testQuicklySkipUnavailableClusters() throws Exception {
                     ESTestCase.assertThat(
                         safeAwaitFailure(
                             ClusterStateResponse.class,
-                            listener -> client.execute(ClusterStateAction.REMOTE_TYPE, new ClusterStateRequest(), listener)
+                            listener -> client.execute(
+                                ClusterStateAction.REMOTE_TYPE,
+                                new ClusterStateRequest(TEST_REQUEST_TIMEOUT),
+                                listener
+                            )
                         ),
                         instanceOf(ConnectTransportException.class)
                     );
@@ -284,7 +288,7 @@ public void testQuicklySkipUnavailableClusters() throws Exception {
 
                 assertBusy(() -> {
                     ClusterStateResponse ignored = safeAwait(
-                        listener -> client.execute(ClusterStateAction.REMOTE_TYPE, new ClusterStateRequest(), listener)
+                        listener -> client.execute(ClusterStateAction.REMOTE_TYPE, new ClusterStateRequest(TEST_REQUEST_TIMEOUT), listener)
                     );
                     // keep retrying on an exception, the goal is to check that we eventually reconnect
                 });
diff --git a/settings.gradle b/settings.gradle
index a75c66001659..ab8786110515 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -73,6 +73,8 @@ List projects = [
   'distribution:docker:ironbank-docker-export',
   'distribution:docker:ubi-docker-aarch64-export',
   'distribution:docker:ubi-docker-export',
+  'distribution:docker:wolfi-docker-aarch64-export',
+  'distribution:docker:wolfi-docker-export',
   'distribution:packages:aarch64-deb',
   'distribution:packages:deb',
   'distribution:packages:aarch64-rpm',
diff --git a/test/framework/src/integTest/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java b/test/framework/src/integTest/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java
index a9196a3bb137..b80c1eb16dfa 100644
--- a/test/framework/src/integTest/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java
+++ b/test/framework/src/integTest/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java
@@ -164,7 +164,7 @@ private static void sendRequest(TransportService source, TransportService target
         source.sendRequest(
             target.getLocalNode(),
             TransportClusterHealthAction.NAME,
-            new ClusterHealthRequest(),
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT),
             new TransportResponseHandler<>() {
                 private AtomicBoolean responded = new AtomicBoolean();
 
diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java
index 8412e9e25088..5387108592b1 100644
--- a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java
@@ -1440,10 +1440,10 @@ public static void waitForOpsToComplete(InternalEngine engine, long seqNo) throw
         assertBusy(() -> assertThat(engine.getLocalCheckpointTracker().getProcessedCheckpoint(), greaterThanOrEqualTo(seqNo)));
     }
 
-    public static boolean hasAcquiredIndexCommits(Engine engine) {
+    public static boolean hasAcquiredIndexCommitsForTesting(Engine engine) {
         assert engine instanceof InternalEngine : "only InternalEngines have snapshotted commits, got: " + engine.getClass();
         InternalEngine internalEngine = (InternalEngine) engine;
-        return internalEngine.hasAcquiredIndexCommits();
+        return internalEngine.hasAcquiredIndexCommitsForTesting();
     }
 
     public static final class PrimaryTermSupplier implements LongSupplier {
diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
index 9eaace8f93e5..c922feeb9f66 100644
--- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java
@@ -82,7 +82,6 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.matchesPattern;
 import static org.hamcrest.Matchers.nullValue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -508,22 +507,6 @@ public final void testMeta() throws IOException {
         );
     }
 
-    public final void testDeprecatedBoostWarning() throws IOException {
-        try {
-            createMapperService(DEPRECATED_BOOST_INDEX_VERSION, fieldMapping(b -> {
-                minimalMapping(b, DEPRECATED_BOOST_INDEX_VERSION);
-                b.field("boost", 2.0);
-            }));
-            String[] warnings = Strings.concatStringArrays(
-                getParseMinimalWarnings(DEPRECATED_BOOST_INDEX_VERSION),
-                new String[] { "Parameter [boost] on field [field] is deprecated and has no effect" }
-            );
-            assertWarnings(warnings);
-        } catch (MapperParsingException e) {
-            assertThat(e.getMessage(), anyOf(containsString("Unknown parameter [boost]"), containsString("[boost : 2.0]")));
-        }
-    }
-
     public void testBoostNotAllowed() throws IOException {
         MapperParsingException e = expectThrows(
             MapperParsingException.class,
@@ -1507,17 +1490,6 @@ private void assertNoDocValueLoader(CheckedConsumer<XContentBuilder, IOException
     public final void testSyntheticSourceInvalid() throws IOException {
         boolean ignoreMalformed = shouldUseIgnoreMalformed();
         List<SyntheticSourceInvalidExample> examples = new ArrayList<>(syntheticSourceSupport(ignoreMalformed).invalidExample());
-        if (supportsCopyTo()) {
-            examples.add(
-                new SyntheticSourceInvalidExample(
-                    matchesPattern("field \\[field] of type \\[.+] doesn't support synthetic source because it declares copy_to"),
-                    b -> {
-                        syntheticSourceSupport(ignoreMalformed).example(5).mapping().accept(b);
-                        b.field("copy_to", "bar");
-                    }
-                )
-            );
-        }
         for (SyntheticSourceInvalidExample example : examples) {
             Exception e = expectThrows(
                 IllegalArgumentException.class,
diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MetadataMapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MetadataMapperTestCase.java
index 1b00ba3e9fd0..dd3c59e8fc36 100644
--- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MetadataMapperTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MetadataMapperTestCase.java
@@ -10,6 +10,7 @@
 
 import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.core.CheckedConsumer;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.MapperService.MergeReason;
@@ -142,10 +143,13 @@ public final void testFixedMetaFieldsAreNotConfigurable() throws IOException {
         assertEquals("Failed to parse mapping: " + fieldName() + " is not configurable", exception.getMessage());
     }
 
+    @UpdateForV9
+    // This was previously testing for index versions between 7.0.0 and 8.6.0 but has been bumped to 8.0.0 - 8.6.0
+    // Verify this is the correct action.
     public void testTypeAndFriendsAreAcceptedBefore_8_6_0() throws IOException {
         assumeTrue("Metadata field " + fieldName() + " isn't configurable", isConfigurable());
         IndexVersion previousVersion = IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_6_0);
-        IndexVersion version = IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, previousVersion);
+        IndexVersion version = IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, previousVersion);
         assumeTrue("Metadata field " + fieldName() + " is not supported on version " + version, isSupportedOn(version));
         MapperService mapperService = createMapperService(version, mapping(b -> {}));
         // these parameters were previously silently ignored, they will still be ignored in existing indices
diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java
index f207f3c4cd31..c682d97aa63c 100644
--- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java
+++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java
@@ -21,15 +21,15 @@ public MockFieldMapper(String fullName) {
     }
 
     public MockFieldMapper(MappedFieldType fieldType) {
-        this(findSimpleName(fieldType.name()), fieldType, MultiFields.empty(), CopyTo.empty());
+        this(findSimpleName(fieldType.name()), fieldType, BuilderParams.empty());
     }
 
     public MockFieldMapper(MappedFieldType fieldType, String simpleName) {
-        super(simpleName, fieldType, MultiFields.empty(), CopyTo.empty(), false, null);
+        super(simpleName, fieldType, BuilderParams.empty());
     }
 
-    public MockFieldMapper(String fullName, MappedFieldType fieldType, MultiFields multifields, CopyTo copyTo) {
-        super(findSimpleName(fullName), fieldType, multifields, copyTo, false, null);
+    public MockFieldMapper(String fullName, MappedFieldType fieldType, BuilderParams params) {
+        super(findSimpleName(fullName), fieldType, params);
     }
 
     @Override
@@ -91,8 +91,7 @@ public Builder copyTo(String field) {
 
         @Override
         public MockFieldMapper build(MapperBuilderContext context) {
-            MultiFields multiFields = multiFieldsBuilder.build(this, context);
-            return new MockFieldMapper(leafName(), fieldType, multiFields, copyTo);
+            return new MockFieldMapper(leafName(), fieldType, builderParams(this, context));
         }
     }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
index ec2bbc35a68b..c9d7199de3b0 100644
--- a/test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
+++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java
@@ -75,7 +75,7 @@ protected void registerParameters(ParameterChecker checker) throws IOException {
                 minimalMapping(b);
                 b.field("script", "test");
                 b.field("on_script_error", "continue");
-            }, m -> assertThat((m).onScriptError, is(OnScriptError.CONTINUE)));
+            }, m -> assertThat((m).builderParams.onScriptError(), is(OnScriptError.CONTINUE)));
         }
     }
 
diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/TextFieldFamilySyntheticSourceTestSetup.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/TextFieldFamilySyntheticSourceTestSetup.java
index 953d71b9a791..14050150b9f9 100644
--- a/test/framework/src/main/java/org/elasticsearch/index/mapper/TextFieldFamilySyntheticSourceTestSetup.java
+++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/TextFieldFamilySyntheticSourceTestSetup.java
@@ -13,18 +13,15 @@
 import org.elasticsearch.core.CheckedConsumer;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.hamcrest.Matcher;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Locale;
 import java.util.function.Function;
 
 import static org.elasticsearch.test.ESTestCase.between;
 import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength;
 import static org.elasticsearch.test.ESTestCase.randomAlphaOfLengthBetween;
 import static org.elasticsearch.test.ESTestCase.randomBoolean;
-import static org.hamcrest.Matchers.equalTo;
 
 /**
  * Provides functionality needed to test synthetic source support in text and text-like fields (e.g. "text", "annotated_text").
@@ -160,73 +157,7 @@ private String randomString() {
 
         @Override
         public List<MapperTestCase.SyntheticSourceInvalidExample> invalidExample() throws IOException {
-            Matcher<String> err = equalTo(
-                String.format(
-                    Locale.ROOT,
-                    "field [field] of type [%s] doesn't support synthetic source unless it is stored or"
-                        + " has a sub-field of type [keyword] with doc values or stored and without a normalizer",
-                    fieldType
-                )
-            );
-            return List.of(
-                new MapperTestCase.SyntheticSourceInvalidExample(err, b -> b.field("type", fieldType)),
-                new MapperTestCase.SyntheticSourceInvalidExample(err, b -> {
-                    b.field("type", fieldType);
-                    b.startObject("fields");
-                    {
-                        b.startObject("l");
-                        b.field("type", "long");
-                        b.endObject();
-                    }
-                    b.endObject();
-                }),
-                new MapperTestCase.SyntheticSourceInvalidExample(err, b -> {
-                    b.field("type", fieldType);
-                    b.startObject("fields");
-                    {
-                        b.startObject("kwd");
-                        b.field("type", "keyword");
-                        b.field("normalizer", "lowercase");
-                        b.endObject();
-                    }
-                    b.endObject();
-                }),
-                new MapperTestCase.SyntheticSourceInvalidExample(err, b -> {
-                    b.field("type", fieldType);
-                    b.startObject("fields");
-                    {
-                        b.startObject("kwd");
-                        b.field("type", "keyword");
-                        b.field("doc_values", "false");
-                        b.endObject();
-                    }
-                    b.endObject();
-                }),
-                new MapperTestCase.SyntheticSourceInvalidExample(err, b -> {
-                    b.field("type", fieldType);
-                    b.field("store", "false");
-                    b.startObject("fields");
-                    {
-                        b.startObject("kwd");
-                        b.field("type", "keyword");
-                        b.field("doc_values", "false");
-                        b.endObject();
-                    }
-                    b.endObject();
-                }),
-                new MapperTestCase.SyntheticSourceInvalidExample(err, b -> {
-                    b.field("type", fieldType);
-                    b.startObject("fields");
-                    {
-                        b.startObject("kwd");
-                        b.field("type", "keyword");
-                        b.field("doc_values", "false");
-                        b.field("store", "false");
-                        b.endObject();
-                    }
-                    b.endObject();
-                })
-            );
+            return List.of();
         }
     }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java
index 16ddcb750dd6..76733a1b5836 100644
--- a/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java
@@ -103,7 +103,7 @@ protected void checkTransientErrorsDuringRecoveryAreRetried(String recoveryActio
         );
         final String redNodeName = internalCluster().startNode(Settings.builder().put("node.attr.color", "red").put(nodeSettings).build());
 
-        ClusterHealthResponse response = clusterAdmin().prepareHealth().setWaitForNodes(">=3").get();
+        ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes(">=3").get();
         assertThat(response.isTimedOut(), is(false));
 
         indicesAdmin().prepareCreate(indexName)
@@ -128,7 +128,7 @@ protected void checkTransientErrorsDuringRecoveryAreRetried(String recoveryActio
         indexRandom(true, requests);
         ensureSearchable(indexName);
 
-        ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         final String blueNodeId = getNodeId(blueNodeName);
 
         assertFalse(stateResponse.getState().getRoutingNodes().node(blueNodeId).isEmpty());
@@ -204,7 +204,7 @@ public void checkDisconnectsWhileRecovering(String recoveryActionToBlock) throws
         );
         final String redNodeName = internalCluster().startNode(Settings.builder().put("node.attr.color", "red").put(nodeSettings).build());
 
-        ClusterHealthResponse response = clusterAdmin().prepareHealth().setWaitForNodes(">=3").get();
+        ClusterHealthResponse response = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes(">=3").get();
         assertThat(response.isTimedOut(), is(false));
 
         indicesAdmin().prepareCreate(indexName)
@@ -219,7 +219,7 @@ public void checkDisconnectsWhileRecovering(String recoveryActionToBlock) throws
         indexRandom(true, requests);
         ensureSearchable(indexName);
 
-        ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         final String blueNodeId = getNodeId(blueNodeName);
 
         assertFalse(stateResponse.getState().getRoutingNodes().node(blueNodeId).isEmpty());
@@ -344,7 +344,7 @@ public void sendRequest(
                                 "Expected there to be some initializing shards",
                                 client(blueNodeName).admin()
                                     .cluster()
-                                    .prepareState()
+                                    .prepareState(TEST_REQUEST_TIMEOUT)
                                     .setLocal(true)
                                     .get()
                                     .getState()
diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java b/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java
new file mode 100644
index 000000000000..1acd5b7d637c
--- /dev/null
+++ b/test/framework/src/main/java/org/elasticsearch/ingest/IngestPipelineTestUtils.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.ingest;
+
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ingest.DeletePipelineRequest;
+import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
+import org.elasticsearch.action.ingest.PutPipelineRequest;
+import org.elasticsearch.action.ingest.PutPipelineTransportAction;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
+import org.elasticsearch.client.internal.ElasticsearchClient;
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.logging.Logger;
+import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.xcontent.ToXContent;
+import org.elasticsearch.xcontent.ToXContentFragment;
+import org.elasticsearch.xcontent.XContentType;
+
+import java.io.IOException;
+
+import static org.elasticsearch.test.ESTestCase.safeGet;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
+
+/**
+ * Utils for creating/retrieving/deleting ingest pipelines in a test cluster.
+ */
+public class IngestPipelineTestUtils {
+    private static final Logger logger = LogManager.getLogger(IngestPipelineTestUtils.class);
+
+    private IngestPipelineTestUtils() { /* no instances */ }
+
+    /**
+     * @param id         The pipeline id.
+     * @param source     The body of the {@link PutPipelineRequest} as a JSON-formatted {@link BytesReference}.
+     * @return a new {@link PutPipelineRequest} with the given {@code id} and body.
+     */
+    public static PutPipelineRequest putJsonPipelineRequest(String id, BytesReference source) {
+        return new PutPipelineRequest(id, source, XContentType.JSON);
+    }
+
+    /**
+     * @param id         The pipeline id.
+     * @param jsonString The body of the {@link PutPipelineRequest} as a JSON-formatted {@link String}.
+     * @return a new {@link PutPipelineRequest} with the given {@code id} and body.
+     */
+    public static PutPipelineRequest putJsonPipelineRequest(String id, String jsonString) {
+        return putJsonPipelineRequest(id, new BytesArray(jsonString));
+    }
+
+    /**
+     * Create an ingest pipeline with the given ID and body, using the given {@link ElasticsearchClient}.
+     *
+     * @param client     The client to use to execute the {@link PutPipelineTransportAction}.
+     * @param id         The pipeline id.
+     * @param source     The body of the {@link PutPipelineRequest} as a JSON-formatted {@link BytesReference}.
+     */
+    public static void putJsonPipeline(ElasticsearchClient client, String id, BytesReference source) {
+        assertAcked(safeGet(client.execute(PutPipelineTransportAction.TYPE, putJsonPipelineRequest(id, source))));
+    }
+
+    /**
+     * Create an ingest pipeline with the given ID and body, using the given {@link ElasticsearchClient}.
+     *
+     * @param client     The client to use to execute the {@link PutPipelineTransportAction}.
+     * @param id         The pipeline id.
+     * @param jsonString The body of the {@link PutPipelineRequest} as a JSON-formatted {@link String}.
+     */
+    public static void putJsonPipeline(ElasticsearchClient client, String id, String jsonString) {
+        putJsonPipeline(client, id, new BytesArray(jsonString));
+    }
+
+    /**
+     * Create an ingest pipeline with the given ID and body, using the given {@link ElasticsearchClient}.
+     *
+     * @param client     The client to use to execute the {@link PutPipelineTransportAction}.
+     * @param id         The pipeline id.
+     * @param toXContent The body of the {@link PutPipelineRequest} as a {@link ToXContentFragment}.
+     */
+    public static void putJsonPipeline(ElasticsearchClient client, String id, ToXContentFragment toXContent) throws IOException {
+        try (var xContentBuilder = jsonBuilder()) {
+            xContentBuilder.startObject();
+            toXContent.toXContent(xContentBuilder, ToXContent.EMPTY_PARAMS);
+            xContentBuilder.endObject();
+            putJsonPipeline(client, id, BytesReference.bytes(xContentBuilder));
+        }
+    }
+
+    /**
+     * Attempt to delete the ingest pipeline with the given {@code id}, using the given {@link ElasticsearchClient}, and logging (but
+     * otherwise ignoring) the result.
+     */
+    public static void deletePipelinesIgnoringExceptions(ElasticsearchClient client, Iterable<String> ids) {
+        for (final var id : ids) {
+            ESTestCase.safeAwait(
+                l -> client.execute(DeletePipelineTransportAction.TYPE, new DeletePipelineRequest(id), new ActionListener<>() {
+                    @Override
+                    public void onResponse(AcknowledgedResponse acknowledgedResponse) {
+                        logger.info("delete pipeline [{}] success [acknowledged={}]", id, acknowledgedResponse.isAcknowledged());
+                        l.onResponse(null);
+                    }
+
+                    @Override
+                    public void onFailure(Exception e) {
+                        logger.warn(Strings.format("delete pipeline [%s] failure", id), e);
+                        l.onResponse(null);
+                    }
+                })
+            );
+        }
+    }
+}
diff --git a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java b/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java
index e57257f69da2..5babaec0cf43 100644
--- a/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java
+++ b/test/framework/src/main/java/org/elasticsearch/logsdb/datageneration/datasource/DefaultMappingParametersHandler.java
@@ -25,10 +25,15 @@ public DataSourceResponse.LeafMappingParametersGenerator handle(DataSourceReques
         });
     }
 
-    // TODO enable doc_values: false
-    // It is disabled because it hits a bug in synthetic source.
     private Supplier<Map<String, Object>> keywordMapping() {
-        return () -> Map.of("store", ESTestCase.randomBoolean(), "index", ESTestCase.randomBoolean());
+        return () -> Map.of(
+            "store",
+            ESTestCase.randomBoolean(),
+            "index",
+            ESTestCase.randomBoolean(),
+            "doc_values",
+            ESTestCase.randomBoolean()
+        );
     }
 
     private Supplier<Map<String, Object>> numberMapping() {
@@ -43,13 +48,29 @@ private Supplier<Map<String, Object>> numberMapping() {
     }
 
     private Supplier<Map<String, Object>> unsignedLongMapping() {
-        return () -> Map.of("store", ESTestCase.randomBoolean(), "index", ESTestCase.randomBoolean());
+        return () -> Map.of(
+            "store",
+            ESTestCase.randomBoolean(),
+            "index",
+            ESTestCase.randomBoolean(),
+            "doc_values",
+            ESTestCase.randomBoolean()
+        );
     }
 
     private Supplier<Map<String, Object>> scaledFloatMapping() {
         return () -> {
             var scalingFactor = ESTestCase.randomFrom(10, 1000, 100000, 100.5);
-            return Map.of("scaling_factor", scalingFactor, "store", ESTestCase.randomBoolean(), "index", ESTestCase.randomBoolean());
+            return Map.of(
+                "scaling_factor",
+                scalingFactor,
+                "store",
+                ESTestCase.randomBoolean(),
+                "index",
+                ESTestCase.randomBoolean(),
+                "doc_values",
+                ESTestCase.randomBoolean()
+            );
         };
     }
 
diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java
index f0182a4e6989..608a24eaf9a5 100644
--- a/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java
@@ -44,6 +44,8 @@
 import java.util.concurrent.Executor;
 import java.util.function.Predicate;
 
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.METADATA_PREFIX;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.SNAPSHOT_PREFIX;
 import static org.elasticsearch.repositories.blobstore.BlobStoreTestUtil.randomNonDataPurpose;
 import static org.elasticsearch.repositories.blobstore.BlobStoreTestUtil.randomPurpose;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
@@ -424,7 +426,7 @@ private static void createDanglingIndex(final BlobStoreRepository repo, final Ex
             final BlobStore blobStore = repo.blobStore();
             blobStore.blobContainer(repo.basePath().add("indices").add("foo"))
                 .writeBlob(randomPurpose(), "bar", new ByteArrayInputStream(new byte[3]), 3, false);
-            for (String prefix : Arrays.asList("snap-", "meta-")) {
+            for (String prefix : Arrays.asList(SNAPSHOT_PREFIX, METADATA_PREFIX)) {
                 blobStore.blobContainer(repo.basePath())
                     .writeBlob(randomNonDataPurpose(), prefix + "foo.dat", new ByteArrayInputStream(new byte[3]), 3, false);
             }
diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreTestUtil.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreTestUtil.java
index d31bd16b07fc..624609f53cd6 100644
--- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreTestUtil.java
+++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/BlobStoreTestUtil.java
@@ -64,6 +64,9 @@
 import java.util.stream.Collectors;
 
 import static org.apache.lucene.tests.util.LuceneTestCase.random;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.METADATA_BLOB_NAME_SUFFIX;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.METADATA_NAME_FORMAT;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.getRepositoryDataBlobName;
 import static org.elasticsearch.test.ESTestCase.randomFrom;
 import static org.elasticsearch.test.ESTestCase.randomIntBetween;
 import static org.elasticsearch.test.ESTestCase.randomValueOtherThan;
@@ -113,7 +116,7 @@ public static PlainActionFuture<AssertionError> assertConsistencyAsync(BlobStore
                 assertIndexGenerations(blobContainer, latestGen);
                 final RepositoryData repositoryData;
                 try (
-                    InputStream blob = blobContainer.readBlob(randomNonDataPurpose(), BlobStoreRepository.INDEX_FILE_PREFIX + latestGen);
+                    InputStream blob = blobContainer.readBlob(randomNonDataPurpose(), getRepositoryDataBlobName(latestGen));
                     XContentParser parser = XContentType.JSON.xContent()
                         .createParser(XContentParserConfiguration.EMPTY.withDeprecationHandler(LoggingDeprecationHandler.INSTANCE), blob)
                 ) {
@@ -179,8 +182,8 @@ private static void assertShardIndexGenerations(BlobContainer repoRoot, ShardGen
                         final String shardId = Integer.toString(i);
                         assertThat(shardContainers, hasKey(shardId));
                         assertThat(
-                            shardContainers.get(shardId).listBlobsByPrefix(randomPurpose(), BlobStoreRepository.INDEX_FILE_PREFIX),
-                            hasKey(BlobStoreRepository.INDEX_FILE_PREFIX + generation)
+                            shardContainers.get(shardId).listBlobsByPrefix(randomPurpose(), BlobStoreRepository.SNAPSHOT_INDEX_PREFIX),
+                            hasKey(BlobStoreRepository.SNAPSHOT_INDEX_PREFIX + generation)
                         );
                     }
                 }
@@ -209,7 +212,7 @@ private static void assertIndexUUIDs(BlobStoreRepository repository, RepositoryD
                 .listBlobsByPrefix(randomPurpose(), BlobStoreRepository.METADATA_PREFIX)
                 .keySet()
                 .stream()
-                .map(p -> p.replace(BlobStoreRepository.METADATA_PREFIX, "").replace(".dat", ""))
+                .map(p -> p.replace(BlobStoreRepository.METADATA_PREFIX, "").replace(METADATA_BLOB_NAME_SUFFIX, ""))
                 .collect(Collectors.toSet());
             final Set<String> indexMetaGenerationsExpected = new HashSet<>();
             final IndexId idx = repositoryData.getIndices().values().stream().filter(i -> i.getId().equals(indexId)).findFirst().get();
@@ -235,7 +238,7 @@ private static void assertSnapshotUUIDs(
                 .keySet()
                 .stream()
                 .filter(p -> p.startsWith(prefix))
-                .map(p -> p.replace(prefix, "").replace(".dat", ""))
+                .map(p -> p.replace(prefix, "").replace(METADATA_BLOB_NAME_SUFFIX, ""))
                 .collect(Collectors.toSet());
             assertThat(foundSnapshotUUIDs, containsInAnyOrder(expectedSnapshotUUIDs.toArray(Strings.EMPTY_ARRAY)));
         }
@@ -292,11 +295,7 @@ private static void assertSnapshotInfosConsistency(
                 assertThat(
                     indexContainer.listBlobs(randomPurpose()),
                     hasKey(
-                        String.format(
-                            Locale.ROOT,
-                            BlobStoreRepository.METADATA_NAME_FORMAT,
-                            repositoryData.indexMetaDataGenerations().indexMetaBlobId(snapshotId, indexId)
-                        )
+                        Strings.format(METADATA_NAME_FORMAT, repositoryData.indexMetaDataGenerations().indexMetaBlobId(snapshotId, indexId))
                     )
                 );
                 final IndexMetadata indexMetadata = repository.getSnapshotIndexMetaData(repositoryData, snapshotId, indexId);
@@ -333,7 +332,7 @@ private static void assertSnapshotInfosConsistency(
                         assertThat(
                             shardPathContents.keySet()
                                 .stream()
-                                .filter(name -> name.startsWith(BlobStoreRepository.INDEX_FILE_PREFIX))
+                                .filter(name -> name.startsWith(BlobStoreRepository.SNAPSHOT_INDEX_PREFIX))
                                 .count(),
                             lessThanOrEqualTo(2L)
                         );
diff --git a/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java
index cae57d5137ac..c3ca68a3b844 100644
--- a/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java
@@ -282,7 +282,7 @@ public void testShapeRelations() throws Exception {
             .setMapping(mapping)
             .setSettings(settings(version).build());
         mappingRequest.get();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get();
 
         // Create a multipolygon with two polygons. The first is an rectangle of size 10x10
         // with a hole of size 5x5 equidistant from all sides. This hole in turn contains
@@ -458,7 +458,7 @@ public void testBulk() throws Exception {
     protected abstract void doDistanceAndBoundingBoxTest(String key);
 
     private static String findNodeName(String index) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         IndexShardRoutingTable shard = state.getRoutingTable().index(index).shard(0);
         String nodeId = shard.assignedShards().get(0).currentNodeId();
         return state.getNodes().get(nodeId).getName();
diff --git a/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java
index 1656a09daa12..728e1ca73ded 100644
--- a/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java
@@ -33,6 +33,7 @@
 import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.util.concurrent.EsExecutors;
 import org.elasticsearch.core.Nullable;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.plugins.Plugin;
@@ -72,7 +73,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -81,6 +81,7 @@
 import java.util.stream.StreamSupport;
 
 import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.READONLY_SETTING_KEY;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.getRepositoryDataBlobName;
 import static org.elasticsearch.snapshots.SnapshotsService.NO_FEATURE_STATES_VALUE;
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
 import static org.hamcrest.Matchers.empty;
@@ -364,12 +365,14 @@ protected static Settings.Builder indexSettingsNoReplicas(int shards) {
     /**
      * Randomly write an empty snapshot of an older version to an empty repository to simulate an older repository metadata format.
      */
+    @UpdateForV9
+    // This used to pick an index version from 7.0.0 to 8.9.0. The minimum now is 8.0.0 but it's not clear what the upper range should be
     protected void maybeInitWithOldSnapshotVersion(String repoName, Path repoPath) throws Exception {
         if (randomBoolean() && randomBoolean()) {
             initWithSnapshotVersion(
                 repoName,
                 repoPath,
-                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_8_9_0)
+                IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersions.V_8_9_0)
             );
         }
     }
@@ -409,7 +412,7 @@ protected String initWithSnapshotVersion(String repoName, Path repoPath, IndexVe
             downgradedRepoData = RepositoryData.snapshotsFromXContent(parser, repositoryData.getGenId(), randomBoolean());
         }
         Files.write(
-            repoPath.resolve(BlobStoreRepository.INDEX_FILE_PREFIX + repositoryData.getGenId()),
+            repoPath.resolve(getRepositoryDataBlobName(repositoryData.getGenId())),
             BytesReference.toBytes(BytesReference.bytes(downgradedRepoData.snapshotsToXContent(XContentFactory.jsonBuilder(), version))),
             StandardOpenOption.TRUNCATE_EXISTING
         );
@@ -510,7 +513,7 @@ protected void assertDocCount(String index, long count) {
      * @param metadata     snapshot metadata to write (as returned by {@link SnapshotInfo#userMetadata()})
      */
     protected void addBwCFailedSnapshot(String repoName, String snapshotName, Map<String, Object> metadata) throws Exception {
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final RepositoriesMetadata repositoriesMetadata = state.metadata().custom(RepositoriesMetadata.TYPE);
         assertNotNull(repositoriesMetadata);
         final RepositoryMetadata initialRepoMetadata = repositoriesMetadata.repository(repoName);
@@ -700,7 +703,7 @@ public static List<String> createNSnapshots(Logger logger, String repoName, int
         final PlainActionFuture<Collection<CreateSnapshotResponse>> allSnapshotsDone = new PlainActionFuture<>();
         final ActionListener<CreateSnapshotResponse> snapshotsListener = new GroupedActionListener<>(count, allSnapshotsDone);
         final List<String> snapshotNames = new ArrayList<>(count);
-        final String prefix = RANDOM_SNAPSHOT_NAME_PREFIX + UUIDs.randomBase64UUID(random()).toLowerCase(Locale.ROOT) + "-";
+        final String prefix = RANDOM_SNAPSHOT_NAME_PREFIX + randomIdentifier() + "-";
         for (int i = 0; i < count; i++) {
             final String snapshot = prefix + i;
             snapshotNames.add(snapshot);
diff --git a/test/framework/src/main/java/org/elasticsearch/snapshots/mockstore/MockRepository.java b/test/framework/src/main/java/org/elasticsearch/snapshots/mockstore/MockRepository.java
index b1381e408a75..29ea7419c562 100644
--- a/test/framework/src/main/java/org/elasticsearch/snapshots/mockstore/MockRepository.java
+++ b/test/framework/src/main/java/org/elasticsearch/snapshots/mockstore/MockRepository.java
@@ -486,11 +486,11 @@ private void maybeIOExceptionOrBlock(String blobName) throws IOException {
                         throw new IOException("Random IOException");
                     } else if (blockOnAnyFiles) {
                         blockExecutionAndMaybeWait(blobName);
-                    } else if (blobName.startsWith("snap-") && (blockAndFailOnWriteSnapFile || blockAndFailOnReadSnapFile)) {
+                    } else if (blobName.startsWith(SNAPSHOT_PREFIX) && (blockAndFailOnWriteSnapFile || blockAndFailOnReadSnapFile)) {
                         blockExecutionAndFail(blobName);
                     } else if (blobName.startsWith(INDEX_FILE_PREFIX) && blockAndFailOnReadIndexFile) {
                         blockExecutionAndFail(blobName);
-                    } else if (blockedIndexId != null && path().parts().contains(blockedIndexId) && blobName.startsWith("snap-")) {
+                    } else if (blockedIndexId != null && path().parts().contains(blockedIndexId) && blobName.startsWith(SNAPSHOT_PREFIX)) {
                         blockExecutionAndMaybeWait(blobName);
                     }
                 }
diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java
index 7dc9374da02e..61edc1354239 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java
@@ -157,7 +157,7 @@ protected void disconnectFromRemoteClusters() throws Exception {
                 settings.putNull("cluster.remote." + clusterAlias + ".proxy_address");
             }
         }
-        client().admin().cluster().prepareUpdateSettings().setPersistentSettings(settings).get();
+        client().admin().cluster().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setPersistentSettings(settings).get();
         assertBusy(() -> {
             for (TransportService transportService : cluster(LOCAL_CLUSTER).getInstances(TransportService.class)) {
                 assertThat(transportService.getRemoteClusterService().getRegisteredRemoteClusterNames(), empty());
@@ -204,7 +204,11 @@ protected void configureRemoteCluster(String clusterAlias, Collection<String> se
         }
         builder.build();
 
-        ClusterUpdateSettingsResponse resp = client().admin().cluster().prepareUpdateSettings().setPersistentSettings(settings).get();
+        ClusterUpdateSettingsResponse resp = client().admin()
+            .cluster()
+            .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .setPersistentSettings(settings)
+            .get();
         if (skipUnavailable != DEFAULT_SKIP_UNAVAILABLE) {
             String key = Strings.format("cluster.remote.%s.skip_unavailable", clusterAlias);
             assertEquals(String.valueOf(skipUnavailable), resp.getPersistentSettings().get(key));
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
index 4bdbc81bcc3f..b41819c83ffc 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java
@@ -48,6 +48,12 @@
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.action.ingest.DeletePipelineRequest;
+import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
+import org.elasticsearch.action.ingest.GetPipelineAction;
+import org.elasticsearch.action.ingest.GetPipelineRequest;
+import org.elasticsearch.action.ingest.GetPipelineResponse;
+import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.search.ClearScrollResponse;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchRequestBuilder;
@@ -126,6 +132,7 @@
 import org.elasticsearch.indices.IndicesRequestCache;
 import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.indices.store.IndicesStore;
+import org.elasticsearch.ingest.IngestPipelineTestUtils;
 import org.elasticsearch.monitor.jvm.HotThreads;
 import org.elasticsearch.node.NodeMocksPlugin;
 import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
@@ -150,6 +157,7 @@
 import org.elasticsearch.transport.TransportService;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 import org.elasticsearch.xcontent.ToXContent;
+import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentType;
@@ -580,7 +588,7 @@ private void afterInternal(boolean afterClass) throws Exception {
             try {
                 if (cluster() != null) {
                     if (currentClusterScope != Scope.TEST) {
-                        Metadata metadata = clusterAdmin().prepareState().get().getState().getMetadata();
+                        Metadata metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getMetadata();
 
                         final Set<String> persistentKeys = new HashSet<>(metadata.persistentSettings().keySet());
                         assertThat("test leaves persistent cluster metadata behind", persistentKeys, empty());
@@ -873,25 +881,25 @@ private static Settings.Builder getExcludeSettings(int num, Settings.Builder bui
      * Waits until all nodes have no pending tasks.
      */
     public void waitNoPendingTasksOnAll() throws Exception {
-        assertNoTimeout(clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get());
+        assertNoTimeout(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get());
         assertBusy(() -> {
             for (Client client : clients()) {
-                ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth().setLocal(true).get();
+                ClusterHealthResponse clusterHealth = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setLocal(true).get();
                 assertThat("client " + client + " still has in flight fetch", clusterHealth.getNumberOfInFlightFetch(), equalTo(0));
                 PendingClusterTasksResponse pendingTasks = client.execute(
                     TransportPendingClusterTasksAction.TYPE,
-                    new PendingClusterTasksRequest().local(true)
+                    new PendingClusterTasksRequest(TEST_REQUEST_TIMEOUT).local(true)
                 ).get();
                 assertThat(
                     "client " + client + " still has pending tasks " + pendingTasks,
                     pendingTasks.pendingTasks(),
                     Matchers.emptyIterable()
                 );
-                clusterHealth = client.admin().cluster().prepareHealth().setLocal(true).get();
+                clusterHealth = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).setLocal(true).get();
                 assertThat("client " + client + " still has in flight fetch", clusterHealth.getNumberOfInFlightFetch(), equalTo(0));
             }
         });
-        assertNoTimeout(clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get());
+        assertNoTimeout(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get());
     }
 
     /** Ensures the result counts are as expected, and logs the results if different */
@@ -980,7 +988,7 @@ private ClusterHealthStatus ensureColor(
         String color = clusterHealthStatus.name().toLowerCase(Locale.ROOT);
         String method = "ensure" + Strings.capitalize(color);
 
-        ClusterHealthRequest healthRequest = new ClusterHealthRequest(indices).masterNodeTimeout(timeout)
+        ClusterHealthRequest healthRequest = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, indices).masterNodeTimeout(timeout)
             .timeout(timeout)
             .waitForStatus(clusterHealthStatus)
             .waitForEvents(Priority.LANGUID)
@@ -1019,10 +1027,10 @@ private ClusterHealthStatus ensureColor(
                     new ClusterAllocationExplainRequest(TEST_REQUEST_TIMEOUT),
                     listeners.acquire(allocationExplainRef::set)
                 );
-                clusterAdmin().prepareState().execute(listeners.acquire(clusterStateRef::set));
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).execute(listeners.acquire(clusterStateRef::set));
                 client().execute(
                     TransportPendingClusterTasksAction.TYPE,
-                    new PendingClusterTasksRequest(),
+                    new PendingClusterTasksRequest(TEST_REQUEST_TIMEOUT),
                     listeners.acquire(pendingTasksRef::set)
                 );
                 try (var writer = new StringWriter()) {
@@ -1075,7 +1083,7 @@ public ClusterHealthStatus waitForRelocation() {
      * using the cluster health API.
      */
     public ClusterHealthStatus waitForRelocation(ClusterHealthStatus status) {
-        ClusterHealthRequest request = new ClusterHealthRequest(new String[] {}).waitForNoRelocatingShards(true)
+        ClusterHealthRequest request = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, new String[] {}).waitForNoRelocatingShards(true)
             .waitForEvents(Priority.LANGUID);
         if (status != null) {
             request.waitForStatus(status);
@@ -1085,7 +1093,7 @@ public ClusterHealthStatus waitForRelocation(ClusterHealthStatus status) {
             logger.info(
                 "waitForRelocation timed out (status={}), cluster state:\n{}\n{}",
                 status,
-                clusterAdmin().prepareState().get().getState(),
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(),
                 getClusterPendingTasks()
             );
             assertThat("timed out waiting for relocation", actionGet.isTimedOut(), equalTo(false));
@@ -1102,7 +1110,8 @@ public static PendingClusterTasksResponse getClusterPendingTasks() {
 
     public static PendingClusterTasksResponse getClusterPendingTasks(Client client) {
         try {
-            return client.execute(TransportPendingClusterTasksAction.TYPE, new PendingClusterTasksRequest()).get(10, TimeUnit.SECONDS);
+            return client.execute(TransportPendingClusterTasksAction.TYPE, new PendingClusterTasksRequest(TEST_REQUEST_TIMEOUT))
+                .get(10, TimeUnit.SECONDS);
         } catch (Exception e) {
             return fail(e);
         }
@@ -1203,7 +1212,7 @@ public static DiscoveryNode waitAndGetHealthNode(InternalTestCluster internalClu
             ClusterState state = internalCluster.client()
                 .admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setMetadata(true)
                 .setNodes(true)
@@ -1219,13 +1228,17 @@ public static DiscoveryNode waitAndGetHealthNode(InternalTestCluster internalClu
      * Prints the current cluster state as debug logging.
      */
     public void logClusterState() {
-        logger.debug("cluster state:\n{}\n{}", clusterAdmin().prepareState().get().getState(), getClusterPendingTasks());
+        logger.debug(
+            "cluster state:\n{}\n{}",
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(),
+            getClusterPendingTasks()
+        );
     }
 
     protected void ensureClusterSizeConsistency() {
         if (cluster() != null && cluster().size() > 0) { // if static init fails the cluster can be null
             logger.trace("Check consistency for [{}] nodes", cluster().size());
-            assertNoTimeout(clusterAdmin().prepareHealth().setWaitForNodes(Integer.toString(cluster().size())).get());
+            assertNoTimeout(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes(Integer.toString(cluster().size())).get());
         }
     }
 
@@ -1242,64 +1255,68 @@ protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry name
         final PlainActionFuture<Void> future = new PlainActionFuture<>();
         final List<SubscribableListener<ClusterStateResponse>> localStates = new ArrayList<>(cluster().size());
         for (Client client : cluster().getClients()) {
-            localStates.add(SubscribableListener.newForked(l -> client.admin().cluster().prepareState().all().setLocal(true).execute(l)));
+            localStates.add(
+                SubscribableListener.newForked(
+                    l -> client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).all().setLocal(true).execute(l)
+                )
+            );
         }
         try (RefCountingListener refCountingListener = new RefCountingListener(future)) {
-            SubscribableListener.<ClusterStateResponse>newForked(l -> client().admin().cluster().prepareState().all().execute(l))
-                .andThenAccept(masterStateResponse -> {
-                    byte[] masterClusterStateBytes = ClusterState.Builder.toBytes(masterStateResponse.getState());
-                    // remove local node reference
-                    final ClusterState masterClusterState = ClusterState.Builder.fromBytes(
-                        masterClusterStateBytes,
-                        null,
-                        namedWriteableRegistry
-                    );
-                    Map<String, Object> masterStateMap = convertToMap(masterClusterState);
-                    int masterClusterStateSize = ClusterState.Builder.toBytes(masterClusterState).length;
-                    String masterId = masterClusterState.nodes().getMasterNodeId();
-                    for (SubscribableListener<ClusterStateResponse> localStateListener : localStates) {
-                        localStateListener.andThenAccept(localClusterStateResponse -> {
-                            byte[] localClusterStateBytes = ClusterState.Builder.toBytes(localClusterStateResponse.getState());
-                            // remove local node reference
-                            final ClusterState localClusterState = ClusterState.Builder.fromBytes(
-                                localClusterStateBytes,
-                                null,
-                                namedWriteableRegistry
-                            );
-                            final Map<String, Object> localStateMap = convertToMap(localClusterState);
-                            final int localClusterStateSize = ClusterState.Builder.toBytes(localClusterState).length;
-                            // Check that the non-master node has the same version of the cluster state as the master and
-                            // that the master node matches the master (otherwise there is no requirement for the cluster state to
-                            // match)
-                            if (masterClusterState.version() == localClusterState.version()
-                                && masterId.equals(localClusterState.nodes().getMasterNodeId())) {
-                                try {
-                                    assertEquals(
-                                        "cluster state UUID does not match",
-                                        masterClusterState.stateUUID(),
-                                        localClusterState.stateUUID()
-                                    );
-                                    // We cannot compare serialization bytes since serialization order of maps is not guaranteed
-                                    // but we can compare serialization sizes - they should be the same
-                                    assertEquals("cluster state size does not match", masterClusterStateSize, localClusterStateSize);
-                                    // Compare JSON serialization
-                                    assertNull(
-                                        "cluster state JSON serialization does not match",
-                                        differenceBetweenMapsIgnoringArrayOrder(masterStateMap, localStateMap)
-                                    );
-                                } catch (final AssertionError error) {
-                                    logger.error(
-                                        "Cluster state from master:\n{}\nLocal cluster state:\n{}",
-                                        masterClusterState.toString(),
-                                        localClusterState.toString()
-                                    );
-                                    throw error;
-                                }
+            SubscribableListener.<ClusterStateResponse>newForked(
+                l -> client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).all().execute(l)
+            ).andThenAccept(masterStateResponse -> {
+                byte[] masterClusterStateBytes = ClusterState.Builder.toBytes(masterStateResponse.getState());
+                // remove local node reference
+                final ClusterState masterClusterState = ClusterState.Builder.fromBytes(
+                    masterClusterStateBytes,
+                    null,
+                    namedWriteableRegistry
+                );
+                Map<String, Object> masterStateMap = convertToMap(masterClusterState);
+                int masterClusterStateSize = ClusterState.Builder.toBytes(masterClusterState).length;
+                String masterId = masterClusterState.nodes().getMasterNodeId();
+                for (SubscribableListener<ClusterStateResponse> localStateListener : localStates) {
+                    localStateListener.andThenAccept(localClusterStateResponse -> {
+                        byte[] localClusterStateBytes = ClusterState.Builder.toBytes(localClusterStateResponse.getState());
+                        // remove local node reference
+                        final ClusterState localClusterState = ClusterState.Builder.fromBytes(
+                            localClusterStateBytes,
+                            null,
+                            namedWriteableRegistry
+                        );
+                        final Map<String, Object> localStateMap = convertToMap(localClusterState);
+                        final int localClusterStateSize = ClusterState.Builder.toBytes(localClusterState).length;
+                        // Check that the non-master node has the same version of the cluster state as the master and
+                        // that the master node matches the master (otherwise there is no requirement for the cluster state to
+                        // match)
+                        if (masterClusterState.version() == localClusterState.version()
+                            && masterId.equals(localClusterState.nodes().getMasterNodeId())) {
+                            try {
+                                assertEquals(
+                                    "cluster state UUID does not match",
+                                    masterClusterState.stateUUID(),
+                                    localClusterState.stateUUID()
+                                );
+                                // We cannot compare serialization bytes since serialization order of maps is not guaranteed
+                                // but we can compare serialization sizes - they should be the same
+                                assertEquals("cluster state size does not match", masterClusterStateSize, localClusterStateSize);
+                                // Compare JSON serialization
+                                assertNull(
+                                    "cluster state JSON serialization does not match",
+                                    differenceBetweenMapsIgnoringArrayOrder(masterStateMap, localStateMap)
+                                );
+                            } catch (final AssertionError error) {
+                                logger.error(
+                                    "Cluster state from master:\n{}\nLocal cluster state:\n{}",
+                                    masterClusterState.toString(),
+                                    localClusterState.toString()
+                                );
+                                throw error;
                             }
-                        }).addListener(refCountingListener.acquire());
-                    }
-                })
-                .addListener(refCountingListener.acquire());
+                        }
+                    }).addListener(refCountingListener.acquire());
+                }
+            }).addListener(refCountingListener.acquire());
         }
         safeGet(future);
     }
@@ -1307,7 +1324,7 @@ protected final void doEnsureClusterStateConsistency(NamedWriteableRegistry name
     protected void ensureClusterStateCanBeReadByNodeTool() throws IOException {
         if (cluster() != null && cluster().size() > 0) {
             final Client masterClient = client();
-            Metadata metadata = masterClient.admin().cluster().prepareState().all().get().getState().metadata();
+            Metadata metadata = masterClient.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState().metadata();
             final Map<String, String> serializationParams = Maps.newMapWithExpectedSize(2);
             serializationParams.put("binary", "true");
             serializationParams.put(Metadata.CONTEXT_MODE_PARAM, Metadata.CONTEXT_MODE_GATEWAY);
@@ -1449,7 +1466,7 @@ protected void ensureStableCluster(int nodeCount, TimeValue timeValue, boolean l
         logger.debug("ensuring cluster is stable with [{}] nodes. access node: [{}]. timeout: [{}]", nodeCount, viaNode, timeValue);
         ClusterHealthResponse clusterHealthResponse = client(viaNode).admin()
             .cluster()
-            .prepareHealth()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNodes(Integer.toString(nodeCount))
             .setTimeout(timeValue)
@@ -1457,7 +1474,7 @@ protected void ensureStableCluster(int nodeCount, TimeValue timeValue, boolean l
             .setWaitForNoRelocatingShards(true)
             .get();
         if (clusterHealthResponse.isTimedOut()) {
-            ClusterStateResponse stateResponse = client(viaNode).admin().cluster().prepareState().get();
+            ClusterStateResponse stateResponse = client(viaNode).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get();
             fail(
                 "failed to reach a stable cluster of ["
                     + nodeCount
@@ -1812,7 +1829,9 @@ public static void setClusterReadOnly(boolean value) {
 
     /** Sets cluster persistent settings **/
     public static void updateClusterSettings(Settings.Builder persistentSettings) {
-        assertAcked(clusterAdmin().prepareUpdateSettings().setPersistentSettings(persistentSettings).get());
+        assertAcked(
+            clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setPersistentSettings(persistentSettings).get()
+        );
     }
 
     private static CountDownLatch newLatch(List<CountDownLatch> latches) {
@@ -2267,7 +2286,7 @@ public static Path randomRepoPath(Settings settings) {
     }
 
     protected NumShards getNumShards(String index) {
-        Metadata metadata = clusterAdmin().prepareState().get().getState().metadata();
+        Metadata metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         assertThat(metadata.hasIndex(index), equalTo(true));
         int numShards = Integer.valueOf(metadata.index(index).getSettings().get(SETTING_NUMBER_OF_SHARDS));
         int numReplicas = Integer.valueOf(metadata.index(index).getSettings().get(SETTING_NUMBER_OF_REPLICAS));
@@ -2279,7 +2298,7 @@ protected NumShards getNumShards(String index) {
      */
     public Set<String> assertAllShardsOnNodes(String index, String... pattern) {
         Set<String> nodes = new HashSet<>();
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         for (IndexRoutingTable indexRoutingTable : clusterState.routingTable()) {
             for (int shardId = 0; shardId < indexRoutingTable.size(); shardId++) {
                 final IndexShardRoutingTable indexShard = indexRoutingTable.shard(shardId);
@@ -2602,4 +2621,48 @@ private static long fullyAllocate(CircuitBreaker circuitBreaker) {
         }
         return totalAllocated;
     }
+
+    /**
+     * Create an ingest pipeline with the given ID and body, using the default {@link ESIntegTestCase#client()}.
+     *
+     * @param id         The pipeline id.
+     * @param source     The body of the {@link PutPipelineRequest} as a JSON-formatted {@link BytesReference}.
+     */
+    protected static void putJsonPipeline(String id, BytesReference source) {
+        IngestPipelineTestUtils.putJsonPipeline(client(), id, source);
+    }
+
+    /**
+     * Create an ingest pipeline with the given ID and body, using the default {@link ESIntegTestCase#client()}.
+     *
+     * @param id         The pipeline id.
+     * @param jsonString The body of the {@link PutPipelineRequest} as a JSON-formatted {@link String}.
+     */
+    protected static void putJsonPipeline(String id, String jsonString) {
+        IngestPipelineTestUtils.putJsonPipeline(client(), id, jsonString);
+    }
+
+    /**
+     * Create an ingest pipeline with the given ID and body, using the default {@link ESIntegTestCase#client()}.
+     *
+     * @param id         The pipeline id.
+     * @param toXContent The body of the {@link PutPipelineRequest} as a {@link ToXContentFragment}.
+     */
+    protected static void putJsonPipeline(String id, ToXContentFragment toXContent) throws IOException {
+        IngestPipelineTestUtils.putJsonPipeline(client(), id, toXContent);
+    }
+
+    /**
+     * @return the result of running the {@link GetPipelineAction} on the given IDs, using the default {@link ESIntegTestCase#client()}.
+     */
+    protected static GetPipelineResponse getPipelines(String... ids) {
+        return safeGet(client().execute(GetPipelineAction.INSTANCE, new GetPipelineRequest(ids)));
+    }
+
+    /**
+     * Delete the ingest pipeline with the given {@code id}, the default {@link ESIntegTestCase#client()}.
+     */
+    protected static void deletePipeline(String id) {
+        assertAcked(safeGet(client().execute(DeletePipelineTransportAction.TYPE, new DeletePipelineRequest(id))));
+    }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
index f0eb33445db2..fe9fe6395271 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
@@ -20,6 +20,9 @@
 import org.elasticsearch.action.admin.indices.template.delete.TransportDeleteComposableIndexTemplateAction;
 import org.elasticsearch.action.datastreams.DeleteDataStreamAction;
 import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.action.ingest.DeletePipelineRequest;
+import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
+import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.support.DestructiveOperations;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.client.internal.AdminClient;
@@ -45,6 +48,7 @@
 import org.elasticsearch.indices.IndicesService;
 import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService;
 import org.elasticsearch.indices.cluster.IndicesClusterStateService;
+import org.elasticsearch.ingest.IngestPipelineTestUtils;
 import org.elasticsearch.node.MockNode;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.NodeValidationException;
@@ -56,6 +60,7 @@
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.transport.TransportSettings;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
+import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -94,7 +99,7 @@ protected void startNode(long seed) throws Exception {
         // we must wait for the node to actually be up and running. otherwise the node might have started,
         // elected itself master but might not yet have removed the
         // SERVICE_UNAVAILABLE/1/state not recovered / initialized block
-        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth().setWaitForGreenStatus().get();
+        ClusterHealthResponse clusterHealthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForGreenStatus().get();
         assertFalse(clusterHealthResponse.isTimedOut());
         indicesAdmin().preparePutTemplate("one_shard_index_template")
             .setPatterns(Collections.singletonList("*"))
@@ -154,7 +159,7 @@ public void tearDown() throws Exception {
         var deleteComponentTemplateRequest = new TransportDeleteComponentTemplateAction.Request("*");
         assertAcked(client().execute(TransportDeleteComponentTemplateAction.TYPE, deleteComponentTemplateRequest).actionGet());
         assertAcked(indicesAdmin().prepareDelete("*").setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN).get());
-        Metadata metadata = clusterAdmin().prepareState().get().getState().getMetadata();
+        Metadata metadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getMetadata();
         assertThat(
             "test leaves persistent cluster metadata behind: " + metadata.persistentSettings().keySet(),
             metadata.persistentSettings().size(),
@@ -384,7 +389,9 @@ protected IndexService createIndex(String index, CreateIndexRequestBuilder creat
         // Wait for the index to be allocated so that cluster state updates don't override
         // changes that would have been done locally
         ClusterHealthResponse health = clusterAdmin().health(
-            new ClusterHealthRequest(index).waitForYellowStatus().waitForEvents(Priority.LANGUID).waitForNoRelocatingShards(true)
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, index).waitForYellowStatus()
+                .waitForEvents(Priority.LANGUID)
+                .waitForNoRelocatingShards(true)
         ).actionGet();
         assertThat(health.getStatus(), lessThanOrEqualTo(ClusterHealthStatus.YELLOW));
         assertThat("Cluster must be a single node cluster", health.getNumberOfDataNodes(), equalTo(1));
@@ -428,7 +435,7 @@ public ClusterHealthStatus ensureGreen(String... indices) {
      */
     public ClusterHealthStatus ensureGreen(TimeValue timeout, String... indices) {
         ClusterHealthResponse actionGet = clusterAdmin().health(
-            new ClusterHealthRequest(indices).masterNodeTimeout(timeout)
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, indices).masterNodeTimeout(timeout)
                 .timeout(timeout)
                 .waitForGreenStatus()
                 .waitForEvents(Priority.LANGUID)
@@ -437,7 +444,7 @@ public ClusterHealthStatus ensureGreen(TimeValue timeout, String... indices) {
         if (actionGet.isTimedOut()) {
             logger.info(
                 "ensureGreen timed out, cluster state:\n{}\n{}",
-                clusterAdmin().prepareState().get().getState(),
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState(),
                 ESIntegTestCase.getClusterPendingTasks(client())
             );
             assertThat("timed out waiting for green state", actionGet.isTimedOut(), equalTo(false));
@@ -462,8 +469,9 @@ protected boolean forbidPrivateIndexSettings() {
      * inspired by {@link ESRestTestCase}
      */
     protected void ensureNoInitializingShards() {
-        ClusterHealthResponse actionGet = clusterAdmin().health(new ClusterHealthRequest("_all").waitForNoInitializingShards(true))
-            .actionGet();
+        ClusterHealthResponse actionGet = clusterAdmin().health(
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, "_all").waitForNoInitializingShards(true)
+        ).actionGet();
 
         assertFalse("timed out waiting for shards to initialize", actionGet.isTimedOut());
     }
@@ -490,4 +498,31 @@ protected void awaitIndexShardCloseAsyncTasks() {
         getInstanceFromNode(IndicesClusterStateService.class).onClusterStateShardsClosed(latch::countDown);
         safeAwait(latch);
     }
+
+    /**
+     * Create an ingest pipeline with the given ID and body, using the default {@link ESSingleNodeTestCase#client()}.
+     *
+     * @param id         The pipeline id.
+     * @param jsonString The body of the {@link PutPipelineRequest} as a JSON-formatted {@link String}.
+     */
+    protected final void putJsonPipeline(String id, String jsonString) {
+        IngestPipelineTestUtils.putJsonPipeline(client(), id, jsonString);
+    }
+
+    /**
+     * Create an ingest pipeline with the given ID and body, using the default {@link ESSingleNodeTestCase#client()}.
+     *
+     * @param id         The pipeline id.
+     * @param toXContent The body of the {@link PutPipelineRequest} as a {@link ToXContentFragment}.
+     */
+    protected final void putJsonPipeline(String id, ToXContentFragment toXContent) throws IOException {
+        IngestPipelineTestUtils.putJsonPipeline(client(), id, toXContent);
+    }
+
+    /**
+     * Delete the ingest pipeline with the given {@code id}, the default {@link ESSingleNodeTestCase#client()}.
+     */
+    protected final void deletePipeline(String id) {
+        assertAcked(safeGet(client().execute(DeletePipelineTransportAction.TYPE, new DeletePipelineRequest(id))));
+    }
 }
diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
index 38b8dfecc0b5..823f5084f5d5 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
@@ -142,6 +142,7 @@
 import static org.elasticsearch.discovery.DiscoveryModule.MULTI_NODE_DISCOVERY_TYPE;
 import static org.elasticsearch.discovery.FileBasedSeedHostsProvider.UNICAST_HOSTS_FILE;
 import static org.elasticsearch.node.Node.INITIAL_STATE_TIMEOUT_SETTING;
+import static org.elasticsearch.test.ESTestCase.TEST_REQUEST_TIMEOUT;
 import static org.elasticsearch.test.ESTestCase.assertBusy;
 import static org.elasticsearch.test.ESTestCase.randomFrom;
 import static org.elasticsearch.test.ESTestCase.runInParallel;
@@ -1240,7 +1241,7 @@ public synchronized void validateClusterFormed() {
         assertFalse(
             client().admin()
                 .cluster()
-                .prepareHealth()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForEvents(Priority.LANGUID)
                 .setWaitForNodes(Integer.toString(expectedNodes.size()))
                 .get(TimeValue.timeValueSeconds(40))
@@ -1368,7 +1369,7 @@ private void assertNoAcquiredIndexCommit() throws Exception {
                             if (engine instanceof InternalEngine) {
                                 assertFalse(
                                     indexShard.routingEntry().toString() + " has unreleased snapshotted index commits",
-                                    EngineTestCase.hasAcquiredIndexCommits(engine)
+                                    EngineTestCase.hasAcquiredIndexCommitsForTesting(engine)
                                 );
                             }
                         } catch (AlreadyClosedException ignored) {
@@ -1481,7 +1482,7 @@ public void assertSeqNos() throws Exception {
      */
     public void assertSameDocIdsOnShards() throws Exception {
         assertBusy(() -> {
-            ClusterState state = client().admin().cluster().prepareState().get().getState();
+            ClusterState state = client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             for (var indexRoutingTable : state.routingTable().indicesRouting().values()) {
                 for (int i = 0; i < indexRoutingTable.size(); i++) {
                     IndexShardRoutingTable indexShardRoutingTable = indexRoutingTable.shard(i);
@@ -1928,7 +1929,7 @@ private Set<String> excludeMasters(Collection<NodeAndClient> nodeAndClients) {
                 try {
                     client().execute(
                         TransportAddVotingConfigExclusionsAction.TYPE,
-                        new AddVotingConfigExclusionsRequest(excludedNodeNames.toArray(Strings.EMPTY_ARRAY))
+                        new AddVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT, excludedNodeNames.toArray(Strings.EMPTY_ARRAY))
                     ).get();
                 } catch (InterruptedException | ExecutionException e) {
                     ESTestCase.fail(e);
@@ -1944,7 +1945,10 @@ private void removeExclusions(Set<String> excludedNodeIds) {
             logger.info("removing voting config exclusions for {} after restart/shutdown", excludedNodeIds);
             try {
                 Client client = getRandomNodeAndClient(node -> excludedNodeIds.contains(node.name) == false).client();
-                client.execute(TransportClearVotingConfigExclusionsAction.TYPE, new ClearVotingConfigExclusionsRequest()).get();
+                client.execute(
+                    TransportClearVotingConfigExclusionsAction.TYPE,
+                    new ClearVotingConfigExclusionsRequest(TEST_REQUEST_TIMEOUT)
+                ).get();
             } catch (InterruptedException | ExecutionException e) {
                 ESTestCase.fail(e);
             }
@@ -2000,7 +2004,7 @@ public String getMasterName() {
     public String getMasterName(@Nullable String viaNode) {
         try {
             Client client = viaNode != null ? client(viaNode) : client();
-            return client.admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName();
+            return client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNode().getName();
         } catch (Exception e) {
             logger.warn("Can't fetch cluster state", e);
             throw new RuntimeException("Can't get master node " + e.getMessage(), e);
diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java
index 67ff67ee6fe0..3385cb1eb2e7 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java
@@ -36,9 +36,11 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 
+import static org.elasticsearch.test.ESTestCase.TEST_REQUEST_TIMEOUT;
 import static org.elasticsearch.test.ESTestCase.safeAwait;
 
 /**
@@ -84,13 +86,13 @@ public void wipe(Set<String> excludeTemplates) {
                     .<AcknowledgedResponse>newForked(
                         l -> client().execute(
                             DeleteDataStreamAction.INSTANCE,
-                            new DeleteDataStreamAction.Request(ESTestCase.TEST_REQUEST_TIMEOUT, "*").indicesOptions(
+                            new DeleteDataStreamAction.Request(TEST_REQUEST_TIMEOUT, "*").indicesOptions(
                                 IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN
                             ),
                             l.delegateResponse((ll, e) -> {
                                 // Ignore if action isn't registered, because data streams is a module and
                                 // if the delete action isn't registered then there no data streams to delete.
-                                if (e.getMessage().startsWith("failed to find action") == false) {
+                                if (Objects.requireNonNullElse(e.getMessage(), "").startsWith("failed to find action") == false) {
                                     ll.onFailure(e);
                                 } else {
                                     ll.onResponse(AcknowledgedResponse.TRUE);
@@ -255,7 +257,7 @@ private void handleWipeIndicesFailure(Exception exception, boolean wipingAllIndi
             if (wipingAllIndices) {
                 SubscribableListener
 
-                    .<ClusterStateResponse>newForked(l -> client().admin().cluster().prepareState().execute(l))
+                    .<ClusterStateResponse>newForked(l -> client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).execute(l))
                     .<AcknowledgedResponse>andThen((l, clusterStateResponse) -> {
                         ArrayList<String> concreteIndices = new ArrayList<>();
                         for (IndexMetadata indexMetadata : clusterStateResponse.getState().metadata()) {
@@ -336,7 +338,7 @@ private void wipeRepositories(ActionListener<Void> listener) {
             .<AcknowledgedResponse>newForked(
                 l -> client().admin()
                     .cluster()
-                    .prepareDeleteRepository(ESTestCase.TEST_REQUEST_TIMEOUT, ESTestCase.TEST_REQUEST_TIMEOUT, "*")
+                    .prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "*")
                     .execute(l.delegateResponse((ll, e) -> {
                         if (e instanceof RepositoryMissingException) {
                             // ignore
diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java
index a70afedb6f22..e4ecbc015d7d 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java
@@ -13,6 +13,7 @@
 
 import java.util.Random;
 
+import static org.elasticsearch.test.ESTestCase.TEST_REQUEST_TIMEOUT;
 import static org.junit.Assert.assertFalse;
 
 public abstract class SingleNodeDisruption implements ServiceDisruptionScheme {
@@ -71,7 +72,7 @@ protected void ensureNodeCount(InternalTestCluster testCluster) {
             testCluster.client()
                 .admin()
                 .cluster()
-                .prepareHealth()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
                 .setWaitForNodes(String.valueOf(testCluster.size()))
                 .setWaitForNoRelocatingShards(true)
                 .get()
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java
index aa04855c0362..0988e7ec19c7 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestFeatureService.java
@@ -95,6 +95,27 @@ public boolean clusterHasFeature(String featureId, boolean any) {
         Matcher matcher = VERSION_FEATURE_PATTERN.matcher(featureId);
         if (matcher.matches()) {
             Version extractedVersion = Version.fromString(matcher.group(1));
+            if (extractedVersion.after(Version.CURRENT)) {
+                throw new IllegalArgumentException(
+                    Strings.format(
+                        "Cannot use a synthetic feature [%s] for a version after the current version [%s]",
+                        featureId,
+                        Version.CURRENT
+                    )
+                );
+            }
+
+            if (extractedVersion.equals(Version.CURRENT)) {
+                throw new IllegalArgumentException(
+                    Strings.format(
+                        "Cannot use a synthetic feature [%s] for the current version [%s]; "
+                            + "please define a test cluster feature alongside the corresponding code change instead",
+                        featureId,
+                        Version.CURRENT
+                    )
+                );
+            }
+
             return checkCollection(nodeVersions, v -> v.onOrAfter(extractedVersion), any);
         }
 
diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java
index da478cbf1cb2..8e10fd08c9d4 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java
@@ -29,6 +29,8 @@
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.util.MockPageCacheRecycler;
 import org.elasticsearch.common.util.concurrent.AbstractRunnable;
+import org.elasticsearch.common.util.concurrent.EsExecutors;
+import org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor;
 import org.elasticsearch.common.util.concurrent.RunOnce;
 import org.elasticsearch.core.AbstractRefCounted;
 import org.elasticsearch.core.IOUtils;
@@ -81,6 +83,7 @@
 import java.util.function.Supplier;
 
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.spy;
 
 /**
@@ -206,6 +209,7 @@ public static MockTransportService getInstance(String nodeName) {
     }
 
     private final Transport original;
+    private final EsThreadPoolExecutor testExecutor;
 
     /**
      * Build the service.
@@ -302,6 +306,16 @@ private MockTransportService(
             Tracer.NOOP
         );
         this.original = transport.getDelegate();
+        this.testExecutor = EsExecutors.newScaling(
+            "mock-transport",
+            0,
+            4,
+            30,
+            TimeUnit.SECONDS,
+            true,
+            EsExecutors.daemonThreadFactory("mock-transport"),
+            threadPool.getThreadContext()
+        );
     }
 
     private static TransportAddress[] extractTransportAddresses(TransportService transportService) {
@@ -617,7 +631,7 @@ protected void doRun() throws IOException {
                                 delay
                             )
                         );
-                        threadPool.schedule(runnable, delay, threadPool.generic());
+                        threadPool.schedule(runnable, delay, testExecutor);
                     }
                 }
             }
@@ -795,6 +809,8 @@ protected void doClose() throws IOException {
             }
         } catch (InterruptedException e) {
             throw new IllegalStateException(e);
+        } finally {
+            assertTrue(ThreadPool.terminate(testExecutor, 10, TimeUnit.SECONDS));
         }
     }
 
diff --git a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java
index a8a33da27aeb..49fb38b518dc 100644
--- a/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java
+++ b/test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java
@@ -16,12 +16,7 @@
  */
 public enum FeatureFlag {
     TIME_SERIES_MODE("es.index_mode_feature_flag_registered=true", Version.fromString("8.0.0"), null),
-    FAILURE_STORE_ENABLED("es.failure_store_feature_flag_enabled=true", Version.fromString("8.12.0"), null),
-    INFERENCE_ADAPTIVE_ALLOCATIONS_ENABLED(
-        "es.inference_adaptive_allocations_feature_flag_enabled=true",
-        Version.fromString("8.16.0"),
-        null
-    );
+    FAILURE_STORE_ENABLED("es.failure_store_feature_flag_enabled=true", Version.fromString("8.12.0"), null);
 
     public final String systemProperty;
     public final Version from;
diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml
new file mode 100644
index 000000000000..8ad9bd6df8af
--- /dev/null
+++ b/updatecli-compose.yaml
@@ -0,0 +1,14 @@
+# Config file for `updatecli compose ...`.
+# https://www.updatecli.io/docs/core/compose/
+policies:
+  - name: Handle ironbank bumps
+    policy: ghcr.io/elastic/oblt-updatecli-policies/ironbank/templates:0.3.0@sha256:b0c841d8fb294e6b58359462afbc83070dca375ac5dd0c5216c8926872a98bb1
+    values:
+      - .github/updatecli/values.d/scm.yml
+      - .github/updatecli/values.d/ironbank.yml
+
+  - name: Update Updatecli policies
+    policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.4.0@sha256:254367f5b1454fd6032b88b314450cd3b6d5e8d5b6c953eb242a6464105eb869
+    values:
+      - .github/updatecli/values.d/scm.yml
+      - .github/updatecli/values.d/updatecli-compose.yml
\ No newline at end of file
diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java
index eb27f4b8cfc2..0940b3ef96dd 100644
--- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java
+++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramFieldMapper.java
@@ -98,8 +98,7 @@ public HistogramFieldMapper build(MapperBuilderContext context) {
             return new HistogramFieldMapper(
                 leafName(),
                 new HistogramFieldType(context.buildFullName(leafName()), meta.getValue()),
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 this
             );
         }
@@ -113,14 +112,8 @@ public HistogramFieldMapper build(MapperBuilderContext context) {
     private final Explicit<Boolean> ignoreMalformed;
     private final boolean ignoreMalformedByDefault;
 
-    public HistogramFieldMapper(
-        String simpleName,
-        MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
-        Builder builder
-    ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+    public HistogramFieldMapper(String simpleName, MappedFieldType mappedFieldType, BuilderParams builderParams, Builder builder) {
+        super(simpleName, mappedFieldType, builderParams);
         this.ignoreMalformed = builder.ignoreMalformed.getValue();
         this.ignoreMalformedByDefault = builder.ignoreMalformed.getDefaultValue().value();
     }
@@ -507,24 +500,15 @@ public long count() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [histogram] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-
-        return new CompositeSyntheticFieldLoader(
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        var loader = new CompositeSyntheticFieldLoader(
             leafName(),
             fullPath(),
             new HistogramSyntheticFieldLoader(),
             new CompositeSyntheticFieldLoader.MalformedValuesLayer(fullPath())
         );
+
+        return new SyntheticSourceSupport.Native(loader);
     }
 
     private class HistogramSyntheticFieldLoader implements CompositeSyntheticFieldLoader.DocValuesLayer {
diff --git a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchIntegTestCase.java b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchIntegTestCase.java
index 56f957ff488d..52ecc40c957b 100644
--- a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchIntegTestCase.java
+++ b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchIntegTestCase.java
@@ -146,7 +146,7 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
      */
     protected void restartTaskNode(String id, String indexName) throws Exception {
         AsyncExecutionId searchId = AsyncExecutionId.decode(id);
-        final ClusterStateResponse clusterState = clusterAdmin().prepareState().clear().setNodes(true).get();
+        final ClusterStateResponse clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setNodes(true).get();
         DiscoveryNode node = clusterState.getState().nodes().get(searchId.getTaskId().getNodeId());
 
         // Temporarily stop garbage collection, making sure to wait for any in-flight tasks to complete
diff --git a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CCSUsageTelemetryAsyncSearchIT.java b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CCSUsageTelemetryAsyncSearchIT.java
index 4f8fa122047e..9e17aa25154b 100644
--- a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CCSUsageTelemetryAsyncSearchIT.java
+++ b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CCSUsageTelemetryAsyncSearchIT.java
@@ -349,7 +349,7 @@ private Map<String, Object> setupClusters() {
             assertFalse(
                 client(clusterAlias).admin()
                     .cluster()
-                    .prepareHealth(remoteIndex)
+                    .prepareHealth(TEST_REQUEST_TIMEOUT, remoteIndex)
                     .setWaitForYellowStatus()
                     .setTimeout(TimeValue.timeValueSeconds(10))
                     .get()
diff --git a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CrossClusterAsyncSearchIT.java b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CrossClusterAsyncSearchIT.java
index 646ba1465c7c..9d83f88a043e 100644
--- a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CrossClusterAsyncSearchIT.java
+++ b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CrossClusterAsyncSearchIT.java
@@ -1742,7 +1742,7 @@ private Map<String, Object> setupTwoClusters() {
         assertFalse(
             client(REMOTE_CLUSTER).admin()
                 .cluster()
-                .prepareHealth(remoteIndex)
+                .prepareHealth(TEST_REQUEST_TIMEOUT, remoteIndex)
                 .setWaitForYellowStatus()
                 .setTimeout(TimeValue.timeValueSeconds(10))
                 .get()
diff --git a/x-pack/plugin/autoscaling/qa/rest/build.gradle b/x-pack/plugin/autoscaling/qa/rest/build.gradle
index 19254880a708..c79644ee3122 100644
--- a/x-pack/plugin/autoscaling/qa/rest/build.gradle
+++ b/x-pack/plugin/autoscaling/qa/rest/build.gradle
@@ -13,12 +13,6 @@ restResources {
   }
 }
 
-tasks.named("yamlRestTestV7CompatTest").configure {
-  systemProperty 'tests.rest.blacklist', [
-    "autoscaling/get_autoscaling_capacity/Test get fixed autoscaling capacity",
-  ].join(',')
-}
-
 testClusters.configureEach {
   testDistribution = 'DEFAULT'
   setting 'xpack.security.enabled', 'true'
diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/AutoscalingFileSettingsIT.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/AutoscalingFileSettingsIT.java
index 4da3d5ef08e0..59144df93834 100644
--- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/AutoscalingFileSettingsIT.java
+++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/AutoscalingFileSettingsIT.java
@@ -134,7 +134,7 @@ private void assertPoliciesSaveOK(CountDownLatch savedClusterState, AtomicLong m
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).actionGet();
 
         ReservedStateMetadata reservedState = clusterStateResponse.getState()
diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyActionIT.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyActionIT.java
index 8d2a60773d29..afb98f4c5e03 100644
--- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyActionIT.java
+++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportDeleteAutoscalingPolicyActionIT.java
@@ -41,7 +41,7 @@ public void testDeletePolicy() {
         );
         assertAcked(client().execute(DeleteAutoscalingPolicyAction.INSTANCE, deleteRequest).actionGet());
         // now verify that the policy is not in the cluster state
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final AutoscalingMetadata metadata = state.metadata().custom(AutoscalingMetadata.NAME);
         assertNotNull(metadata);
         assertThat(metadata.policies(), not(hasKey(policy.name())));
diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionIT.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionIT.java
index 1a49211601c4..18fdc7f6fd35 100644
--- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionIT.java
+++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/action/TransportPutAutoscalingPolicyActionIT.java
@@ -32,7 +32,7 @@ public class TransportPutAutoscalingPolicyActionIT extends AutoscalingIntegTestC
 
     public void testAddPolicy() {
         final AutoscalingPolicy policy = putRandomAutoscalingPolicy();
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final AutoscalingMetadata metadata = state.metadata().custom(AutoscalingMetadata.NAME);
         assertNotNull(metadata);
         assertThat(metadata.policies(), hasKey(policy.name()));
@@ -47,7 +47,7 @@ public void testUpdatePolicy() {
             mutateAutoscalingDeciders(policy.deciders())
         );
         putAutoscalingPolicy(updatedPolicy);
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final AutoscalingMetadata metadata = state.metadata().custom(AutoscalingMetadata.NAME);
         assertNotNull(metadata);
         assertThat(metadata.policies(), hasKey(policy.name()));
diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/existence/FrozenExistenceDeciderIT.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/existence/FrozenExistenceDeciderIT.java
index 154b5cb7f799..df1022e45c5a 100644
--- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/existence/FrozenExistenceDeciderIT.java
+++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/existence/FrozenExistenceDeciderIT.java
@@ -116,7 +116,7 @@ public void testZeroToOne() throws Exception {
         assertMinimumCapacity(capacity().results().get("frozen").requiredCapacity().node());
 
         assertThat(
-            clusterAdmin().prepareHealth().get().getStatus(),
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getStatus(),
             anyOf(equalTo(ClusterHealthStatus.YELLOW), equalTo(ClusterHealthStatus.GREEN))
         );
 
diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java
index 25bd08afcad7..076d5713d3ff 100644
--- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java
+++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java
@@ -378,7 +378,7 @@ public void testScaleWhileShrinking() throws Exception {
             equalTo(requiredSpaceForShrink + ReactiveStorageDeciderService.NODE_DISK_OVERHEAD)
         );
 
-        assertThat(clusterAdmin().prepareHealth(shrinkName).get().getUnassignedShards(), equalTo(1));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, shrinkName).get().getUnassignedShards(), equalTo(1));
 
         // test that the required amount is enough.
         // Adjust the amount since autoscaling calculates a node size to stay below low watermark though the shard can be
@@ -387,7 +387,7 @@ public void testScaleWhileShrinking() throws Exception {
         assert tooLittleSpaceForShrink <= requiredSpaceForShrink;
         setTotalSpace(dataNode1Name, tooLittleSpaceForShrink);
         ClusterRerouteUtils.reroute(client());
-        assertThat(clusterAdmin().prepareHealth(shrinkName).get().getUnassignedShards(), equalTo(1));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, shrinkName).get().getUnassignedShards(), equalTo(1));
         setTotalSpace(dataNode1Name, tooLittleSpaceForShrink + 1);
         ClusterRerouteUtils.reroute(client());
         ensureGreen();
@@ -488,7 +488,7 @@ public void testScaleDuringSplitOrClone() throws Exception {
             equalTo(requiredSpaceForClone + ReactiveStorageDeciderService.NODE_DISK_OVERHEAD)
         );
 
-        assertThat(clusterAdmin().prepareHealth(cloneName).get().getUnassignedShards(), equalTo(resizedShardCount));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, cloneName).get().getUnassignedShards(), equalTo(resizedShardCount));
 
         // test that the required amount is enough.
         // Adjust the amount since autoscaling calculates a node size to stay below low watermark though the shard can be
@@ -497,7 +497,7 @@ public void testScaleDuringSplitOrClone() throws Exception {
         assert tooLittleSpaceForClone <= requiredSpaceForClone;
         setTotalSpace(dataNode1Name, tooLittleSpaceForClone);
         ClusterRerouteUtils.reroute(client());
-        assertThat(clusterAdmin().prepareHealth(cloneName).get().getUnassignedShards(), equalTo(resizedShardCount));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, cloneName).get().getUnassignedShards(), equalTo(resizedShardCount));
         setTotalSpace(dataNode1Name, requiredSpaceForClone);
         ClusterRerouteUtils.reroute(client());
         ensureGreen();
diff --git a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderServiceTests.java b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderServiceTests.java
index 23bd7b303826..e20c3abe02a7 100644
--- a/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderServiceTests.java
+++ b/x-pack/plugin/autoscaling/src/test/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageDeciderServiceTests.java
@@ -762,7 +762,7 @@ public static ClusterState updateClusterState(ClusterState oldState, RoutingAllo
         }
         final RoutingTable oldRoutingTable = oldState.routingTable();
         final RoutingNodes newRoutingNodes = allocation.routingNodes();
-        final RoutingTable newRoutingTable = RoutingTable.of(oldRoutingTable.version(), newRoutingNodes);
+        final RoutingTable newRoutingTable = RoutingTable.of(newRoutingNodes);
         final Metadata newMetadata = allocation.updateMetadataWithRoutingChanges(newRoutingTable);
         assert newRoutingTable.validate(newMetadata); // validates the routing table is coherent with the cluster state metadata
 
diff --git a/x-pack/plugin/build.gradle b/x-pack/plugin/build.gradle
index ff45cc943063..4fdc4c3af419 100644
--- a/x-pack/plugin/build.gradle
+++ b/x-pack/plugin/build.gradle
@@ -22,8 +22,7 @@ dependencies {
 
 // let the yamlRestTests see the classpath of test
 GradleUtils.extendSourceSet(project, "test", "yamlRestTest", tasks.named("yamlRestTest"))
-int compatVersion = VersionProperties.getElasticsearchVersion().getMajor() - 1;
-GradleUtils.extendSourceSet(project, "test", "yamlRestTestV${compatVersion}Compat")
+GradleUtils.extendSourceSet(project, "test", "yamlRestCompatTest")
 
 restResources {
   restApi {
@@ -59,120 +58,6 @@ tasks.named("yamlRestTest").configure {
   systemProperty 'tests.rest.blacklist', restTestBlacklist.join(',')
 }
 
-tasks.named("yamlRestTestV7CompatTest").configure {
-  systemProperty 'tests.rest.blacklist', [
-    'unsigned_long/50_script_values/Scripted sort values',
-    'unsigned_long/50_script_values/script_score query',
-    'unsigned_long/50_script_values/Script query',
-    'aggregate-metrics/90_tsdb_mappings/aggregate_double_metric with time series mappings',
-    'aggregate-metrics/90_tsdb_mappings/aggregate_double_metric with wrong time series mappings',
-    'analytics/histogram/histogram with wrong time series mappings',
-    'analytics/histogram/histogram with time series mappings',
-    'analytics/boxplot/Basic Search',
-    'analytics/boxplot/Search With Runtime Field',
-    'analytics/boxplot/Search With Missing',
-    'analytics/moving_percentile/Basic Search TDigest',
-    'ml/evaluate_data_frame/Test outlier_detection auc_roc',
-    'ml/evaluate_data_frame/Test outlier_detection auc_roc given actual_field is int',
-    'ml/evaluate_data_frame/Test outlier_detection auc_roc include curve',
-    'ml/evaluate_data_frame/Test classification auc_roc',
-    'ml/evaluate_data_frame/Test classification auc_roc with default top_classes_field',
-  ].join(',')
-}
-
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.skipTest(
-    "vectors/10_dense_vector_basic/Deprecated function signature",
-    "to support it, it would require to almost revert back the #48725 and complicate the code"
-  )
-  task.skipTest(
-    "vectors/20_dense_vector_special_cases/Indexing of Dense vectors should error when dims don't match defined in the mapping",
-    "Error message has changed"
-  )
-  task.skipTest("vectors/30_sparse_vector_basic/Cosine Similarity", "not supported for compatibility")
-  task.skipTest("vectors/30_sparse_vector_basic/Deprecated function signature", "not supported for compatibility")
-  task.skipTest("vectors/30_sparse_vector_basic/Dot Product", "not supported for compatibility")
-  task.skipTest("vectors/35_sparse_vector_l1l2/L1 norm", "not supported for compatibility")
-  task.skipTest("vectors/35_sparse_vector_l1l2/L2 norm", "not supported for compatibility")
-  task.skipTest("vectors/40_sparse_vector_special_cases/Dimensions can be sorted differently", "not supported for compatibility")
-  task.skipTest("vectors/40_sparse_vector_special_cases/Documents missing a vector field", "not supported for compatibility")
-  task.skipTest(
-    "vectors/40_sparse_vector_special_cases/Query vector has different dimensions from documents' vectors",
-    "not supported for compatibility"
-  )
-  task.skipTest("vectors/40_sparse_vector_special_cases/Sparse vectors should error with dense vector functions", "not supported for compatibility")
-  task.skipTest("vectors/40_sparse_vector_special_cases/Vectors of different dimensions and data types", "not supported for compatibility")
-  task.skipTest("vectors/50_vector_stats/Usage stats on vector fields", "not supported for compatibility")
-  task.skipTest(
-    "roles/30_prohibited_role_query/Test use prohibited query inside role query",
-    "put role request with a term lookup (deprecated) and type. Requires validation in REST layer"
-  )
-  task.skipTest("ml/jobs_crud/Test update job", "Behaviour change #89824 - added limit filter to categorization analyzer")
-  task.skipTest("ml/jobs_crud/Test create job with delimited format", "removing undocumented functionality")
-  task.skipTest("ml/jobs_crud/Test cannot create job with model snapshot id set", "Exception type has changed.")
-  task.skipTest("ml/validate/Test job config is invalid because model snapshot id set", "Exception type has changed.")
-  task.skipTest("ml/datafeeds_crud/Test update datafeed to point to missing job", "behaviour change #44752 - not allowing to update datafeed job_id")
-  task.skipTest(
-    "ml/datafeeds_crud/Test update datafeed to point to different job",
-    "behaviour change #44752 - not allowing to update datafeed job_id"
-  )
-  task.skipTest(
-    "ml/datafeeds_crud/Test update datafeed to point to job already attached to another datafeed",
-    "behaviour change #44752 - not allowing to update datafeed job_id"
-  )
-  task.skipTest(
-    "ml/trained_model_cat_apis/Test cat trained models",
-    "A type field was added to cat.ml_trained_models #73660, this is a backwards compatible change. Still this is a cat api, and we don't support them with rest api compatibility. (the test would be very hard to transform too)"
-  )
-  task.skipTest(
-    "ml/categorization_agg/Test categorization agg simple",
-    "categorize_text was changed in 8.3, but experimental prior to the change"
-  )
-  task.skipTest(
-    "ml/categorization_agg/Test categorization aggregation against unsupported field",
-    "categorize_text was changed in 8.3, but experimental prior to the change"
-  )
-  task.skipTest(
-    "ml/categorization_agg/Test categorization aggregation with poor settings",
-    "categorize_text was changed in 8.3, but experimental prior to the change"
-  )
-  task.skipTest("indices.freeze/30_usage/Usage stats on frozen indices", "#70192 -- the freeze index API is removed from 8.0")
-  task.skipTest("indices.freeze/20_stats/Translog stats on frozen indices", "#70192 -- the freeze index API is removed from 8.0")
-  task.skipTest("indices.freeze/10_basic/Basic", "#70192 -- the freeze index API is removed from 8.0")
-  task.skipTest("indices.freeze/10_basic/Test index options", "#70192 -- the freeze index API is removed from 8.0")
-  task.skipTest("sql/sql/Paging through results", "scrolling through search hit queries no longer produces empty last page in 8.2")
-  task.skipTest("sql/translate/Translate SQL", "query folding changed in v 8.5, added track_total_hits: -1")
-  task.skipTest("service_accounts/10_basic/Test get service accounts", "new service accounts are added")
-  task.skipTest("spatial/70_script_doc_values/diagonal length", "precision changed in 8.4.0")
-  task.skipTest("spatial/70_script_doc_values/geoshape value", "error message changed in 8.9.0")
-  task.skipTest("security/authz/14_cat_indices/Test empty request while single authorized index", "not supported for compatibility")
-  task.skipTestsByFilePattern("**/rollup/**", "The rollup yaml tests in the 7.x branch don't know how to fake a cluster with rollup usage")
-
-  task.replaceValueInMatch("_type", "_doc")
-  task.addAllowedWarningRegex("\\[types removal\\].*")
-  task.addAllowedWarningRegexForTest("Including \\[accept_enterprise\\] in get license.*", "Installing enterprise license")
-  task.addAllowedWarningRegex("bucket_span .* is not an integral .* of the number of seconds in 1d.* This is now deprecated.*")
-
-  task.replaceValueTextByKeyValue(
-    "catch",
-    'bad_request',
-    '/It is no longer possible to freeze indices, but existing frozen indices can still be unfrozen/',
-    "Cannot freeze write index for data stream"
-  )
-
-  task.replaceValueInMatch(
-    "error.reason",
-    "action [cluster:admin/xpack/security/api_key/invalidate] is unauthorized for user [api_key_user_1] with effective roles [user_role], this action is granted by the cluster privileges [manage_api_key,manage_security,all]",
-    "Test invalidate api key by realm name"
-  )
-
-  task.replaceValueInMatch(
-    "error.reason",
-    "action [cluster:admin/xpack/security/api_key/invalidate] is unauthorized for user [api_key_user_1] with effective roles [user_role], this action is granted by the cluster privileges [manage_api_key,manage_security,all]",
-    "Test invalidate api key by username"
-  )
-}
-
 tasks.register('enforceApiSpecsConvention').configure {
   def mainApiSpecs = fileTree('src/test/resources/rest-api-spec/api')
   doLast {
diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java
index 2d77d2c77084..5d1fc1686b35 100644
--- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java
+++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java
@@ -465,7 +465,7 @@ public void testPauseAndResumeAutoFollowPattern() throws Exception {
             assertThat(
                 client.admin()
                     .cluster()
-                    .prepareState()
+                    .prepareState(TEST_REQUEST_TIMEOUT)
                     .clear()
                     .setIndices("copy-*")
                     .setMetadata(true)
@@ -564,7 +564,12 @@ public void testPauseAndResumeWithMultipleAutoFollowPatterns() throws Exception
 
         // check that all leader indices have been correctly auto followed
         List<String> matchingPrefixes = Arrays.stream(prefixes).map(prefix -> prefix + "*").collect(Collectors.toList());
-        for (IndexMetadata leaderIndexMetadata : leaderClient().admin().cluster().prepareState().get().getState().metadata()) {
+        for (IndexMetadata leaderIndexMetadata : leaderClient().admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()) {
             final String leaderIndex = leaderIndexMetadata.getIndex().getName();
             if (Regex.simpleMatch(matchingPrefixes, leaderIndex)) {
                 String followingIndex = "copy-" + leaderIndex;
@@ -690,7 +695,7 @@ public void testAutoFollowDatastreamWithClosingFollowerIndex() throws Exception
             assertThat(autoFollowStats.getNumberOfSuccessfulFollowIndices(), equalTo(3L));
         });
 
-        final Metadata metadata = followerClient().admin().cluster().prepareState().get().getState().metadata();
+        final Metadata metadata = followerClient().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata();
         final DataStream dataStream = metadata.dataStreams().get(datastream);
         assertTrue(dataStream.getIndices().stream().anyMatch(i -> i.getName().equals(indexInDatastream)));
         assertEquals(IndexMetadata.State.OPEN, metadata.index(indexInDatastream).getState());
diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrAliasesIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrAliasesIT.java
index e0aa7efa7512..45aac762c616 100644
--- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrAliasesIT.java
+++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrAliasesIT.java
@@ -396,7 +396,7 @@ private AliasMetadata getAliasMetadata(final GetAliasesResponse response, final
 
     private CheckedRunnable<Exception> assertShardFollowTask(final int numberOfPrimaryShards) {
         return () -> {
-            final ClusterState clusterState = followerClient().admin().cluster().prepareState().get().getState();
+            final ClusterState clusterState = followerClient().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             final PersistentTasksCustomMetadata taskMetadata = clusterState.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
             assertNotNull("task metadata for follower should exist", taskMetadata);
 
diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRepositoryIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRepositoryIT.java
index 423d555de9ea..7ce55313aa77 100644
--- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRepositoryIT.java
+++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRepositoryIT.java
@@ -173,14 +173,14 @@ public void testThatRepositoryRecoversEmptyIndexBasedOnLeaderSettings() throws I
 
         ClusterStateResponse leaderState = leaderClient().admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(leaderIndex)
             .get();
         ClusterStateResponse followerState = followerClient().admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(followerIndex)
@@ -402,7 +402,7 @@ public void testIndividualActionsTimeout() throws Exception {
                 transportService.clearAllRules();
             }
 
-            settingsRequest = new ClusterUpdateSettingsRequest();
+            settingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
             TimeValue defaultValue = CcrSettings.INDICES_RECOVERY_ACTION_TIMEOUT_SETTING.getDefault(Settings.EMPTY);
             settingsRequest.persistentSettings(
                 Settings.builder().put(CcrSettings.INDICES_RECOVERY_ACTION_TIMEOUT_SETTING.getKey(), defaultValue)
@@ -417,7 +417,7 @@ public void testIndividualActionsTimeout() throws Exception {
     }
 
     private ClusterUpdateSettingsRequest newSettingsRequest() {
-        return new ClusterUpdateSettingsRequest().masterNodeTimeout(TimeValue.MAX_VALUE);
+        return new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).masterNodeTimeout(TimeValue.MAX_VALUE);
     }
 
     public void testFollowerMappingIsUpdated() throws IOException {
@@ -482,7 +482,7 @@ public void testFollowerMappingIsUpdated() throws IOException {
             assertEquals(restoreInfo.totalShards(), restoreInfo.successfulShards());
             assertEquals(0, restoreInfo.failedShards());
 
-            ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+            ClusterStateRequest clusterStateRequest = new ClusterStateRequest(TEST_REQUEST_TIMEOUT);
             clusterStateRequest.clear();
             clusterStateRequest.metadata(true);
             clusterStateRequest.indices(followerIndex);
diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRetentionLeaseIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRetentionLeaseIT.java
index 716554eb3927..696c16df31a2 100644
--- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRetentionLeaseIT.java
+++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CcrRetentionLeaseIT.java
@@ -118,7 +118,8 @@ private RestoreSnapshotRequest setUpRestoreSnapshotRequest(
         final String followerIndex,
         final int numberOfDocuments
     ) throws IOException {
-        final ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest().masterNodeTimeout(TimeValue.MAX_VALUE);
+        final ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .masterNodeTimeout(TimeValue.MAX_VALUE);
         final String chunkSize = new ByteSizeValue(randomFrom(4, 128, 1024), ByteSizeUnit.KB).getStringRep();
         settingsRequest.persistentSettings(Settings.builder().put(CcrSettings.RECOVERY_CHUNK_SIZE.getKey(), chunkSize));
         assertAcked(followerClient().admin().cluster().updateSettings(settingsRequest).actionGet());
@@ -227,7 +228,12 @@ public void testRetentionLeaseIsRenewedDuringRecovery() throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
 
         // block the recovery from completing; this ensures the background sync is still running
-        final ClusterStateResponse followerClusterState = followerClient().admin().cluster().prepareState().clear().setNodes(true).get();
+        final ClusterStateResponse followerClusterState = followerClient().admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get();
         for (final DiscoveryNode senderNode : followerClusterState.getState().nodes()) {
             final MockTransportService senderTransportService = (MockTransportService) getFollowerCluster().getInstance(
                 TransportService.class,
@@ -303,7 +309,7 @@ public void testRetentionLeasesAreNotBeingRenewedAfterRecoveryCompletes() throws
 
         final ClusterStateResponse leaderIndexClusterState = leaderClient().admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(leaderIndex)
@@ -335,7 +341,7 @@ public void testRetentionLeasesAreNotBeingRenewedAfterRecoveryCompletes() throws
                     assertThat(Strings.toString(shardsStats.get(i)), currentRetentionLeases.values(), hasSize(1));
                     final ClusterStateResponse followerIndexClusterState = followerClient().admin()
                         .cluster()
-                        .prepareState()
+                        .prepareState(TEST_REQUEST_TIMEOUT)
                         .clear()
                         .setMetadata(true)
                         .setIndices(followerIndex)
@@ -378,7 +384,7 @@ public void testRetentionLeasesAreNotBeingRenewedAfterRecoveryCompletes() throws
                 assertThat(Strings.toString(shardsStats.get(i)), currentRetentionLeases.values(), hasSize(1));
                 final ClusterStateResponse followerIndexClusterState = followerClient().admin()
                     .cluster()
-                    .prepareState()
+                    .prepareState(TEST_REQUEST_TIMEOUT)
                     .clear()
                     .setMetadata(true)
                     .setIndices(followerIndex)
@@ -430,7 +436,12 @@ public void testUnfollowRemovesRetentionLeases() throws Exception {
             randomSubsetOf(randomIntBetween(0, numberOfShards), IntStream.range(0, numberOfShards).boxed().collect(Collectors.toSet()))
         );
 
-        final ClusterStateResponse followerClusterState = followerClient().admin().cluster().prepareState().clear().setNodes(true).get();
+        final ClusterStateResponse followerClusterState = followerClient().admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get();
         try {
             for (final DiscoveryNode senderNode : followerClusterState.getState().nodes()) {
                 final MockTransportService senderTransportService = (MockTransportService) getFollowerCluster().getInstance(
@@ -523,7 +534,12 @@ public void testUnfollowFailsToRemoveRetentionLeases() throws Exception {
             randomSubsetOf(randomIntBetween(1, numberOfShards), IntStream.range(0, numberOfShards).boxed().collect(Collectors.toSet()))
         );
 
-        final ClusterStateResponse followerClusterState = followerClient().admin().cluster().prepareState().clear().setNodes(true).get();
+        final ClusterStateResponse followerClusterState = followerClient().admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get();
         try {
             for (final DiscoveryNode senderNode : followerClusterState.getState().nodes()) {
                 final MockTransportService senderTransportService = (MockTransportService) getFollowerCluster().getInstance(
@@ -554,7 +570,7 @@ public void testUnfollowFailsToRemoveRetentionLeases() throws Exception {
 
             final ClusterStateResponse followerIndexClusterState = followerClient().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setMetadata(true)
                 .setIndices(followerIndex)
@@ -563,7 +579,7 @@ public void testUnfollowFailsToRemoveRetentionLeases() throws Exception {
 
             final ClusterStateResponse leaderIndexClusterState = leaderClient().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setMetadata(true)
                 .setIndices(leaderIndex)
@@ -712,7 +728,7 @@ public void testRetentionLeaseRenewalIsCancelledWhenFollowingIsPaused() throws E
 
         final ClusterStateResponse leaderIndexClusterState = leaderClient().admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(leaderIndex)
@@ -743,7 +759,7 @@ public void testRetentionLeaseRenewalIsCancelledWhenFollowingIsPaused() throws E
                     assertThat(Strings.toString(shardsStats.get(i)), currentRetentionLeases.values(), hasSize(1));
                     final ClusterStateResponse followerIndexClusterState = followerClient().admin()
                         .cluster()
-                        .prepareState()
+                        .prepareState(TEST_REQUEST_TIMEOUT)
                         .clear()
                         .setMetadata(true)
                         .setIndices(followerIndex)
@@ -786,7 +802,7 @@ public void testRetentionLeaseRenewalIsCancelledWhenFollowingIsPaused() throws E
                 assertThat(Strings.toString(shardsStats.get(i)), currentRetentionLeases.values(), hasSize(1));
                 final ClusterStateResponse followerIndexClusterState = followerClient().admin()
                     .cluster()
-                    .prepareState()
+                    .prepareState(TEST_REQUEST_TIMEOUT)
                     .clear()
                     .setMetadata(true)
                     .setIndices(followerIndex)
@@ -847,7 +863,12 @@ public void testRetentionLeaseIsAddedIfItDisappearsWhileFollowing() throws Excep
 
         final CountDownLatch latch = new CountDownLatch(1);
 
-        final ClusterStateResponse followerClusterState = followerClient().admin().cluster().prepareState().clear().setNodes(true).get();
+        final ClusterStateResponse followerClusterState = followerClient().admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get();
         try {
             for (final DiscoveryNode senderNode : followerClusterState.getState().nodes()) {
                 final MockTransportService senderTransportService = (MockTransportService) getFollowerCluster().getInstance(
@@ -956,7 +977,12 @@ public void testPeriodicRenewalDoesNotAddRetentionLeaseAfterUnfollow() throws Ex
         final CountDownLatch unfollowLatch = new CountDownLatch(1);
         final CountDownLatch responseLatch = new CountDownLatch(1);
 
-        final ClusterStateResponse followerClusterState = followerClient().admin().cluster().prepareState().clear().setNodes(true).get();
+        final ClusterStateResponse followerClusterState = followerClient().admin()
+            .cluster()
+            .prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get();
 
         try {
             for (final DiscoveryNode senderNode : followerClusterState.getState().nodes()) {
@@ -1054,7 +1080,7 @@ public void testForgetFollower() throws Exception {
 
         final ClusterStateResponse followerIndexClusterState = followerClient().admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(followerIndex)
@@ -1166,7 +1192,7 @@ private List<ShardStats> getShardsStats(final IndicesStatsResponse stats) {
     private String getRetentionLeaseId(final String followerIndex, final String leaderIndex) {
         final ClusterStateResponse followerIndexClusterState = followerClient().admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(followerIndex)
@@ -1175,7 +1201,7 @@ private String getRetentionLeaseId(final String followerIndex, final String lead
 
         final ClusterStateResponse leaderIndexClusterState = leaderClient().admin()
             .cluster()
-            .prepareState()
+            .prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(leaderIndex)
diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CloseFollowerIndexIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CloseFollowerIndexIT.java
index 9e84cdac3400..d7b4fbe46831 100644
--- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CloseFollowerIndexIT.java
+++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/CloseFollowerIndexIT.java
@@ -106,7 +106,7 @@ public void testCloseAndReopenFollowerIndex() throws Exception {
         AcknowledgedResponse response = followerClient().admin().indices().close(closeIndexRequest).get();
         assertThat(response.isAcknowledged(), is(true));
 
-        ClusterState clusterState = followerClient().admin().cluster().prepareState().get().getState();
+        ClusterState clusterState = followerClient().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().index("index2").getState(), is(IndexMetadata.State.CLOSE));
         assertThat(clusterState.getBlocks().hasIndexBlock("index2", MetadataIndexStateService.INDEX_CLOSED_BLOCK), is(true));
 
@@ -117,7 +117,7 @@ public void testCloseAndReopenFollowerIndex() throws Exception {
 
         assertAcked(followerClient().admin().indices().open(new OpenIndexRequest("index2").masterNodeTimeout(TimeValue.MAX_VALUE)).get());
 
-        clusterState = followerClient().admin().cluster().prepareState().get().getState();
+        clusterState = followerClient().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().index("index2").getState(), is(IndexMetadata.State.OPEN));
         assertThat(clusterState.getBlocks().hasIndexBlockWithId("index2", MetadataIndexStateService.INDEX_CLOSED_BLOCK_ID), is(false));
         ensureFollowerGreen("index2");
diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java
index 6361b6f89605..e8940b2f4175 100644
--- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java
+++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java
@@ -146,7 +146,7 @@ public void testFollowIndex() throws Exception {
 
         followerClient().admin()
             .cluster()
-            .prepareUpdateSettings()
+            .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setMasterNodeTimeout(TimeValue.MAX_VALUE)
             .setPersistentSettings(
                 Settings.builder()
@@ -187,7 +187,7 @@ public void testFollowIndex() throws Exception {
             assertTrue(response.isFollowIndexShardsAcked());
             assertTrue(response.isIndexFollowingStarted());
 
-            ClusterHealthRequest healthRequest = new ClusterHealthRequest("index2").waitForNoRelocatingShards(true);
+            ClusterHealthRequest healthRequest = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, "index2").waitForNoRelocatingShards(true);
             ClusterIndexHealth indexHealth = followerClient().admin().cluster().health(healthRequest).get().getIndices().get("index2");
             for (ClusterShardHealth shardHealth : indexHealth.getShards().values()) {
                 if (waitOnAll) {
@@ -999,7 +999,10 @@ public void testUnknownClusterAlias() throws Exception {
 
     public void testLeaderIndexRed() throws Exception {
         try {
-            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             updateSettingsRequest.persistentSettings(Settings.builder().put("cluster.routing.allocation.enable", "none"));
             assertAcked(leaderClient().admin().cluster().updateSettings(updateSettingsRequest).actionGet());
             assertAcked(
@@ -1025,7 +1028,10 @@ public void testLeaderIndexRed() throws Exception {
             assertThat(ESIntegTestCase.indexExists("index2", followerClient()), is(false));
         } finally {
             // Always unset allocation enable setting to avoid other assertions from failing too when this test fails:
-            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             updateSettingsRequest.persistentSettings(Settings.builder().put("cluster.routing.allocation.enable", (String) null));
             assertAcked(leaderClient().admin().cluster().updateSettings(updateSettingsRequest).actionGet());
         }
@@ -1339,7 +1345,7 @@ public void testIndexFallBehind() throws Exception {
             // we have to remove the retention leases on the leader shards to ensure the follower falls behind
             final ClusterStateResponse followerIndexClusterState = followerClient().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setMetadata(true)
                 .setIndices("index2")
@@ -1347,7 +1353,7 @@ public void testIndexFallBehind() throws Exception {
             final String followerUUID = followerIndexClusterState.getState().metadata().index("index2").getIndexUUID();
             final ClusterStateResponse leaderIndexClusterState = leaderClient().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setMetadata(true)
                 .setIndices("index1")
@@ -1356,7 +1362,7 @@ public void testIndexFallBehind() throws Exception {
 
             final RoutingTable leaderRoutingTable = leaderClient().admin()
                 .cluster()
-                .prepareState()
+                .prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setIndices("index1")
                 .setRoutingTable(true)
@@ -1514,7 +1520,8 @@ public void testUpdateRemoteConfigsDuringFollowing() throws Exception {
         logger.info("Indexing [{}] docs while updating remote config", firstBatchNumDocs);
         try (BackgroundIndexer indexer = new BackgroundIndexer("index1", leaderClient(), firstBatchNumDocs, randomIntBetween(1, 5))) {
 
-            ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest().masterNodeTimeout(TimeValue.MAX_VALUE);
+            ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .masterNodeTimeout(TimeValue.MAX_VALUE);
             String address = getLeaderCluster().getDataNodeInstance(TransportService.class).boundAddress().publishAddress().toString();
             Setting<Compression.Enabled> compress = RemoteClusterService.REMOTE_CLUSTER_COMPRESS.getConcreteSettingForNamespace(
                 "leader_cluster"
@@ -1551,7 +1558,8 @@ public void testUpdateRemoteConfigsDuringFollowing() throws Exception {
 
             assertMaxSeqNoOfUpdatesIsTransferred(resolveLeaderIndex("index1"), resolveFollowerIndex("index2"), numberOfPrimaryShards);
         } finally {
-            ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest().masterNodeTimeout(TimeValue.MAX_VALUE);
+            ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .masterNodeTimeout(TimeValue.MAX_VALUE);
             String address = getLeaderCluster().getDataNodeInstance(TransportService.class).boundAddress().publishAddress().toString();
             Setting<Compression.Enabled> compress = RemoteClusterService.REMOTE_CLUSTER_COMPRESS.getConcreteSettingForNamespace(
                 "leader_cluster"
@@ -1650,7 +1658,7 @@ private BooleanSupplier hasFollowIndexBeenClosed(String indexName) {
 
     private CheckedRunnable<Exception> assertTask(final int numberOfPrimaryShards, final Map<ShardId, Long> numDocsPerShard) {
         return () -> {
-            final ClusterState clusterState = followerClient().admin().cluster().prepareState().get().getState();
+            final ClusterState clusterState = followerClient().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             final PersistentTasksCustomMetadata taskMetadata = clusterState.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
             assertNotNull(taskMetadata);
 
diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/PrimaryFollowerAllocationIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/PrimaryFollowerAllocationIT.java
index 16a2de7bf5b0..27e6a2ade60c 100644
--- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/PrimaryFollowerAllocationIT.java
+++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/PrimaryFollowerAllocationIT.java
@@ -121,7 +121,7 @@ public void testAllocateFollowerPrimaryToNodesWithRemoteClusterClientRole() thro
         }
         // Empty follower primaries must be assigned to nodes with the remote cluster client role
         assertBusy(() -> {
-            final ClusterState state = getFollowerCluster().client().admin().cluster().prepareState().get().getState();
+            final ClusterState state = getFollowerCluster().client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             final IndexRoutingTable indexRoutingTable = state.routingTable().index(followerIndex);
             for (int i = 0; i < indexRoutingTable.size(); i++) {
                 IndexShardRoutingTable shardRoutingTable = indexRoutingTable.shard(i);
@@ -143,7 +143,7 @@ public void testAllocateFollowerPrimaryToNodesWithRemoteClusterClientRole() thro
             )
             .get();
         assertBusy(() -> {
-            final ClusterState state = getFollowerCluster().client().admin().cluster().prepareState().get().getState();
+            final ClusterState state = getFollowerCluster().client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             final IndexRoutingTable indexRoutingTable = state.routingTable().index(followerIndex);
             for (int shardId = 0; shardId < indexRoutingTable.size(); shardId++) {
                 IndexShardRoutingTable shardRoutingTable = indexRoutingTable.shard(shardId);
@@ -160,7 +160,7 @@ public void testAllocateFollowerPrimaryToNodesWithRemoteClusterClientRole() thro
         getFollowerCluster().fullRestart();
         ensureFollowerGreen(followerIndex);
         assertBusy(() -> {
-            final ClusterState state = getFollowerCluster().client().admin().cluster().prepareState().get().getState();
+            final ClusterState state = getFollowerCluster().client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             final IndexRoutingTable indexRoutingTable = state.routingTable().index(followerIndex);
             for (int shardId = 0; shardId < indexRoutingTable.size(); shardId++) {
                 IndexShardRoutingTable shardRoutingTable = indexRoutingTable.shard(shardId);
diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/RestartIndexFollowingIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/RestartIndexFollowingIT.java
index 18456b24d461..3a169037c422 100644
--- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/RestartIndexFollowingIT.java
+++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/RestartIndexFollowingIT.java
@@ -135,7 +135,8 @@ public void testFollowIndex() throws Exception {
     private void setupRemoteCluster() throws Exception {
         var remoteMaxPendingConnectionListeners = getRemoteMaxPendingConnectionListeners();
 
-        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest().masterNodeTimeout(TimeValue.MAX_VALUE);
+        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .masterNodeTimeout(TimeValue.MAX_VALUE);
         String address = getLeaderCluster().getAnyMasterNodeInstance(TransportService.class).boundAddress().publishAddress().toString();
         updateSettingsRequest.persistentSettings(Settings.builder().put("cluster.remote.leader_cluster.seeds", address));
         assertAcked(followerClient().admin().cluster().updateSettings(updateSettingsRequest).actionGet());
@@ -161,7 +162,8 @@ private Integer getRemoteMaxPendingConnectionListeners() {
     }
 
     private void cleanRemoteCluster() throws Exception {
-        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest().masterNodeTimeout(TimeValue.MAX_VALUE);
+        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .masterNodeTimeout(TimeValue.MAX_VALUE);
         updateSettingsRequest.persistentSettings(Settings.builder().put("cluster.remote.leader_cluster.seeds", (String) null));
         assertAcked(followerClient().admin().cluster().updateSettings(updateSettingsRequest).actionGet());
 
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java
index 82af24d2293c..c16c01431bd2 100644
--- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java
+++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinator.java
@@ -300,7 +300,7 @@ void getRemoteClusterState(
                     CcrLicenseChecker.checkRemoteClusterLicenseAndFetchClusterState(
                         client,
                         remoteCluster,
-                        new ClusterStateRequest().clear()
+                        new ClusterStateRequest(waitForMetadataTimeOut).clear()
                             .metadata(true)
                             .routingTable(true)
                             .local(true)
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CcrRequests.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CcrRequests.java
index 77eea2a452bb..a81542f3371e 100644
--- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CcrRequests.java
+++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/CcrRequests.java
@@ -34,7 +34,7 @@ public final class CcrRequests {
     private CcrRequests() {}
 
     public static ClusterStateRequest metadataRequest(String leaderIndex) {
-        ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
+        ClusterStateRequest clusterStateRequest = new ClusterStateRequest(TimeValue.MAX_VALUE);
         clusterStateRequest.clear();
         clusterStateRequest.metadata(true);
         clusterStateRequest.indices(leaderIndex);
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java
index b990b738e4bc..49cff2bdde7e 100644
--- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java
+++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutAutoFollowPatternAction.java
@@ -133,7 +133,7 @@ public ClusterState execute(ClusterState currentState) {
         CcrLicenseChecker.checkRemoteClusterLicenseAndFetchClusterState(
             client,
             request.getRemoteCluster(),
-            new ClusterStateRequest().clear().metadata(true),
+            new ClusterStateRequest(request.masterNodeTimeout()).clear().metadata(true),
             listener::onFailure,
             consumer
         );
diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java
index 97e3a409d590..a19fde8196ea 100644
--- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java
+++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/repository/CcrRepository.java
@@ -166,7 +166,7 @@ public CcrRepository(RepositoryMetadata metadata, Client client, Settings settin
             threadPool.getThreadContext(),
             l -> getRemoteClusterClient().execute(
                 ClusterStateAction.REMOTE_TYPE,
-                new ClusterStateRequest().clear().metadata(true).nodes(true).masterNodeTimeout(TimeValue.MAX_VALUE),
+                new ClusterStateRequest(TimeValue.MAX_VALUE).clear().metadata(true).nodes(true),
                 l.map(ClusterStateResponse::getState)
             )
         );
diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java
index 677a82ddafa3..1b7875e4a36b 100644
--- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java
+++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java
@@ -409,7 +409,7 @@ private ClusterHealthStatus ensureColor(
         String color = clusterHealthStatus.name().toLowerCase(Locale.ROOT);
         String method = "ensure" + Strings.capitalize(color);
 
-        ClusterHealthRequest healthRequest = new ClusterHealthRequest(indices).masterNodeTimeout(timeout)
+        ClusterHealthRequest healthRequest = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, indices).masterNodeTimeout(timeout)
             .timeout(timeout)
             .waitForStatus(clusterHealthStatus)
             .waitForEvents(Priority.LANGUID)
@@ -431,9 +431,9 @@ private ClusterHealthStatus ensureColor(
                     follower cluster tasks:
                     {}""",
                 method,
-                leaderClient().admin().cluster().prepareState().get().getState(),
+                leaderClient().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState(),
                 ESIntegTestCase.getClusterPendingTasks(leaderClient()),
-                followerClient().admin().cluster().prepareState().get().getState(),
+                followerClient().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState(),
                 ESIntegTestCase.getClusterPendingTasks(followerClient())
             );
             HotThreads.logLocalHotThreads(logger, Level.INFO, "hot threads at timeout", ReferenceDocs.LOGGING);
@@ -502,7 +502,7 @@ protected void ensureNoCcrTasks() throws Exception {
                 empty()
             );
 
-            final ClusterState clusterState = followerClient().admin().cluster().prepareState().get().getState();
+            final ClusterState clusterState = followerClient().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             PersistentTasksCustomMetadata tasks = clusterState.metadata().custom(PersistentTasksCustomMetadata.TYPE);
             Collection<PersistentTasksCustomMetadata.PersistentTask<?>> ccrTasks = tasks.tasks()
                 .stream()
@@ -661,7 +661,7 @@ protected void assertIndexFullyReplicatedToFollower(String leaderIndex, String f
     }
 
     private Map<Integer, List<DocIdSeqNoAndSource>> getDocIdAndSeqNos(InternalTestCluster cluster, String index) throws IOException {
-        final ClusterState state = cluster.client().admin().cluster().prepareState().get().getState();
+        final ClusterState state = cluster.client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<ShardRouting> shardRoutings = state.routingTable().allShards(index);
         Randomness.shuffle(shardRoutings);
         final Map<Integer, List<DocIdSeqNoAndSource>> docs = new HashMap<>();
diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java
index 6b69c172c0df..fbb7418bc6e9 100644
--- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java
+++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrSingleNodeTestCase.java
@@ -61,7 +61,7 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
 
     @Before
     public void setupLocalRemote() throws Exception {
-        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         String address = getInstanceFromNode(TransportService.class).boundAddress().publishAddress().toString();
         updateSettingsRequest.transientSettings(Settings.builder().put("cluster.remote.local.seeds", address));
         assertAcked(client().admin().cluster().updateSettings(updateSettingsRequest).actionGet());
@@ -84,7 +84,7 @@ public void purgeCCRMetadata() throws Exception {
 
     @After
     public void removeLocalRemote() throws Exception {
-        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+        ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         updateSettingsRequest.transientSettings(Settings.builder().put("cluster.remote.local.seeds", (String) null));
         assertAcked(client().admin().cluster().updateSettings(updateSettingsRequest).actionGet());
 
diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinatorTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinatorTests.java
index 467ef3c68f64..008792966a4b 100644
--- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinatorTests.java
+++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/AutoFollowCoordinatorTests.java
@@ -32,6 +32,7 @@
 import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexMode;
 import org.elasticsearch.index.IndexSettings;
@@ -1812,6 +1813,8 @@ void updateAutoFollowMetadata(Function<ClusterState, ClusterState> updateFunctio
         assertThat(counter.get(), equalTo(states.length));
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "ability to disable soft deletes was removed in 8.0 indexes so we can probably remove this test")
     public void testAutoFollowerSoftDeletesDisabled() {
         Client client = mock(Client.class);
         when(client.getRemoteClusterClient(anyString(), any(), any())).thenReturn(new RedirectToLocalClusterRemoteClusterClient(client));
diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java
index 99344f22bae3..f577ccd4e5a4 100644
--- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java
+++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java
@@ -215,9 +215,9 @@ public void testGetSessionDoesNotLeakFileIfClosed() throws IOException {
             sessionReader.readFileBytes(files.get(1).name(), MockBigArrays.NON_RECYCLING_INSTANCE.newByteArray(10, false));
         }
 
-        assertTrue(EngineTestCase.hasAcquiredIndexCommits(IndexShardTestCase.getEngine(indexShard)));
+        assertTrue(EngineTestCase.hasAcquiredIndexCommitsForTesting(IndexShardTestCase.getEngine(indexShard)));
         restoreSourceService.closeSession(sessionUUID);
-        assertFalse(EngineTestCase.hasAcquiredIndexCommits(IndexShardTestCase.getEngine(indexShard)));
+        assertFalse(EngineTestCase.hasAcquiredIndexCommitsForTesting(IndexShardTestCase.getEngine(indexShard)));
 
         closeShards(indexShard);
         // Exception will be thrown if file is not closed.
diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/nodesinfo/ComponentVersionsNodesInfoIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/nodesinfo/ComponentVersionsNodesInfoIT.java
index 1202f828059f..3193e3647f4a 100644
--- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/nodesinfo/ComponentVersionsNodesInfoIT.java
+++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/nodesinfo/ComponentVersionsNodesInfoIT.java
@@ -19,7 +19,10 @@ public class ComponentVersionsNodesInfoIT extends ESIntegTestCase {
     public void testNodesInfoComponentVersions() {
         final String node_1 = internalCluster().startNode();
 
-        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth().setWaitForGreenStatus().setWaitForNodes("1").get();
+        ClusterHealthResponse clusterHealth = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+            .setWaitForGreenStatus()
+            .setWaitForNodes("1")
+            .get();
         logger.info("--> done cluster_health, status {}", clusterHealth.getStatus());
 
         String server1NodeId = getNodeId(node_1);
diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java
index 5c02288e704f..0fea3c0d3b74 100644
--- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java
+++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java
@@ -349,11 +349,23 @@ private IndexRequestBuilder[] snapshotAndRestore(final String sourceIdx, final b
         logger.info("--> delete index and stop the data node");
         assertAcked(client().admin().indices().prepareDelete(sourceIdx).get());
         internalCluster().stopRandomDataNode();
-        assertFalse(clusterAdmin().prepareHealth().setTimeout(TimeValue.timeValueSeconds(30)).setWaitForNodes("1").get().isTimedOut());
+        assertFalse(
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+                .setTimeout(TimeValue.timeValueSeconds(30))
+                .setWaitForNodes("1")
+                .get()
+                .isTimedOut()
+        );
 
         final String newDataNode = internalCluster().startDataOnlyNode();
         logger.info("--> start a new data node " + newDataNode);
-        assertFalse(clusterAdmin().prepareHealth().setTimeout(TimeValue.timeValueSeconds(30)).setWaitForNodes("2").get().isTimedOut());
+        assertFalse(
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT)
+                .setTimeout(TimeValue.timeValueSeconds(30))
+                .setWaitForNodes("2")
+                .get()
+                .isTimedOut()
+        );
 
         logger.info("--> restore the index and ensure all shards are allocated");
         RestoreSnapshotResponse restoreResponse = clusterAdmin().prepareRestoreSnapshot(TEST_REQUEST_TIMEOUT, repo, snapshot)
diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java
index add11d373b40..ab3234f6d3d7 100644
--- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java
+++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java
@@ -76,7 +76,10 @@ public void testDefaultIndexAllocateToContent() {
         assertThat(DataTier.TIER_PREFERENCE_SETTING.get(idxSettings), equalTo(DataTier.DATA_CONTENT));
 
         // index should be red
-        assertThat(clusterAdmin().prepareHealth(index).get().getIndices().get(index).getStatus(), equalTo(ClusterHealthStatus.RED));
+        assertThat(
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, index).get().getIndices().get(index).getStatus(),
+            equalTo(ClusterHealthStatus.RED)
+        );
 
         if (randomBoolean()) {
             logger.info("--> starting content node");
@@ -518,7 +521,14 @@ private void updateDesiredNodes(DesiredNode... desiredNodes) {
     private void updateDesiredNodes(List<DesiredNode> desiredNodes) {
         assertThat(desiredNodes.size(), is(greaterThan(0)));
 
-        final var request = new UpdateDesiredNodesRequest(randomAlphaOfLength(10), 1, desiredNodes, false);
+        final var request = new UpdateDesiredNodesRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT,
+            randomAlphaOfLength(10),
+            1,
+            desiredNodes,
+            false
+        );
         internalCluster().client().execute(UpdateDesiredNodesAction.INSTANCE, request).actionGet();
     }
 
@@ -533,7 +543,7 @@ private void assertPrimaryShardIsAllocatedInNode(int shard, DesiredNode expected
     }
 
     private DiscoveryNode getPrimaryShardAssignedNode(int shard) {
-        final var state = clusterAdmin().prepareState().get().getState();
+        final var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final var routingTable = state.routingTable().index(index).shard(shard);
         final var primaryShard = routingTable.primaryShard();
         final var discoveryNode = state.nodes().get(primaryShard.currentNodeId());
diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierShardAvailabilityHealthIndicatorIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierShardAvailabilityHealthIndicatorIT.java
index 368946d79682..9937efcc406f 100644
--- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierShardAvailabilityHealthIndicatorIT.java
+++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierShardAvailabilityHealthIndicatorIT.java
@@ -183,7 +183,7 @@ private String findNodeWithReplicaShard(String indexName, int shard) {
     }
 
     private String findNodeWithShard(final String indexName, final int shard, final boolean primary) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<ShardRouting> startedShards = RoutingNodesHelper.shardsWithState(state.getRoutingNodes(), ShardRoutingState.STARTED);
         startedShards = startedShards.stream()
             .filter(shardRouting -> shardRouting.getIndexName().equals(indexName))
diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportActionIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportActionIT.java
index 996bc0eff5c1..a08eb935178c 100644
--- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportActionIT.java
+++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportActionIT.java
@@ -14,12 +14,14 @@
 import org.elasticsearch.cluster.ClusterStateUpdateTask;
 import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.cluster.metadata.DataStreamAlias;
+import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
 import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexMode;
@@ -34,11 +36,13 @@
 import org.elasticsearch.xpack.core.XPackClientPlugin;
 import org.junit.After;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
@@ -64,24 +68,58 @@ private void cleanup() throws Exception {
             return clusterStateBuilder.build();
         });
         updateClusterSettings(
-            Settings.builder().put(DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getKey(), (String) null)
+            Settings.builder()
+                .putNull(DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getKey())
+                .putNull(DataStreamGlobalRetentionSettings.DATA_STREAMS_DEFAULT_RETENTION_SETTING.getKey())
         );
     }
 
     @SuppressWarnings("unchecked")
     public void testAction() throws Exception {
-        assertUsageResults(0, 0, 0, 0.0, true);
-        AtomicLong totalCount = new AtomicLong(0);
-        AtomicLong countLifecycleWithRetention = new AtomicLong(0);
+        // test empty results
+        {
+            Map<String, Object> map = getLifecycleUsage();
+            assertThat(map.get("available"), equalTo(true));
+            assertThat(map.get("enabled"), equalTo(true));
+            assertThat(map.get("count"), equalTo(0));
+            assertThat(map.get("default_rollover_used"), equalTo(true));
+
+            Map<String, Object> dataRetentionMap = (Map<String, Object>) map.get("data_retention");
+            assertThat(dataRetentionMap.size(), equalTo(1));
+            assertThat(dataRetentionMap.get("configured_data_streams"), equalTo(0));
+
+            Map<String, Object> effectiveRetentionMap = (Map<String, Object>) map.get("effective_retention");
+            assertThat(effectiveRetentionMap.size(), equalTo(1));
+            assertThat(effectiveRetentionMap.get("retained_data_streams"), equalTo(0));
+
+            Map<String, Object> globalRetentionMap = (Map<String, Object>) map.get("global_retention");
+            assertThat(globalRetentionMap.get("max"), equalTo(Map.of("defined", false)));
+            assertThat(globalRetentionMap.get("default"), equalTo(Map.of("defined", false)));
+        }
+
+        // Keep track of the data streams created
+        AtomicInteger dataStreamsWithLifecycleCount = new AtomicInteger(0);
+        AtomicInteger dataStreamsWithRetentionCount = new AtomicInteger(0);
+        AtomicInteger dataStreamsWithDefaultRetentionCount = new AtomicInteger(0);
+
         AtomicLong totalRetentionTimes = new AtomicLong(0);
         AtomicLong minRetention = new AtomicLong(Long.MAX_VALUE);
         AtomicLong maxRetention = new AtomicLong(Long.MIN_VALUE);
+
         boolean useDefaultRolloverConfig = randomBoolean();
         if (useDefaultRolloverConfig == false) {
             updateClusterSettings(
                 Settings.builder().put(DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getKey(), "min_docs=33")
             );
         }
+        TimeValue defaultRetention = TimeValue.timeValueDays(10);
+        boolean useDefaultRetention = randomBoolean();
+        if (useDefaultRetention) {
+            updateClusterSettings(
+                Settings.builder()
+                    .put(DataStreamGlobalRetentionSettings.DATA_STREAMS_DEFAULT_RETENTION_SETTING.getKey(), defaultRetention.getStringRep())
+            );
+        }
         /*
          * We now add a number of simulated data streams to the cluster state. Some have lifecycles, some don't. The ones with lifecycles
          * have varying retention periods. After adding them, we make sure the numbers add up.
@@ -89,19 +127,25 @@ public void testAction() throws Exception {
         updateClusterState(clusterState -> {
             Metadata.Builder metadataBuilder = Metadata.builder(clusterState.metadata());
             Map<String, DataStream> dataStreamMap = new HashMap<>();
-            for (int dataStreamCount = 0; dataStreamCount < randomInt(200); dataStreamCount++) {
-                boolean hasLifecycle = randomBoolean();
+            boolean atLeastOne = false;
+            for (int dataStreamCount = 0; dataStreamCount < randomIntBetween(1, 200); dataStreamCount++) {
+                boolean hasLifecycle = randomBoolean() || atLeastOne == false;
                 DataStreamLifecycle lifecycle;
+                boolean systemDataStream = rarely();
                 if (hasLifecycle) {
                     if (randomBoolean()) {
                         lifecycle = new DataStreamLifecycle(null, null, null);
-                        totalCount.incrementAndGet();
+                        dataStreamsWithLifecycleCount.incrementAndGet();
+                        if (useDefaultRetention && systemDataStream == false) {
+                            dataStreamsWithDefaultRetentionCount.incrementAndGet();
+                        }
+                        atLeastOne = true;
                     } else {
                         long retentionMillis = randomLongBetween(1000, 100000);
-                        boolean isEnabled = randomBoolean();
+                        boolean isEnabled = randomBoolean() || atLeastOne == false;
                         if (isEnabled) {
-                            totalCount.incrementAndGet();
-                            countLifecycleWithRetention.incrementAndGet();
+                            dataStreamsWithLifecycleCount.incrementAndGet();
+                            dataStreamsWithRetentionCount.incrementAndGet();
                             totalRetentionTimes.addAndGet(retentionMillis);
 
                             if (retentionMillis < minRetention.get()) {
@@ -110,6 +154,7 @@ public void testAction() throws Exception {
                             if (retentionMillis > maxRetention.get()) {
                                 maxRetention.set(retentionMillis);
                             }
+                            atLeastOne = true;
                         }
                         lifecycle = DataStreamLifecycle.newBuilder().dataRetention(retentionMillis).enabled(isEnabled).build();
                     }
@@ -121,7 +166,6 @@ public void testAction() throws Exception {
                     Index index = new Index(randomAlphaOfLength(60), randomAlphaOfLength(60));
                     indices.add(index);
                 }
-                boolean systemDataStream = randomBoolean();
                 boolean replicated = randomBoolean();
                 DataStream dataStream = new DataStream(
                     randomAlphaOfLength(50),
@@ -147,28 +191,59 @@ public void testAction() throws Exception {
             clusterStateBuilder.metadata(metadataBuilder);
             return clusterStateBuilder.build();
         });
-        int expectedMinimumRetention = minRetention.get() == Long.MAX_VALUE ? 0 : minRetention.intValue();
-        int expectedMaximumRetention = maxRetention.get() == Long.MIN_VALUE ? 0 : maxRetention.intValue();
-        double expectedAverageRetention = countLifecycleWithRetention.get() == 0
+
+        int retainedDataStreams = dataStreamsWithRetentionCount.get() + dataStreamsWithDefaultRetentionCount.get();
+
+        int expectedMinimumDataRetention = minRetention.get() == Long.MAX_VALUE ? 0 : minRetention.intValue();
+        int expectedMinimumEffectiveRetention = dataStreamsWithDefaultRetentionCount.get() > 0
+            ? (int) Math.min(minRetention.get(), defaultRetention.getMillis())
+            : expectedMinimumDataRetention;
+
+        int expectedMaximumDataRetention = maxRetention.get() == Long.MIN_VALUE ? 0 : maxRetention.intValue();
+        int expectedMaximumEffectiveRetention = dataStreamsWithDefaultRetentionCount.get() > 0
+            ? (int) Math.max(maxRetention.get(), defaultRetention.getMillis())
+            : expectedMaximumDataRetention;
+
+        double expectedAverageDataRetention = dataStreamsWithRetentionCount.get() == 0
             ? 0.0
-            : totalRetentionTimes.doubleValue() / countLifecycleWithRetention.get();
-        assertUsageResults(
-            totalCount.intValue(),
-            expectedMinimumRetention,
-            expectedMaximumRetention,
-            expectedAverageRetention,
-            useDefaultRolloverConfig
-        );
+            : totalRetentionTimes.doubleValue() / dataStreamsWithRetentionCount.get();
+        double expectedAverageEffectiveRetention = dataStreamsWithDefaultRetentionCount.get() > 0
+            ? (totalRetentionTimes.doubleValue() + dataStreamsWithDefaultRetentionCount.get() * defaultRetention.getMillis())
+                / retainedDataStreams
+            : expectedAverageDataRetention;
+
+        Map<String, Object> map = getLifecycleUsage();
+        assertThat(map.get("available"), equalTo(true));
+        assertThat(map.get("enabled"), equalTo(true));
+        assertThat(map.get("count"), equalTo(dataStreamsWithLifecycleCount.intValue()));
+        assertThat(map.get("default_rollover_used"), equalTo(useDefaultRolloverConfig));
+
+        Map<String, Object> dataRetentionMap = (Map<String, Object>) map.get("data_retention");
+        assertThat(dataRetentionMap.get("configured_data_streams"), equalTo(dataStreamsWithRetentionCount.get()));
+        if (dataStreamsWithRetentionCount.get() > 0) {
+            assertThat(dataRetentionMap.get("minimum_millis"), equalTo(expectedMinimumDataRetention));
+            assertThat(dataRetentionMap.get("maximum_millis"), equalTo(expectedMaximumDataRetention));
+            assertThat(dataRetentionMap.get("average_millis"), equalTo(expectedAverageDataRetention));
+        }
+
+        Map<String, Object> effectieRetentionMap = (Map<String, Object>) map.get("effective_retention");
+        assertThat(effectieRetentionMap.get("retained_data_streams"), equalTo(retainedDataStreams));
+        if (retainedDataStreams > 0) {
+            assertThat(effectieRetentionMap.get("minimum_millis"), equalTo(expectedMinimumEffectiveRetention));
+            assertThat(effectieRetentionMap.get("maximum_millis"), equalTo(expectedMaximumEffectiveRetention));
+            assertThat(effectieRetentionMap.get("average_millis"), equalTo(expectedAverageEffectiveRetention));
+        }
+
+        Map<String, Map<String, Object>> globalRetentionMap = (Map<String, Map<String, Object>>) map.get("global_retention");
+        assertThat(globalRetentionMap.get("max").get("defined"), equalTo(false));
+        assertThat(globalRetentionMap.get("default").get("defined"), equalTo(useDefaultRetention));
+        if (useDefaultRetention) {
+            assertThat(globalRetentionMap.get("default").get("affected_data_streams"), equalTo(dataStreamsWithDefaultRetentionCount.get()));
+            assertThat(globalRetentionMap.get("default").get("retention_millis"), equalTo((int) defaultRetention.getMillis()));
+        }
     }
 
-    @SuppressWarnings("unchecked")
-    private void assertUsageResults(
-        int count,
-        int minimumRetention,
-        int maximumRetention,
-        double averageRetention,
-        boolean defaultRolloverUsed
-    ) throws Exception {
+    private Map<String, Object> getLifecycleUsage() throws IOException {
         XPackUsageFeatureResponse response = safeGet(client().execute(DATA_STREAM_LIFECYCLE, new XPackUsageRequest(SAFE_AWAIT_TIMEOUT)));
         XContentBuilder builder = XContentFactory.jsonBuilder();
         builder = response.getUsage().toXContent(builder, ToXContent.EMPTY_PARAMS);
@@ -177,17 +252,7 @@ private void assertUsageResults(
             true,
             XContentType.JSON
         );
-
-        Map<String, Object> map = tuple.v2();
-        assertThat(map.get("available"), equalTo(true));
-        assertThat(map.get("enabled"), equalTo(true));
-        assertThat(map.get("count"), equalTo(count));
-        assertThat(map.get("default_rollover_used"), equalTo(defaultRolloverUsed));
-        Map<String, Object> retentionMap = (Map<String, Object>) map.get("retention");
-        assertThat(retentionMap.size(), equalTo(3));
-        assertThat(retentionMap.get("minimum_millis"), equalTo(minimumRetention));
-        assertThat(retentionMap.get("maximum_millis"), equalTo(maximumRetention));
-        assertThat(retentionMap.get("average_millis"), equalTo(averageRetention));
+        return tuple.v2();
     }
 
     /*
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java
index f5123b9352fe..a38170d87f9a 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/ClusterStateLicenseService.java
@@ -140,7 +140,7 @@ CharSequence buildExpirationMessage(long expirationMillis, boolean expired) {
             License [{}] on [{}].
             # If you have a new license, please update it. Otherwise, please reach out to
             # your support contact.
-            #\s""", expiredMsg, LicenseUtils.DATE_FORMATTER.formatMillis(expirationMillis));
+            #\s""", expiredMsg, LicenseUtils.formatMillis(expirationMillis));
         if (expired) {
             general = general.toUpperCase(Locale.ROOT);
         }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseUtils.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseUtils.java
index b27c1bb9d449..7e67ee892043 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseUtils.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseUtils.java
@@ -8,7 +8,6 @@
 
 import org.elasticsearch.ElasticsearchSecurityException;
 import org.elasticsearch.common.hash.MessageDigests;
-import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.license.License.LicenseType;
 import org.elasticsearch.license.internal.XPackLicenseStatus;
 import org.elasticsearch.protocol.xpack.license.LicenseStatus;
@@ -16,6 +15,9 @@
 
 import java.nio.charset.StandardCharsets;
 import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -25,7 +27,13 @@
 public class LicenseUtils {
 
     public static final String EXPIRED_FEATURE_METADATA = "es.license.expired.feature";
-    public static final DateFormatter DATE_FORMATTER = DateFormatter.forPattern("EEEE, MMMM dd, yyyy").withLocale(Locale.ENGLISH);
+
+    public static String formatMillis(long millis) {
+        // DateFormatters logs a warning about the pattern on COMPAT
+        // this will be confusing to users, so call DateTimeFormatter directly instead
+        return DateTimeFormatter.ofPattern("EEEE, MMMM dd, yyyy", Locale.ENGLISH)
+            .format(Instant.ofEpochMilli(millis).atOffset(ZoneOffset.UTC));
+    }
 
     /**
      * Exception to be thrown when a feature action requires a valid license, but license
@@ -155,7 +163,7 @@ public static String getExpiryWarning(long licenseExpiryDate, long currentTime)
                 ? "expires today"
                 : (diff > 0
                     ? String.format(Locale.ROOT, "will expire in [%d] days", days)
-                    : String.format(Locale.ROOT, "expired on [%s]", LicenseUtils.DATE_FORMATTER.formatMillis(licenseExpiryDate)));
+                    : String.format(Locale.ROOT, "expired on [%s]", formatMillis(licenseExpiryDate)));
             return "Your license "
                 + expiryMessage
                 + ". "
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java
index a0aaf7f3bfeb..527f8d1c176e 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/mapper/DataTierFieldMapper.java
@@ -17,7 +17,6 @@
 import org.elasticsearch.index.mapper.ConstantFieldType;
 import org.elasticsearch.index.mapper.KeywordFieldMapper;
 import org.elasticsearch.index.mapper.MetadataFieldMapper;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.ValueFetcher;
 import org.elasticsearch.index.query.QueryRewriteContext;
 import org.elasticsearch.index.query.SearchExecutionContext;
@@ -108,9 +107,4 @@ public DataTierFieldMapper() {
     protected String contentType() {
         return CONTENT_TYPE;
     }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return SourceLoader.SyntheticFieldLoader.NOTHING;
-    }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java
index 657a13aa0f00..e74d1bb0ad64 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/DataStreamLifecycleUsageTransportAction.java
@@ -12,9 +12,12 @@
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.DataStream;
+import org.elasticsearch.cluster.metadata.DataStreamGlobalRetention;
+import org.elasticsearch.cluster.metadata.DataStreamGlobalRetentionSettings;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.cluster.service.ClusterService;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.injection.guice.Inject;
 import org.elasticsearch.protocol.xpack.XPackUsageRequest;
@@ -24,17 +27,22 @@
 import org.elasticsearch.xpack.core.datastreams.DataStreamLifecycleFeatureSetUsage;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LongSummaryStatistics;
+import java.util.Map;
 
 public class DataStreamLifecycleUsageTransportAction extends XPackUsageFeatureTransportAction {
 
+    private final DataStreamGlobalRetentionSettings globalRetentionSettings;
+
     @Inject
     public DataStreamLifecycleUsageTransportAction(
         TransportService transportService,
         ClusterService clusterService,
         ThreadPool threadPool,
         ActionFilters actionFilters,
-        IndexNameExpressionResolver indexNameExpressionResolver
+        IndexNameExpressionResolver indexNameExpressionResolver,
+        DataStreamGlobalRetentionSettings globalRetentionSettings
     ) {
         super(
             XPackUsageFeatureAction.DATA_STREAM_LIFECYCLE.name(),
@@ -44,6 +52,7 @@ public DataStreamLifecycleUsageTransportAction(
             actionFilters,
             indexNameExpressionResolver
         );
+        this.globalRetentionSettings = globalRetentionSettings;
     }
 
     @Override
@@ -54,42 +63,92 @@ protected void masterOperation(
         ActionListener<XPackUsageFeatureResponse> listener
     ) {
         final Collection<DataStream> dataStreams = state.metadata().dataStreams().values();
-        Tuple<Long, LongSummaryStatistics> stats = calculateStats(dataStreams);
-
-        long minRetention = stats.v2().getCount() == 0 ? 0 : stats.v2().getMin();
-        long maxRetention = stats.v2().getCount() == 0 ? 0 : stats.v2().getMax();
-        double averageRetention = stats.v2().getAverage();
-        RolloverConfiguration rolloverConfiguration = clusterService.getClusterSettings()
-            .get(DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING);
-        String rolloverConfigString = rolloverConfiguration.toString();
-        final DataStreamLifecycleFeatureSetUsage.LifecycleStats lifecycleStats = new DataStreamLifecycleFeatureSetUsage.LifecycleStats(
-            stats.v1(),
-            minRetention,
-            maxRetention,
-            averageRetention,
-            DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getDefault(null).toString().equals(rolloverConfigString)
+        DataStreamLifecycleFeatureSetUsage.LifecycleStats lifecycleStats = calculateStats(
+            dataStreams,
+            clusterService.getClusterSettings().get(DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING),
+            globalRetentionSettings.get()
         );
-
-        final DataStreamLifecycleFeatureSetUsage usage = new DataStreamLifecycleFeatureSetUsage(lifecycleStats);
-        listener.onResponse(new XPackUsageFeatureResponse(usage));
+        listener.onResponse(new XPackUsageFeatureResponse(new DataStreamLifecycleFeatureSetUsage(lifecycleStats)));
     }
 
     /**
-     * Counts the number of data streams that have a lifecycle configured (and enabled) and for
-     * the data streams that have a lifecycle it computes the min/max/average summary of the effective
-     * configured retention.
+     * Counts the number of data streams that have a lifecycle configured (and enabled),
+     * computes the min/max/average summary of the data and effective retention and tracks the usage of global retention.
      */
-    public static Tuple<Long, LongSummaryStatistics> calculateStats(Collection<DataStream> dataStreams) {
+    public static DataStreamLifecycleFeatureSetUsage.LifecycleStats calculateStats(
+        Collection<DataStream> dataStreams,
+        RolloverConfiguration rolloverConfiguration,
+        DataStreamGlobalRetention globalRetention
+    ) {
+        // Initialise counters of associated data streams
         long dataStreamsWithLifecycles = 0;
-        LongSummaryStatistics retentionStats = new LongSummaryStatistics();
+        long dataStreamsWithDefaultRetention = 0;
+        long dataStreamsWithMaxRetention = 0;
+
+        LongSummaryStatistics dataRetentionStats = new LongSummaryStatistics();
+        LongSummaryStatistics effectiveRetentionStats = new LongSummaryStatistics();
+
         for (DataStream dataStream : dataStreams) {
             if (dataStream.getLifecycle() != null && dataStream.getLifecycle().isEnabled()) {
                 dataStreamsWithLifecycles++;
+                // Track data retention
                 if (dataStream.getLifecycle().getDataStreamRetention() != null) {
-                    retentionStats.accept(dataStream.getLifecycle().getDataStreamRetention().getMillis());
+                    dataRetentionStats.accept(dataStream.getLifecycle().getDataStreamRetention().getMillis());
+                }
+                // Track effective retention
+                Tuple<TimeValue, DataStreamLifecycle.RetentionSource> effectiveDataRetentionWithSource = dataStream.getLifecycle()
+                    .getEffectiveDataRetentionWithSource(globalRetention, dataStream.isInternal());
+
+                // Track global retention usage
+                if (effectiveDataRetentionWithSource.v1() != null) {
+                    effectiveRetentionStats.accept(effectiveDataRetentionWithSource.v1().getMillis());
+                    if (effectiveDataRetentionWithSource.v2().equals(DataStreamLifecycle.RetentionSource.DEFAULT_GLOBAL_RETENTION)) {
+                        dataStreamsWithDefaultRetention++;
+                    }
+                    if (effectiveDataRetentionWithSource.v2().equals(DataStreamLifecycle.RetentionSource.MAX_GLOBAL_RETENTION)) {
+                        dataStreamsWithMaxRetention++;
+                    }
                 }
             }
         }
-        return new Tuple<>(dataStreamsWithLifecycles, retentionStats);
+        Map<String, DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats> globalRetentionStats = getGlobalRetentionStats(
+            globalRetention,
+            dataStreamsWithDefaultRetention,
+            dataStreamsWithMaxRetention
+        );
+        return new DataStreamLifecycleFeatureSetUsage.LifecycleStats(
+            dataStreamsWithLifecycles,
+            DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getDefault(null).equals(rolloverConfiguration),
+            DataStreamLifecycleFeatureSetUsage.RetentionStats.create(dataRetentionStats),
+            DataStreamLifecycleFeatureSetUsage.RetentionStats.create(effectiveRetentionStats),
+            globalRetentionStats
+        );
+    }
+
+    private static Map<String, DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats> getGlobalRetentionStats(
+        DataStreamGlobalRetention globalRetention,
+        long dataStreamsWithDefaultRetention,
+        long dataStreamsWithMaxRetention
+    ) {
+        if (globalRetention == null) {
+            return Map.of();
+        }
+        Map<String, DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats> globalRetentionStats = new HashMap<>();
+        if (globalRetention.defaultRetention() != null) {
+            globalRetentionStats.put(
+                DataStreamLifecycleFeatureSetUsage.LifecycleStats.DEFAULT_RETENTION_FIELD_NAME,
+                new DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats(
+                    dataStreamsWithDefaultRetention,
+                    globalRetention.defaultRetention()
+                )
+            );
+        }
+        if (globalRetention.maxRetention() != null) {
+            globalRetentionStats.put(
+                DataStreamLifecycleFeatureSetUsage.LifecycleStats.MAX_RETENTION_FIELD_NAME,
+                new DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats(dataStreamsWithMaxRetention, globalRetention.maxRetention())
+            );
+        }
+        return globalRetentionStats;
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsage.java
index 91cce4126d3a..4c550c69e4c0 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsage.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsage.java
@@ -13,11 +13,15 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xpack.core.XPackFeatureSet;
 import org.elasticsearch.xpack.core.XPackField;
 
 import java.io.IOException;
+import java.util.LongSummaryStatistics;
+import java.util.Map;
 import java.util.Objects;
 
 public class DataStreamLifecycleFeatureSetUsage extends XPackFeatureSet.Usage {
@@ -55,13 +59,7 @@ public TransportVersion getMinimalSupportedVersion() {
     protected void innerXContent(XContentBuilder builder, Params params) throws IOException {
         super.innerXContent(builder, params);
         if (enabled) {
-            builder.field("count", lifecycleStats.dataStreamsWithLifecyclesCount);
-            builder.field("default_rollover_used", lifecycleStats.defaultRolloverUsed);
-            builder.startObject("retention");
-            builder.field("minimum_millis", lifecycleStats.minRetentionMillis);
-            builder.field("maximum_millis", lifecycleStats.maxRetentionMillis);
-            builder.field("average_millis", lifecycleStats.averageRetentionMillis);
-            builder.endObject();
+            lifecycleStats.toXContent(builder, params);
         }
     }
 
@@ -87,33 +85,53 @@ public boolean equals(Object obj) {
         return available == other.available && enabled == other.enabled && Objects.equals(lifecycleStats, other.lifecycleStats);
     }
 
-    public static class LifecycleStats implements Writeable {
-
-        public static final LifecycleStats INITIAL = new LifecycleStats(0, 0, 0, 0, true);
+    public static class LifecycleStats implements Writeable, ToXContentFragment {
 
+        public static final LifecycleStats INITIAL = new LifecycleStats(0, true, RetentionStats.NO_DATA, RetentionStats.NO_DATA, Map.of());
+        public static final String DEFAULT_RETENTION_FIELD_NAME = "default";
+        public static final String MAX_RETENTION_FIELD_NAME = "max";
         final long dataStreamsWithLifecyclesCount;
-        final long minRetentionMillis;
-        final long maxRetentionMillis;
-        final double averageRetentionMillis;
         final boolean defaultRolloverUsed;
+        final RetentionStats dataRetentionStats;
+        final RetentionStats effectiveRetentionStats;
+        final Map<String, GlobalRetentionStats> globalRetentionStats;
 
         public LifecycleStats(
             long dataStreamsWithLifecyclesCount,
-            long minRetention,
-            long maxRetention,
-            double averageRetention,
-            boolean defaultRolloverUsed
+            boolean defaultRolloverUsed,
+            RetentionStats dataRetentionStats,
+            RetentionStats effectiveRetentionStats,
+            Map<String, GlobalRetentionStats> globalRetentionStats
         ) {
             this.dataStreamsWithLifecyclesCount = dataStreamsWithLifecyclesCount;
-            this.minRetentionMillis = minRetention;
-            this.maxRetentionMillis = maxRetention;
-            this.averageRetentionMillis = averageRetention;
             this.defaultRolloverUsed = defaultRolloverUsed;
+            this.dataRetentionStats = dataRetentionStats;
+            this.effectiveRetentionStats = effectiveRetentionStats;
+            this.globalRetentionStats = globalRetentionStats;
         }
 
         public static LifecycleStats read(StreamInput in) throws IOException {
-            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
-                return new LifecycleStats(in.readVLong(), in.readVLong(), in.readVLong(), in.readDouble(), in.readBoolean());
+            if (in.getTransportVersion().onOrAfter(TransportVersions.GLOBAL_RETENTION_TELEMETRY)) {
+                return new LifecycleStats(
+                    in.readVLong(),
+                    in.readBoolean(),
+                    RetentionStats.read(in),
+                    RetentionStats.read(in),
+                    in.readMap(GlobalRetentionStats::new)
+                );
+            } else if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
+                var dataStreamsWithLifecyclesCount = in.readVLong();
+                var minDataRetention = in.readVLong();
+                var maxDataRetention = in.readVLong();
+                var avgDataRetention = in.readDouble();
+                var defaultRolledOverUsed = in.readBoolean();
+                return new LifecycleStats(
+                    dataStreamsWithLifecyclesCount,
+                    defaultRolledOverUsed,
+                    new RetentionStats(dataStreamsWithLifecyclesCount, avgDataRetention, minDataRetention, maxDataRetention),
+                    RetentionStats.NO_DATA,
+                    Map.of()
+                );
             } else {
                 return INITIAL;
             }
@@ -121,11 +139,17 @@ public static LifecycleStats read(StreamInput in) throws IOException {
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
+            if (out.getTransportVersion().onOrAfter(TransportVersions.GLOBAL_RETENTION_TELEMETRY)) {
+                out.writeVLong(dataStreamsWithLifecyclesCount);
+                out.writeBoolean(defaultRolloverUsed);
+                dataRetentionStats.writeTo(out);
+                effectiveRetentionStats.writeTo(out);
+                out.writeMap(globalRetentionStats, (o, v) -> v.writeTo(o));
+            } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
                 out.writeVLong(dataStreamsWithLifecyclesCount);
-                out.writeVLong(minRetentionMillis);
-                out.writeVLong(maxRetentionMillis);
-                out.writeDouble(averageRetentionMillis);
+                out.writeVLong(dataRetentionStats.minMillis() == null ? 0 : dataRetentionStats.minMillis());
+                out.writeVLong(dataRetentionStats.maxMillis() == null ? 0 : dataRetentionStats.maxMillis());
+                out.writeDouble(dataRetentionStats.avgMillis() == null ? 0 : dataRetentionStats.avgMillis());
                 out.writeBoolean(defaultRolloverUsed);
             }
         }
@@ -134,10 +158,10 @@ public void writeTo(StreamOutput out) throws IOException {
         public int hashCode() {
             return Objects.hash(
                 dataStreamsWithLifecyclesCount,
-                minRetentionMillis,
-                maxRetentionMillis,
-                averageRetentionMillis,
-                defaultRolloverUsed
+                defaultRolloverUsed,
+                dataRetentionStats,
+                effectiveRetentionStats,
+                globalRetentionStats
             );
         }
 
@@ -148,10 +172,101 @@ public boolean equals(Object obj) {
             }
             LifecycleStats other = (LifecycleStats) obj;
             return dataStreamsWithLifecyclesCount == other.dataStreamsWithLifecyclesCount
-                && minRetentionMillis == other.minRetentionMillis
-                && maxRetentionMillis == other.maxRetentionMillis
-                && averageRetentionMillis == other.averageRetentionMillis
-                && defaultRolloverUsed == other.defaultRolloverUsed;
+                && defaultRolloverUsed == other.defaultRolloverUsed
+                && Objects.equals(dataRetentionStats, other.dataRetentionStats)
+                && Objects.equals(effectiveRetentionStats, other.effectiveRetentionStats)
+                && Objects.equals(globalRetentionStats, other.globalRetentionStats);
+        }
+
+        @Override
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+            builder.field("count", dataStreamsWithLifecyclesCount);
+            builder.field("default_rollover_used", defaultRolloverUsed);
+
+            builder.startObject("data_retention");
+            builder.field("configured_data_streams", dataRetentionStats.dataStreamCount());
+            if (dataRetentionStats.dataStreamCount() > 0) {
+                builder.field("minimum_millis", dataRetentionStats.minMillis);
+                builder.field("maximum_millis", dataRetentionStats.maxMillis);
+                builder.field("average_millis", dataRetentionStats.avgMillis);
+            }
+            builder.endObject();
+
+            builder.startObject("effective_retention");
+            builder.field("retained_data_streams", effectiveRetentionStats.dataStreamCount());
+            if (effectiveRetentionStats.dataStreamCount() > 0) {
+                builder.field("minimum_millis", effectiveRetentionStats.minMillis);
+                builder.field("maximum_millis", effectiveRetentionStats.maxMillis);
+                builder.field("average_millis", effectiveRetentionStats.avgMillis);
+            }
+            builder.endObject();
+
+            builder.startObject("global_retention");
+            globalRetentionStatsToXContent(builder, params, LifecycleStats.DEFAULT_RETENTION_FIELD_NAME);
+            globalRetentionStatsToXContent(builder, params, LifecycleStats.MAX_RETENTION_FIELD_NAME);
+            builder.endObject();
+            return builder;
+        }
+
+        private void globalRetentionStatsToXContent(XContentBuilder builder, Params params, String retentionType) throws IOException {
+            builder.startObject(retentionType);
+            GlobalRetentionStats stats = globalRetentionStats.get(retentionType);
+            builder.field("defined", stats != null);
+            if (stats != null) {
+                builder.field("affected_data_streams", stats.dataStreamCount());
+                builder.field("retention_millis", stats.retention());
+            }
+            builder.endObject();
+        }
+    }
+
+    public record RetentionStats(long dataStreamCount, Double avgMillis, Long minMillis, Long maxMillis) implements Writeable {
+
+        static final RetentionStats NO_DATA = new RetentionStats(0, null, null, null);
+
+        public static RetentionStats create(LongSummaryStatistics statistics) {
+            if (statistics.getCount() == 0) {
+                return NO_DATA;
+            }
+            return new RetentionStats(statistics.getCount(), statistics.getAverage(), statistics.getMin(), statistics.getMax());
+        }
+
+        public static RetentionStats read(StreamInput in) throws IOException {
+            long dataStreamCount = in.readVLong();
+            if (dataStreamCount == 0) {
+                return NO_DATA;
+            }
+            double avgMillis = in.readDouble();
+            long minMillis = in.readVLong();
+            long maxMillis = in.readVLong();
+            return new RetentionStats(dataStreamCount, avgMillis, minMillis, maxMillis);
+        }
+
+        @Override
+        public void writeTo(StreamOutput out) throws IOException {
+            out.writeVLong(dataStreamCount);
+            if (dataStreamCount > 0) {
+                out.writeDouble(avgMillis);
+                out.writeVLong(minMillis);
+                out.writeVLong(maxMillis);
+            }
+        }
+    }
+
+    public record GlobalRetentionStats(long dataStreamCount, long retention) implements Writeable {
+
+        public GlobalRetentionStats(long dataStreamCount, TimeValue retention) {
+            this(dataStreamCount, retention.getMillis());
+        }
+
+        public GlobalRetentionStats(StreamInput in) throws IOException {
+            this(in.readVLong(), in.readVLong());
+        }
+
+        @Override
+        public void writeTo(StreamOutput out) throws IOException {
+            out.writeVLong(dataStreamCount);
+            out.writeVLong(retention);
         }
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/DownsampleStep.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/DownsampleStep.java
index bfbc32e11e93..b179195e8777 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/DownsampleStep.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/DownsampleStep.java
@@ -90,8 +90,13 @@ public void performAction(
 
     void performDownsampleIndex(String indexName, String downsampleIndexName, ActionListener<Void> listener) {
         DownsampleConfig config = new DownsampleConfig(fixedInterval);
-        DownsampleAction.Request request = new DownsampleAction.Request(indexName, downsampleIndexName, waitTimeout, config)
-            .masterNodeTimeout(TimeValue.MAX_VALUE);
+        DownsampleAction.Request request = new DownsampleAction.Request(
+            TimeValue.MAX_VALUE,
+            indexName,
+            downsampleIndexName,
+            waitTimeout,
+            config
+        );
         // Currently, DownsampleAction always acknowledges action was complete when no exceptions are thrown.
         getClient().execute(DownsampleAction.INSTANCE, request, listener.delegateFailureAndWrap((l, response) -> l.onResponse(null)));
     }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java
index 7ae9a4a4b2d5..4a570bfde99a 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StartTrainedModelDeploymentAction.java
@@ -29,7 +29,6 @@
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.ml.MlConfigVersion;
 import org.elasticsearch.xpack.core.ml.inference.TrainedModelConfig;
-import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsFeatureFlag;
 import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsSettings;
 import org.elasticsearch.xpack.core.ml.inference.assignment.AllocationStatus;
 import org.elasticsearch.xpack.core.ml.inference.assignment.Priority;
@@ -120,14 +119,12 @@ public static class Request extends MasterNodeRequest<Request> implements ToXCon
                 ObjectParser.ValueType.VALUE
             );
             PARSER.declareString(Request::setPriority, PRIORITY);
-            if (AdaptiveAllocationsFeatureFlag.isEnabled()) {
-                PARSER.declareObjectOrNull(
-                    Request::setAdaptiveAllocationsSettings,
-                    (p, c) -> AdaptiveAllocationsSettings.PARSER.parse(p, c).build(),
-                    null,
-                    ADAPTIVE_ALLOCATIONS
-                );
-            }
+            PARSER.declareObjectOrNull(
+                Request::setAdaptiveAllocationsSettings,
+                (p, c) -> AdaptiveAllocationsSettings.PARSER.parse(p, c).build(),
+                null,
+                ADAPTIVE_ALLOCATIONS
+            );
         }
 
         public static Request parseRequest(String modelId, String deploymentId, XContentParser parser) {
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateTrainedModelDeploymentAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateTrainedModelDeploymentAction.java
index 61601c402e8e..7fca223b2ee7 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateTrainedModelDeploymentAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateTrainedModelDeploymentAction.java
@@ -20,7 +20,6 @@
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
-import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsFeatureFlag;
 import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsSettings;
 import org.elasticsearch.xpack.core.ml.job.messages.Messages;
 import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
@@ -50,14 +49,12 @@ public static class Request extends AcknowledgedRequest<Request> implements ToXC
         static {
             PARSER.declareString(Request::setDeploymentId, MODEL_ID);
             PARSER.declareInt(Request::setNumberOfAllocations, NUMBER_OF_ALLOCATIONS);
-            if (AdaptiveAllocationsFeatureFlag.isEnabled()) {
-                PARSER.declareObjectOrNull(
-                    Request::setAdaptiveAllocationsSettings,
-                    (p, c) -> AdaptiveAllocationsSettings.PARSER.parse(p, c).build(),
-                    AdaptiveAllocationsSettings.RESET_PLACEHOLDER,
-                    ADAPTIVE_ALLOCATIONS
-                );
-            }
+            PARSER.declareObjectOrNull(
+                Request::setAdaptiveAllocationsSettings,
+                (p, c) -> AdaptiveAllocationsSettings.PARSER.parse(p, c).build(),
+                AdaptiveAllocationsSettings.RESET_PLACEHOLDER,
+                ADAPTIVE_ALLOCATIONS
+            );
             PARSER.declareString((r, val) -> r.ackTimeout(TimeValue.parseTimeValue(val, TIMEOUT.getPreferredName())), TIMEOUT);
         }
 
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java
index 07be597c7024..95753f02e396 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/annotations/AnnotationIndex.java
@@ -72,8 +72,7 @@ public static void createAnnotationsIndexIfNecessaryAndWaitForYellow(
     ) {
 
         final ActionListener<Boolean> annotationsIndexCreatedListener = finalListener.delegateFailureAndWrap((delegate, success) -> {
-            final ClusterHealthRequest request = new ClusterHealthRequest(READ_ALIAS_NAME).waitForYellowStatus()
-                .masterNodeTimeout(masterNodeTimeout);
+            final ClusterHealthRequest request = new ClusterHealthRequest(masterNodeTimeout, READ_ALIAS_NAME).waitForYellowStatus();
             executeAsyncWithOrigin(
                 client,
                 ML_ORIGIN,
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AdaptiveAllocationsFeatureFlag.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AdaptiveAllocationsFeatureFlag.java
deleted file mode 100644
index a3b508c0534f..000000000000
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/assignment/AdaptiveAllocationsFeatureFlag.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-package org.elasticsearch.xpack.core.ml.inference.assignment;
-
-import org.elasticsearch.common.util.FeatureFlag;
-
-/**
- * semantic_text feature flag. When the feature is complete, this flag will be removed.
- */
-public class AdaptiveAllocationsFeatureFlag {
-
-    private AdaptiveAllocationsFeatureFlag() {}
-
-    private static final FeatureFlag FEATURE_FLAG = new FeatureFlag("inference_adaptive_allocations");
-
-    public static boolean isEnabled() {
-        return FEATURE_FLAG.isEnabled();
-    }
-}
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/persistence/AnomalyDetectorsIndex.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/persistence/AnomalyDetectorsIndex.java
index d81541698e49..0acc953c2403 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/persistence/AnomalyDetectorsIndex.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/persistence/AnomalyDetectorsIndex.java
@@ -103,9 +103,10 @@ public static void createStateIndexAndAliasIfNecessaryAndWaitForYellow(
         final ActionListener<Boolean> finalListener
     ) {
         final ActionListener<Boolean> stateIndexAndAliasCreated = finalListener.delegateFailureAndWrap((delegate, success) -> {
-            final ClusterHealthRequest request = new ClusterHealthRequest(AnomalyDetectorsIndex.jobStateIndexWriteAlias())
-                .waitForYellowStatus()
-                .masterNodeTimeout(masterNodeTimeout);
+            final ClusterHealthRequest request = new ClusterHealthRequest(
+                masterNodeTimeout,
+                AnomalyDetectorsIndex.jobStateIndexWriteAlias()
+            ).waitForYellowStatus();
             executeAsyncWithOrigin(
                 client,
                 ML_ORIGIN,
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAlias.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAlias.java
index d4ec7563b868..1603ad67718c 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAlias.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAlias.java
@@ -224,10 +224,9 @@ public static void createSystemIndexIfNecessary(
     }
 
     private static void waitForShardsReady(Client client, String index, TimeValue masterNodeTimeout, ActionListener<Boolean> listener) {
-        ClusterHealthRequest healthRequest = new ClusterHealthRequest(index).waitForYellowStatus()
+        ClusterHealthRequest healthRequest = new ClusterHealthRequest(masterNodeTimeout, index).waitForYellowStatus()
             .waitForNoRelocatingShards(true)
-            .waitForNoInitializingShards(true)
-            .masterNodeTimeout(masterNodeTimeout);
+            .waitForNoInitializingShards(true);
         executeAsyncWithOrigin(
             client.threadPool().getThreadContext(),
             ML_ORIGIN,
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rest/action/RestXPackUsageAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rest/action/RestXPackUsageAction.java
index 19c4ad17ca4d..ca57dbec5bef 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rest/action/RestXPackUsageAction.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rest/action/RestXPackUsageAction.java
@@ -7,6 +7,7 @@
 package org.elasticsearch.xpack.core.rest.action;
 
 import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.protocol.xpack.XPackUsageRequest;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
@@ -23,6 +24,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Set;
 
 import static org.elasticsearch.rest.RestRequest.Method.GET;
 import static org.elasticsearch.rest.RestStatus.OK;
@@ -59,4 +61,9 @@ public RestResponse buildResponse(XPackUsageResponse response, XContentBuilder b
             }
         );
     }
+
+    @Override
+    public Set<String> supportedCapabilities() {
+        return Sets.union(super.supportedCapabilities(), Set.of("global_retention_telemetry"));
+    }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java
index 6529d4d18fa5..89733761f3dc 100644
--- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java
+++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/KibanaOwnedReservedRoleDescriptors.java
@@ -420,7 +420,19 @@ static RoleDescriptor kibanaSystem(String name) {
                 // For source indices of the Cloud Detection & Response (CDR) packages that ships a
                 // transform
                 RoleDescriptor.IndicesPrivileges.builder()
-                    .indices("logs-wiz.vulnerability-*", "logs-wiz.cloud_configuration_finding-*")
+                    .indices(
+                        "logs-wiz.vulnerability-*",
+                        "logs-wiz.cloud_configuration_finding-*",
+                        "logs-google_scc.finding-*",
+                        "logs-aws.securityhub_findings-*",
+                        "logs-aws.inspector-*",
+                        "logs-amazon_security_lake.findings-*",
+                        "logs-qualys_vmdr.asset_host_detection-*",
+                        "logs-tenable_sc.vulnerability-*",
+                        "logs-tenable_io.vulnerability-*",
+                        "logs-rapid7_insightvm.vulnerability-*",
+                        "logs-carbon_black_cloud.asset_vulnerability_summary-*"
+                    )
                     .privileges("read", "view_index_metadata")
                     .build(),
                 // For alias indices of the Cloud Detection & Response (CDR) packages that ships a
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ClientHelperTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ClientHelperTests.java
index df4f7828d1fe..100f7843713b 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ClientHelperTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ClientHelperTests.java
@@ -70,7 +70,7 @@ public void testExecuteAsyncWrapsListener() throws Exception {
             latch.countDown();
         });
 
-        final ClusterHealthRequest request = new ClusterHealthRequest();
+        final ClusterHealthRequest request = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT);
         threadContext.putHeader(headerName, headerValue);
 
         ClientHelper.executeAsyncWithOrigin(threadContext, origin, request, listener, (req, listener1) -> {
@@ -110,7 +110,13 @@ public void testExecuteWithClient() throws Exception {
         }).when(client).execute(any(), any(), any());
 
         threadContext.putHeader(headerName, headerValue);
-        ClientHelper.executeAsyncWithOrigin(client, origin, TransportClusterHealthAction.TYPE, new ClusterHealthRequest(), listener);
+        ClientHelper.executeAsyncWithOrigin(
+            client,
+            origin,
+            TransportClusterHealthAction.TYPE,
+            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT),
+            listener
+        );
 
         latch.await();
     }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/async/AsyncSearchIndexServiceTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/async/AsyncSearchIndexServiceTests.java
index 0afc611f43d4..4096b5f30f0f 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/async/AsyncSearchIndexServiceTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/async/AsyncSearchIndexServiceTests.java
@@ -360,7 +360,10 @@ public void testMaxAsyncSearchResponseSize() throws Exception {
 
             // setting very small limit for the max size of async search response
             int limit = randomIntBetween(1, 125);
-            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             updateSettingsRequest.transientSettings(Settings.builder().put("search.max_async_search_response_size", limit + "b"));
             assertAcked(clusterAdmin().updateSettings(updateSettingsRequest).actionGet());
             String expectedErrMsg = "Can't store an async search response larger than ["
@@ -393,7 +396,10 @@ public void testMaxAsyncSearchResponseSize() throws Exception {
             assertEquals(expectedErrMsg, e2.getMessage());
         } finally {
             // restoring limit
-            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             updateSettingsRequest.transientSettings(Settings.builder().put("search.max_async_search_response_size", (String) null));
             assertAcked(clusterAdmin().updateSettings(updateSettingsRequest).actionGet());
         }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsageTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsageTests.java
index 66ab5755f939..3dce786c700d 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsageTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/datastreams/DataStreamLifecycleFeatureSetUsageTests.java
@@ -7,21 +7,25 @@
 
 package org.elasticsearch.xpack.core.datastreams;
 
+import org.elasticsearch.action.admin.indices.rollover.RolloverConditions;
+import org.elasticsearch.action.admin.indices.rollover.RolloverConfiguration;
 import org.elasticsearch.cluster.metadata.DataStream;
+import org.elasticsearch.cluster.metadata.DataStreamGlobalRetention;
 import org.elasticsearch.cluster.metadata.DataStreamLifecycle;
 import org.elasticsearch.cluster.metadata.DataStreamTestHelper;
 import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.test.AbstractWireSerializingTestCase;
-import org.elasticsearch.test.ESTestCase;
 
+import java.util.HashMap;
 import java.util.List;
-import java.util.LongSummaryStatistics;
+import java.util.Map;
 import java.util.UUID;
 
 import static org.elasticsearch.xpack.core.action.DataStreamLifecycleUsageTransportAction.calculateStats;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
 public class DataStreamLifecycleFeatureSetUsageTests extends AbstractWireSerializingTestCase<DataStreamLifecycleFeatureSetUsage> {
@@ -32,68 +36,69 @@ protected DataStreamLifecycleFeatureSetUsage createTestInstance() {
             ? new DataStreamLifecycleFeatureSetUsage(
                 new DataStreamLifecycleFeatureSetUsage.LifecycleStats(
                     randomNonNegativeLong(),
-                    randomNonNegativeLong(),
-                    randomNonNegativeLong(),
-                    randomDouble(),
-                    randomBoolean()
+                    randomBoolean(),
+                    generateRetentionStats(),
+                    generateRetentionStats(),
+                    randomBoolean() ? Map.of() : Map.of("default", generateGlobalRetention(), "max", generateGlobalRetention())
                 )
             )
             : DataStreamLifecycleFeatureSetUsage.DISABLED;
     }
 
+    private static DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats generateGlobalRetention() {
+        return new DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats(randomNonNegativeLong(), randomNonNegativeLong());
+    }
+
+    private static DataStreamLifecycleFeatureSetUsage.RetentionStats generateRetentionStats() {
+        return randomBoolean()
+            ? DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA
+            : new DataStreamLifecycleFeatureSetUsage.RetentionStats(
+                randomNonNegativeLong(),
+                randomDoubleBetween(0.0, 110.0, false),
+                randomNonNegativeLong(),
+                randomNonNegativeLong()
+            );
+    }
+
     @Override
     protected DataStreamLifecycleFeatureSetUsage mutateInstance(DataStreamLifecycleFeatureSetUsage instance) {
         if (instance.equals(DataStreamLifecycleFeatureSetUsage.DISABLED)) {
             return new DataStreamLifecycleFeatureSetUsage(DataStreamLifecycleFeatureSetUsage.LifecycleStats.INITIAL);
         }
-        return switch (randomInt(4)) {
-            case 0 -> new DataStreamLifecycleFeatureSetUsage(
-                new DataStreamLifecycleFeatureSetUsage.LifecycleStats(
-                    randomValueOtherThan(instance.lifecycleStats.dataStreamsWithLifecyclesCount, ESTestCase::randomLong),
-                    instance.lifecycleStats.minRetentionMillis,
-                    instance.lifecycleStats.maxRetentionMillis,
-                    instance.lifecycleStats.averageRetentionMillis,
-                    instance.lifecycleStats.defaultRolloverUsed
-                )
+        var count = instance.lifecycleStats.dataStreamsWithLifecyclesCount;
+        var defaultRollover = instance.lifecycleStats.defaultRolloverUsed;
+        var dataRetentionStats = instance.lifecycleStats.dataRetentionStats;
+        var effectiveRetentionStats = instance.lifecycleStats.effectiveRetentionStats;
+        var maxRetention = instance.lifecycleStats.globalRetentionStats.get("max");
+        var defaultRetention = instance.lifecycleStats.globalRetentionStats.get("default");
+        switch (randomInt(5)) {
+            case 0 -> count += (count > 0 ? -1 : 1);
+            case 1 -> defaultRollover = defaultRollover == false;
+            case 2 -> dataRetentionStats = randomValueOtherThan(
+                dataRetentionStats,
+                DataStreamLifecycleFeatureSetUsageTests::generateRetentionStats
             );
-            case 1 -> new DataStreamLifecycleFeatureSetUsage(
-                new DataStreamLifecycleFeatureSetUsage.LifecycleStats(
-                    instance.lifecycleStats.dataStreamsWithLifecyclesCount,
-                    randomValueOtherThan(instance.lifecycleStats.minRetentionMillis, ESTestCase::randomLong),
-                    instance.lifecycleStats.maxRetentionMillis,
-                    instance.lifecycleStats.averageRetentionMillis,
-                    instance.lifecycleStats.defaultRolloverUsed
-                )
-            );
-            case 2 -> new DataStreamLifecycleFeatureSetUsage(
-                new DataStreamLifecycleFeatureSetUsage.LifecycleStats(
-                    instance.lifecycleStats.dataStreamsWithLifecyclesCount,
-                    instance.lifecycleStats.minRetentionMillis,
-                    randomValueOtherThan(instance.lifecycleStats.maxRetentionMillis, ESTestCase::randomLong),
-                    instance.lifecycleStats.averageRetentionMillis,
-                    instance.lifecycleStats.defaultRolloverUsed
-                )
-            );
-            case 3 -> new DataStreamLifecycleFeatureSetUsage(
-                new DataStreamLifecycleFeatureSetUsage.LifecycleStats(
-                    instance.lifecycleStats.dataStreamsWithLifecyclesCount,
-                    instance.lifecycleStats.minRetentionMillis,
-                    instance.lifecycleStats.maxRetentionMillis,
-                    randomValueOtherThan(instance.lifecycleStats.averageRetentionMillis, ESTestCase::randomDouble),
-                    instance.lifecycleStats.defaultRolloverUsed
-                )
+            case 3 -> effectiveRetentionStats = randomValueOtherThan(
+                effectiveRetentionStats,
+                DataStreamLifecycleFeatureSetUsageTests::generateRetentionStats
             );
-            case 4 -> new DataStreamLifecycleFeatureSetUsage(
-                new DataStreamLifecycleFeatureSetUsage.LifecycleStats(
-                    instance.lifecycleStats.dataStreamsWithLifecyclesCount,
-                    instance.lifecycleStats.minRetentionMillis,
-                    instance.lifecycleStats.maxRetentionMillis,
-                    instance.lifecycleStats.averageRetentionMillis,
-                    instance.lifecycleStats.defaultRolloverUsed == false
-                )
+            case 4 -> maxRetention = randomValueOtherThan(maxRetention, DataStreamLifecycleFeatureSetUsageTests::generateGlobalRetention);
+            case 5 -> defaultRetention = randomValueOtherThan(
+                defaultRetention,
+                DataStreamLifecycleFeatureSetUsageTests::generateGlobalRetention
             );
             default -> throw new RuntimeException("unreachable");
-        };
+        }
+        Map<String, DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats> map = new HashMap<>();
+        if (defaultRetention != null) {
+            map.put("default", defaultRetention);
+        }
+        if (maxRetention != null) {
+            map.put("max", maxRetention);
+        }
+        return new DataStreamLifecycleFeatureSetUsage(
+            new DataStreamLifecycleFeatureSetUsage.LifecycleStats(count, defaultRollover, dataRetentionStats, effectiveRetentionStats, map)
+        );
     }
 
     public void testLifecycleStats() {
@@ -112,7 +117,7 @@ public void testLifecycleStats() {
                 1L,
                 null,
                 false,
-                new DataStreamLifecycle(new DataStreamLifecycle.Retention(TimeValue.timeValueMillis(1000)), null, true)
+                new DataStreamLifecycle(new DataStreamLifecycle.Retention(TimeValue.timeValueSeconds(50)), null, true)
             ),
             DataStreamTestHelper.newInstance(
                 randomAlphaOfLength(10),
@@ -120,7 +125,7 @@ public void testLifecycleStats() {
                 1L,
                 null,
                 false,
-                new DataStreamLifecycle(new DataStreamLifecycle.Retention(TimeValue.timeValueMillis(100)), null, true)
+                new DataStreamLifecycle(new DataStreamLifecycle.Retention(TimeValue.timeValueMillis(150)), null, true)
             ),
             DataStreamTestHelper.newInstance(
                 randomAlphaOfLength(10),
@@ -128,7 +133,7 @@ public void testLifecycleStats() {
                 1L,
                 null,
                 false,
-                new DataStreamLifecycle(new DataStreamLifecycle.Retention(TimeValue.timeValueMillis(5000)), null, false)
+                new DataStreamLifecycle(new DataStreamLifecycle.Retention(TimeValue.timeValueSeconds(5)), null, false)
             ),
             DataStreamTestHelper.newInstance(
                 randomAlphaOfLength(10),
@@ -140,15 +145,70 @@ public void testLifecycleStats() {
             )
         );
 
-        Tuple<Long, LongSummaryStatistics> stats = calculateStats(dataStreams);
-        // 3 data streams with an enabled lifecycle
-        assertThat(stats.v1(), is(3L));
-        LongSummaryStatistics longSummaryStatistics = stats.v2();
-        assertThat(longSummaryStatistics.getMax(), is(1000L));
-        assertThat(longSummaryStatistics.getMin(), is(100L));
-        // only counting the ones with an effective retention in the summary statistics
-        assertThat(longSummaryStatistics.getCount(), is(2L));
-        assertThat(longSummaryStatistics.getAverage(), is(550.0));
+        // Test empty global retention
+        {
+            boolean useDefault = randomBoolean();
+            RolloverConfiguration rollover = useDefault
+                ? DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getDefault(Settings.EMPTY)
+                : new RolloverConfiguration(new RolloverConditions());
+            DataStreamLifecycleFeatureSetUsage.LifecycleStats stats = calculateStats(dataStreams, rollover, null);
+
+            assertThat(stats.dataStreamsWithLifecyclesCount, is(3L));
+            assertThat(stats.defaultRolloverUsed, is(useDefault));
+            // Data retention
+            assertThat(stats.dataRetentionStats.dataStreamCount(), is(2L));
+            assertThat(stats.dataRetentionStats.maxMillis(), is(50_000L));
+            assertThat(stats.dataRetentionStats.minMillis(), is(150L));
+            assertThat(stats.dataRetentionStats.avgMillis(), is(25_075.0));
+
+            assertThat(stats.effectiveRetentionStats.dataStreamCount(), is(2L));
+            assertThat(stats.effectiveRetentionStats.maxMillis(), is(50_000L));
+            assertThat(stats.effectiveRetentionStats.minMillis(), is(150L));
+            assertThat(stats.effectiveRetentionStats.avgMillis(), is(25_075.0));
+
+            assertThat(stats.globalRetentionStats, equalTo(Map.of()));
+        }
+
+        // Test with global retention
+        {
+            boolean useDefault = randomBoolean();
+            RolloverConfiguration rollover = useDefault
+                ? DataStreamLifecycle.CLUSTER_LIFECYCLE_DEFAULT_ROLLOVER_SETTING.getDefault(Settings.EMPTY)
+                : new RolloverConfiguration(new RolloverConditions());
+            TimeValue defaultRetention = TimeValue.timeValueSeconds(10);
+            TimeValue maxRetention = TimeValue.timeValueSeconds(20);
+            DataStreamLifecycleFeatureSetUsage.LifecycleStats stats = calculateStats(
+                dataStreams,
+                rollover,
+                new DataStreamGlobalRetention(defaultRetention, maxRetention)
+            );
+
+            assertThat(stats.dataStreamsWithLifecyclesCount, is(3L));
+            assertThat(stats.defaultRolloverUsed, is(useDefault));
+            // Data retention
+            assertThat(stats.dataRetentionStats.dataStreamCount(), is(2L));
+            assertThat(stats.dataRetentionStats.maxMillis(), is(50_000L));
+            assertThat(stats.dataRetentionStats.minMillis(), is(150L));
+            assertThat(stats.dataRetentionStats.avgMillis(), is(25_075.0));
+
+            // Effective retention
+            assertThat(stats.effectiveRetentionStats.dataStreamCount(), is(3L));
+            assertThat(stats.effectiveRetentionStats.maxMillis(), is(20_000L));
+            assertThat(stats.effectiveRetentionStats.minMillis(), is(150L));
+            assertThat(stats.effectiveRetentionStats.avgMillis(), is(10_050.0));
+
+            assertThat(
+                stats.globalRetentionStats,
+                equalTo(
+                    Map.of(
+                        "default",
+                        new DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats(1L, 10_000L),
+                        "max",
+                        new DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats(1L, 20_000L)
+                    )
+                )
+            );
+        }
     }
 
     @Override
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/SetSingleNodeAllocateStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/SetSingleNodeAllocateStepTests.java
index 1fb7b7c36827..f988a6fd5769 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/SetSingleNodeAllocateStepTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/SetSingleNodeAllocateStepTests.java
@@ -6,7 +6,6 @@
  */
 package org.elasticsearch.xpack.core.ilm;
 
-import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
@@ -388,11 +387,7 @@ public void testPerformActionAttrsNoShard() {
 
     public void testPerformActionSomeShardsOnlyOnNewNodes() throws Exception {
         VersionInformation oldVersion = new VersionInformation(
-            VersionUtils.randomVersionBetween(
-                random(),
-                Version.fromId(Version.CURRENT.major * 1_000_000 + 99),
-                VersionUtils.getPreviousVersion()
-            ),
+            VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
             IndexVersions.MINIMUM_COMPATIBLE,
             IndexVersionUtils.randomCompatibleVersion(random())
         );
@@ -457,11 +452,7 @@ public void testPerformActionSomeShardsOnlyOnNewNodes() throws Exception {
 
     public void testPerformActionSomeShardsOnlyOnNewNodesButNewNodesInvalidAttrs() {
         VersionInformation oldVersion = new VersionInformation(
-            VersionUtils.randomVersionBetween(
-                random(),
-                Version.fromId(Version.CURRENT.major * 1_000_000 + 99),
-                VersionUtils.getPreviousVersion()
-            ),
+            VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
             IndexVersions.MINIMUM_COMPATIBLE,
             IndexVersionUtils.randomCompatibleVersion(random())
         );
@@ -534,11 +525,7 @@ public void testPerformActionSomeShardsOnlyOnNewNodesButNewNodesInvalidAttrs() {
 
     public void testPerformActionNewShardsExistButWithInvalidAttributes() throws Exception {
         VersionInformation oldVersion = new VersionInformation(
-            VersionUtils.randomVersionBetween(
-                random(),
-                Version.fromId(Version.CURRENT.major * 1_000_000 + 99),
-                VersionUtils.getPreviousVersion()
-            ),
+            VersionUtils.randomCompatibleVersion(random(), VersionUtils.getPreviousVersion()),
             IndexVersions.MINIMUM_COMPATIBLE,
             IndexVersionUtils.randomCompatibleVersion(random())
         );
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java
index be4042ae7783..a476bbfb229f 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java
@@ -1611,7 +1611,16 @@ public void testKibanaSystemRole() {
 
         Arrays.asList(
             "logs-wiz.vulnerability-" + randomAlphaOfLength(randomIntBetween(0, 13)),
-            "logs-wiz.cloud_configuration_finding-" + randomAlphaOfLength(randomIntBetween(0, 13))
+            "logs-wiz.cloud_configuration_finding-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-google_scc.finding-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-aws.securityhub_findings-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-aws.inspector-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-amazon_security_lake.findings-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-qualys_vmdr.asset_host_detection-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-tenable_sc.vulnerability-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-tenable_io.vulnerability-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-rapid7_insightvm.vulnerability-" + randomAlphaOfLength(randomIntBetween(0, 13)),
+            "logs-carbon_black_cloud.asset_vulnerability_summary-" + randomAlphaOfLength(randomIntBetween(0, 13))
         ).forEach(indexName -> {
             final IndexAbstraction indexAbstraction = mockIndexAbstraction(indexName);
             assertThat(kibanaRole.indices().allowedIndicesMatcher("indices:foo").test(indexAbstraction), is(false));
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/slm/SnapshotRetentionConfigurationTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/slm/SnapshotRetentionConfigurationTests.java
index cf4672d183ad..e87759c760c2 100644
--- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/slm/SnapshotRetentionConfigurationTests.java
+++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/slm/SnapshotRetentionConfigurationTests.java
@@ -313,7 +313,7 @@ private SnapshotInfo makeInfo(long startTime) {
         meta.put(SnapshotsService.POLICY_ID_METADATA_FIELD, REPO);
         final int totalShards = between(1, 20);
         SnapshotInfo snapInfo = new SnapshotInfo(
-            new Snapshot(REPO, new SnapshotId("snap-" + randomUUID(), "uuid")),
+            new Snapshot(REPO, new SnapshotId("snap-" + randomIdentifier(), "uuid")),
             Collections.singletonList("foo"),
             Collections.singletonList("bar"),
             Collections.emptyList(),
diff --git a/x-pack/plugin/core/template-resources/src/main/resources/ecs@mappings.json b/x-pack/plugin/core/template-resources/src/main/resources/ecs@mappings.json
index 138a8d763bae..997bd942881a 100644
--- a/x-pack/plugin/core/template-resources/src/main/resources/ecs@mappings.json
+++ b/x-pack/plugin/core/template-resources/src/main/resources/ecs@mappings.json
@@ -155,7 +155,11 @@
               "ingested",
               "*.ingested",
               "*.start",
-              "*.end"
+              "*.end",
+              "*.indicator.first_seen",
+              "*.indicator.last_seen",
+              "*.indicator.modified_at",
+              "*threat.enrichments.matched.occurred"
             ],
             "unmatch_mapping_type": "object"
           }
diff --git a/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/IndexDeprecationChecksTests.java b/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/IndexDeprecationChecksTests.java
index 62f89f650dec..18872d00d54a 100644
--- a/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/IndexDeprecationChecksTests.java
+++ b/x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/IndexDeprecationChecksTests.java
@@ -160,7 +160,7 @@ public void testCamelCaseDeprecation() throws IOException {
             + "} }";
 
         IndexMetadata simpleIndex = IndexMetadata.builder(randomAlphaOfLengthBetween(5, 10))
-            .settings(settings(IndexVersions.V_7_0_0))
+            .settings(settings(IndexVersions.MINIMUM_COMPATIBLE))
             .numberOfShards(1)
             .numberOfReplicas(1)
             .putMapping(simpleMapping)
diff --git a/x-pack/plugin/downsample/qa/rest/build.gradle b/x-pack/plugin/downsample/qa/rest/build.gradle
index 603d69d695ca..ba5ac7b0c731 100644
--- a/x-pack/plugin/downsample/qa/rest/build.gradle
+++ b/x-pack/plugin/downsample/qa/rest/build.gradle
@@ -29,14 +29,10 @@ artifacts {
 tasks.named('yamlRestTest') {
   usesDefaultDistribution()
 }
-tasks.named('yamlRestTestV7CompatTest') {
+tasks.named('yamlRestCompatTest') {
   usesDefaultDistribution()
 }
 if (BuildParams.inFipsJvm){
   // This test cluster is using a BASIC license and FIPS 140 mode is not supported in BASIC
   tasks.named("yamlRestTest").configure{enabled = false }
 }
-
-tasks.named("yamlRestTestV7CompatTransform").configure { task ->
-  task.skipTest("rollup/10_basic/Rollup index", "Downsample for TSDB changed the configuration")
-}
diff --git a/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleTransportFailureIT.java b/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleTransportFailureIT.java
index d94d609cf347..365f31f8e5fe 100644
--- a/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleTransportFailureIT.java
+++ b/x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleTransportFailureIT.java
@@ -267,6 +267,7 @@ public void testNoDisruption() {
         // GIVEN
 
         final DownsampleAction.Request downsampleRequest = new DownsampleAction.Request(
+            TEST_REQUEST_TIMEOUT,
             SOURCE_INDEX_NAME,
             TARGET_INDEX_NAME,
             WAIT_TIMEOUT,
@@ -294,6 +295,7 @@ public void testDownsampleActionExceptionDisruption() {
         // GIVEN
         final MockTransportService coordinator = MockTransportService.getInstance(testCluster.coordinator);
         final DownsampleAction.Request downsampleRequest = new DownsampleAction.Request(
+            TEST_REQUEST_TIMEOUT,
             SOURCE_INDEX_NAME,
             TARGET_INDEX_NAME,
             WAIT_TIMEOUT,
diff --git a/x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/RestDownsampleAction.java b/x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/RestDownsampleAction.java
index 8324265c3a78..eb8dfe72850a 100644
--- a/x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/RestDownsampleAction.java
+++ b/x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/RestDownsampleAction.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.RestUtils;
 import org.elasticsearch.rest.Scope;
 import org.elasticsearch.rest.ServerlessScope;
 import org.elasticsearch.rest.action.RestToXContentListener;
@@ -40,6 +41,7 @@ protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient
             config = DownsampleConfig.fromXContent(parser);
         }
         DownsampleAction.Request request = new DownsampleAction.Request(
+            RestUtils.getMasterNodeTimeout(restRequest),
             sourceIndex,
             targetIndex,
             TimeValue.parseTimeValue(timeout, null, "wait_timeout"),
diff --git a/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java b/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java
index 3a696a196175..812b48ee4cae 100644
--- a/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java
+++ b/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java
@@ -594,7 +594,7 @@ public void onFailure(Exception e) {
         };
         client().execute(
             DownsampleAction.INSTANCE,
-            new DownsampleAction.Request(sourceIndex, downsampleIndex, TIMEOUT, config),
+            new DownsampleAction.Request(TEST_REQUEST_TIMEOUT, sourceIndex, downsampleIndex, TIMEOUT, config),
             downsampleListener
         );
         assertBusy(() -> {
@@ -607,7 +607,10 @@ public void onFailure(Exception e) {
 
         assertBusy(() -> {
             try {
-                client().execute(DownsampleAction.INSTANCE, new DownsampleAction.Request(sourceIndex, downsampleIndex, TIMEOUT, config));
+                client().execute(
+                    DownsampleAction.INSTANCE,
+                    new DownsampleAction.Request(TEST_REQUEST_TIMEOUT, sourceIndex, downsampleIndex, TIMEOUT, config)
+                );
             } catch (ElasticsearchException e) {
                 fail("transient failure due to overlapping downsample operations");
             }
@@ -1145,7 +1148,10 @@ private void prepareSourceIndex(final String sourceIndex, boolean blockWrite) {
 
     private void downsample(String sourceIndex, String downsampleIndex, DownsampleConfig config) {
         assertAcked(
-            client().execute(DownsampleAction.INSTANCE, new DownsampleAction.Request(sourceIndex, downsampleIndex, TIMEOUT, config))
+            client().execute(
+                DownsampleAction.INSTANCE,
+                new DownsampleAction.Request(TEST_REQUEST_TIMEOUT, sourceIndex, downsampleIndex, TIMEOUT, config)
+            )
         );
     }
 
@@ -1176,7 +1182,11 @@ private void assertDownsampleIndex(String sourceIndex, String downsampleIndex, D
             .map(mappingMetadata -> mappingMetadata.getValue().sourceAsMap())
             .orElseThrow(() -> new IllegalArgumentException("No mapping found for downsample source index [" + sourceIndex + "]"));
 
-        final IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().getMetadata().index(sourceIndex);
+        final IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .getMetadata()
+            .index(sourceIndex);
         final IndicesService indicesService = getInstanceFromNode(IndicesService.class);
         final MapperService mapperService = indicesService.createIndexMapperServiceForValidation(indexMetadata);
         final CompressedXContent sourceIndexCompressedXContent = new CompressedXContent(sourceIndexMappings);
diff --git a/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleDataStreamTests.java b/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleDataStreamTests.java
index 834a1e887caa..c705b3c6a98d 100644
--- a/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleDataStreamTests.java
+++ b/x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleDataStreamTests.java
@@ -98,6 +98,7 @@ public void testDataStreamDownsample() throws ExecutionException, InterruptedExc
         // WHEN (simulate downsampling as done by an ILM action)
         final String downsampleTargetIndex = DataStream.BACKING_INDEX_PREFIX + dataStreamName + "-downsample-1h";
         final DownsampleAction.Request downsampleRequest = new DownsampleAction.Request(
+            TEST_REQUEST_TIMEOUT,
             rolloverResponse.getOldIndex(),
             downsampleTargetIndex,
             TIMEOUT,
diff --git a/x-pack/plugin/enrich/src/internalClusterTest/java/org/elasticsearch/xpack/enrich/EnrichMultiNodeIT.java b/x-pack/plugin/enrich/src/internalClusterTest/java/org/elasticsearch/xpack/enrich/EnrichMultiNodeIT.java
index 62a5098f7a1e..c7eb24ba5f62 100644
--- a/x-pack/plugin/enrich/src/internalClusterTest/java/org/elasticsearch/xpack/enrich/EnrichMultiNodeIT.java
+++ b/x-pack/plugin/enrich/src/internalClusterTest/java/org/elasticsearch/xpack/enrich/EnrichMultiNodeIT.java
@@ -18,9 +18,7 @@
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.core.Strings;
@@ -29,7 +27,6 @@
 import org.elasticsearch.reindex.ReindexPlugin;
 import org.elasticsearch.tasks.TaskInfo;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.core.XPackSettings;
 import org.elasticsearch.xpack.core.enrich.EnrichPolicy;
 import org.elasticsearch.xpack.core.enrich.action.DeleteEnrichPolicyAction;
@@ -203,7 +200,7 @@ public void testExecutePolicyWithDedicatedMasterNodes() throws Exception {
         var getTaskRequest = new GetTaskRequest().setTaskId(executePolicyResponse.getTaskId()).setWaitForCompletion(true);
         clusterAdmin().getTask(getTaskRequest).actionGet();
 
-        var discoNodes = clusterAdmin().state(new ClusterStateRequest()).actionGet().getState().nodes();
+        var discoNodes = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).actionGet().getState().nodes();
         assertThat(discoNodes.get(executePolicyResponse.getTaskId().getNodeId()).isMasterNode(), is(false));
     }
 
@@ -230,7 +227,7 @@ public void testExecutePolicyNeverOnElectedMaster() throws Exception {
         var getTaskRequest = new GetTaskRequest().setTaskId(executePolicyResponse.getTaskId()).setWaitForCompletion(true);
         clusterAdmin().getTask(getTaskRequest).actionGet();
 
-        var discoNodes = clusterAdmin().state(new ClusterStateRequest()).actionGet().getState().nodes();
+        var discoNodes = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).actionGet().getState().nodes();
         assertThat(executePolicyResponse.getTaskId().getNodeId(), not(equalTo(discoNodes.getMasterNodeId())));
     }
 
@@ -352,11 +349,9 @@ private static void createPipeline() {
     }
 
     private static void createPipeline(String policyName, String pipelineName) {
-        String pipelineBody = Strings.format("""
+        putJsonPipeline(pipelineName, Strings.format("""
             {
               "processors": [ { "enrich": { "policy_name": "%s", "field": "%s", "target_field": "user" } } ]
-            }""", policyName, MATCH_FIELD);
-        PutPipelineRequest request = new PutPipelineRequest(pipelineName, new BytesArray(pipelineBody), XContentType.JSON);
-        clusterAdmin().putPipeline(request).actionGet();
+            }""", policyName, MATCH_FIELD));
     }
 }
diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyReindexPipeline.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyReindexPipeline.java
index 5b7020c3f2bb..8d9da1ba631f 100644
--- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyReindexPipeline.java
+++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyReindexPipeline.java
@@ -9,6 +9,7 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ingest.PutPipelineRequest;
+import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.cluster.ClusterState;
@@ -67,8 +68,7 @@ static boolean exists(ClusterState clusterState) {
      */
     public static void create(Client client, ActionListener<AcknowledgedResponse> listener) {
         final BytesReference pipeline = BytesReference.bytes(currentEnrichPipelineDefinition(XContentType.JSON));
-        final PutPipelineRequest request = new PutPipelineRequest(pipelineName(), pipeline, XContentType.JSON);
-        client.admin().cluster().putPipeline(request, listener);
+        client.execute(PutPipelineTransportAction.TYPE, new PutPipelineRequest(pipelineName(), pipeline, XContentType.JSON), listener);
     }
 
     private static XContentBuilder currentEnrichPipelineDefinition(XContentType xContentType) {
diff --git a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunner.java b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunner.java
index cab115ddc496..a279eac5befc 100644
--- a/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunner.java
+++ b/x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunner.java
@@ -51,6 +51,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.util.iterable.Iterables;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.mapper.Mapper;
@@ -171,7 +172,7 @@ private static List<Map<String, Object>> toMappings(GetIndexResponse response) {
     private Map<String, Object> getMappings(final GetIndexResponse getIndexResponse, final String sourceIndexName) {
         Map<String, MappingMetadata> mappings = getIndexResponse.mappings();
         MappingMetadata indexMapping = mappings.get(sourceIndexName);
-        if (indexMapping == MappingMetadata.EMPTY_MAPPINGS) {
+        if (MappingMetadata.EMPTY_MAPPINGS.equals(indexMapping)) {
             throw new ElasticsearchException(
                 "Enrich policy execution for [{}] failed. No mapping available on source [{}] included in [{}]",
                 policyName,
@@ -684,7 +685,10 @@ private void setIndexReadOnly(ActionListener<AcknowledgedResponse> listener) {
     }
 
     private void waitForIndexGreen(ActionListener<ClusterHealthResponse> listener) {
-        ClusterHealthRequest request = new ClusterHealthRequest(enrichIndexName).waitForGreenStatus();
+        ClusterHealthRequest request = new ClusterHealthRequest(
+            TimeValue.THIRTY_SECONDS /* TODO should this be longer/configurable? */ ,
+            enrichIndexName
+        ).waitForGreenStatus();
         enrichOriginClient().admin().cluster().health(request, listener);
     }
 
diff --git a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/BasicEnrichTests.java b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/BasicEnrichTests.java
index d17728fdd803..afb5da07268c 100644
--- a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/BasicEnrichTests.java
+++ b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/BasicEnrichTests.java
@@ -16,9 +16,7 @@
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.cluster.service.ClusterService;
-import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.ingest.common.IngestCommonPlugin;
@@ -26,7 +24,6 @@
 import org.elasticsearch.reindex.ReindexPlugin;
 import org.elasticsearch.script.mustache.MustachePlugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
-import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.core.XPackSettings;
 import org.elasticsearch.xpack.core.enrich.EnrichPolicy;
 import org.elasticsearch.xpack.core.enrich.action.EnrichStatsAction;
@@ -99,7 +96,7 @@ public void testIngestDataWithMatchProcessor() {
             .actionGet();
 
         String pipelineName = "my-pipeline";
-        String pipelineBody = Strings.format("""
+        putJsonPipeline(pipelineName, Strings.format("""
             {
               "processors": [
                 {
@@ -111,9 +108,7 @@ public void testIngestDataWithMatchProcessor() {
                   }
                 }
               ]
-            }""", policyName, MATCH_FIELD, maxMatches);
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest(pipelineName, new BytesArray(pipelineBody), XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).actionGet();
+            }""", policyName, MATCH_FIELD, maxMatches));
 
         BulkRequest bulkRequest = new BulkRequest("my-index");
         for (int i = 0; i < numDocs; i++) {
@@ -195,7 +190,7 @@ public void testIngestDataWithGeoMatchProcessor() {
             .actionGet();
 
         String pipelineName = "my-pipeline";
-        String pipelineBody = Strings.format("""
+        putJsonPipeline(pipelineName, Strings.format("""
             {
               "processors": [
                 {
@@ -207,9 +202,7 @@ public void testIngestDataWithGeoMatchProcessor() {
                   }
                 }
               ]
-            }""", policyName, matchField);
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest(pipelineName, new BytesArray(pipelineBody), XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).actionGet();
+            }""", policyName, matchField));
 
         BulkRequest bulkRequest = new BulkRequest("my-index");
         IndexRequest indexRequest = new IndexRequest();
@@ -258,12 +251,10 @@ public void testMultiplePolicies() {
                 .actionGet();
 
             String pipelineName = "pipeline" + i;
-            String pipelineBody = Strings.format("""
+            putJsonPipeline(pipelineName, Strings.format("""
                 {
                   "processors": [ { "enrich": { "policy_name": "%s", "field": "key", "target_field": "target" } } ]
-                }""", policyName);
-            PutPipelineRequest putPipelineRequest = new PutPipelineRequest(pipelineName, new BytesArray(pipelineBody), XContentType.JSON);
-            clusterAdmin().putPipeline(putPipelineRequest).actionGet();
+                }""", policyName));
         }
 
         BulkRequest bulkRequest = new BulkRequest("my-index");
@@ -316,12 +307,10 @@ public void testAsyncTaskExecute() throws Exception {
         });
 
         String pipelineName = "test-pipeline";
-        String pipelineBody = Strings.format("""
+        putJsonPipeline(pipelineName, Strings.format("""
             {
               "processors": [ { "enrich": { "policy_name": "%s", "field": "key", "target_field": "target" } } ]
-            }""", policyName);
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest(pipelineName, new BytesArray(pipelineBody), XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).actionGet();
+            }""", policyName));
 
         BulkRequest bulkRequest = new BulkRequest("my-index");
         int numTestDocs = randomIntBetween(3, 10);
@@ -359,13 +348,14 @@ public void testTemplating() throws Exception {
             .actionGet();
 
         String pipelineName = "my-pipeline";
-        String pipelineBody = Strings.format(
-            """
-                {"processors": [{"enrich": {"policy_name":"%s", "field": "{{indirection1}}", "target_field": "{{indirection2}}"}}]}""",
-            policyName
+        putJsonPipeline(
+            pipelineName,
+            Strings.format(
+                """
+                    {"processors": [{"enrich": {"policy_name":"%s", "field": "{{indirection1}}", "target_field": "{{indirection2}}"}}]}""",
+                policyName
+            )
         );
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest(pipelineName, new BytesArray(pipelineBody), XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).actionGet();
 
         IndexRequest indexRequest = new IndexRequest("my-index").id("1")
             .setPipeline(pipelineName)
@@ -404,8 +394,7 @@ public void testFailureAfterEnrich() throws Exception {
             + "\", \"field\": \"email\", \"target_field\": \"users\"}},"
             + "{ \"foreach\": {\"field\":\"users\", \"processor\":{\"append\":{\"field\":\"matched2\",\"value\":\"{{_ingest._value}}\"}}}}"
             + "]}";
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest(pipelineName, new BytesArray(pipelineBody), XContentType.JSON);
-        clusterAdmin().putPipeline(putPipelineRequest).actionGet();
+        putJsonPipeline(pipelineName, pipelineBody);
 
         for (int i = 0; i < 5; i++) {
             IndexRequest indexRequest = new IndexRequest("my-index").id("1")
diff --git a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyUpdateTests.java b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyUpdateTests.java
index b015e9790917..efbe39b244de 100644
--- a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyUpdateTests.java
+++ b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyUpdateTests.java
@@ -7,8 +7,6 @@
 package org.elasticsearch.xpack.enrich;
 
 import org.elasticsearch.ResourceAlreadyExistsException;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.ingest.IngestService;
 import org.elasticsearch.ingest.Pipeline;
@@ -16,7 +14,6 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.reindex.ReindexPlugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
-import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.core.XPackSettings;
 import org.elasticsearch.xpack.core.enrich.EnrichPolicy;
 import org.elasticsearch.xpack.core.enrich.action.ExecuteEnrichPolicyAction;
@@ -63,10 +60,8 @@ public void testUpdatePolicyOnly() {
             equalTo(true)
         );
 
-        String pipelineConfig = """
-            {"processors":[{"enrich": {"policy_name": "my_policy", "field": "key", "target_field": "target"}}]}""";
-        PutPipelineRequest putPipelineRequest = new PutPipelineRequest("1", new BytesArray(pipelineConfig), XContentType.JSON);
-        assertAcked(clusterAdmin().putPipeline(putPipelineRequest).actionGet());
+        putJsonPipeline("1", """
+            {"processors":[{"enrich": {"policy_name": "my_policy", "field": "key", "target_field": "target"}}]}""");
         Pipeline pipelineInstance1 = ingestService.getPipeline("1");
         assertThat(pipelineInstance1.getProcessors().get(0), instanceOf(MatchProcessor.class));
 
diff --git a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichResiliencyTests.java b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichResiliencyTests.java
index 3a2bfd87cff1..881c3f9245d2 100644
--- a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichResiliencyTests.java
+++ b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichResiliencyTests.java
@@ -12,10 +12,7 @@
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.ingest.common.IngestCommonPlugin;
@@ -23,7 +20,6 @@
 import org.elasticsearch.reindex.ReindexPlugin;
 import org.elasticsearch.test.ESSingleNodeTestCase;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xcontent.json.JsonXContent;
 import org.elasticsearch.xpack.core.XPackSettings;
 import org.elasticsearch.xpack.core.enrich.EnrichPolicy;
@@ -91,9 +87,7 @@ public void testWriteThreadLivenessBackToBack() throws Exception {
             new ExecuteEnrichPolicyAction.Request(TEST_REQUEST_TIMEOUT, enrichPolicyName).setWaitForCompletion(true)
         ).actionGet();
 
-        XContentBuilder pipe1 = JsonXContent.contentBuilder();
-        pipe1.startObject();
-        {
+        putJsonPipeline(enrichPipelineName, (pipe1, params) -> {
             pipe1.startArray("processors");
             {
                 pipe1.startObject();
@@ -119,14 +113,8 @@ public void testWriteThreadLivenessBackToBack() throws Exception {
                 }
                 pipe1.endObject();
             }
-            pipe1.endArray();
-        }
-        pipe1.endObject();
-
-        client().execute(
-            PutPipelineTransportAction.TYPE,
-            new PutPipelineRequest(enrichPipelineName, BytesReference.bytes(pipe1), XContentType.JSON)
-        ).actionGet();
+            return pipe1.endArray();
+        });
 
         client().admin().indices().create(new CreateIndexRequest(enrichedIndexName)).actionGet();
 
@@ -191,9 +179,7 @@ public void testWriteThreadLivenessWithPipeline() throws Exception {
             new ExecuteEnrichPolicyAction.Request(TEST_REQUEST_TIMEOUT, enrichPolicyName).setWaitForCompletion(true)
         ).actionGet();
 
-        XContentBuilder pipe1 = JsonXContent.contentBuilder();
-        pipe1.startObject();
-        {
+        putJsonPipeline(enrichPipelineName1, (pipe1, params) -> {
             pipe1.startArray("processors");
             {
                 pipe1.startObject();
@@ -217,13 +203,10 @@ public void testWriteThreadLivenessWithPipeline() throws Exception {
                 }
                 pipe1.endObject();
             }
-            pipe1.endArray();
-        }
-        pipe1.endObject();
+            return pipe1.endArray();
+        });
 
-        XContentBuilder pipe2 = JsonXContent.contentBuilder();
-        pipe2.startObject();
-        {
+        putJsonPipeline(enrichPipelineName2, (pipe2, params) -> {
             pipe2.startArray("processors");
             {
                 pipe2.startObject();
@@ -238,19 +221,8 @@ public void testWriteThreadLivenessWithPipeline() throws Exception {
                 }
                 pipe2.endObject();
             }
-            pipe2.endArray();
-        }
-        pipe2.endObject();
-
-        client().execute(
-            PutPipelineTransportAction.TYPE,
-            new PutPipelineRequest(enrichPipelineName1, BytesReference.bytes(pipe1), XContentType.JSON)
-        ).actionGet();
-
-        client().execute(
-            PutPipelineTransportAction.TYPE,
-            new PutPipelineRequest(enrichPipelineName2, BytesReference.bytes(pipe2), XContentType.JSON)
-        ).actionGet();
+            return pipe2.endArray();
+        });
 
         client().admin().indices().create(new CreateIndexRequest(enrichedIndexName)).actionGet();
 
diff --git a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/action/TransportDeleteEnrichPolicyActionTests.java b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/action/TransportDeleteEnrichPolicyActionTests.java
index 32f39b0de1ef..568f1074d1a5 100644
--- a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/action/TransportDeleteEnrichPolicyActionTests.java
+++ b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/action/TransportDeleteEnrichPolicyActionTests.java
@@ -136,7 +136,7 @@ public void testDeleteIsNotLocked() throws Exception {
             Settings settings = Settings.builder()
                 .put(DestructiveOperations.REQUIRES_NAME_SETTING.getKey(), destructiveRequiresName)
                 .build();
-            assertAcked(clusterAdmin().prepareUpdateSettings().setPersistentSettings(settings));
+            assertAcked(clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setPersistentSettings(settings));
         }
 
         createIndex(EnrichPolicy.getIndexName(name, 1001));
@@ -174,7 +174,7 @@ public void onFailure(final Exception e) {
 
         if (destructiveRequiresName) {
             Settings settings = Settings.builder().putNull(DestructiveOperations.REQUIRES_NAME_SETTING.getKey()).build();
-            assertAcked(clusterAdmin().prepareUpdateSettings().setPersistentSettings(settings));
+            assertAcked(clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setPersistentSettings(settings));
         }
 
         EnrichPolicyLocks enrichPolicyLocks = getInstanceFromNode(EnrichPolicyLocks.class);
diff --git a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle
index b0f1e8bd026b..eb14d6fe4695 100644
--- a/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle
+++ b/x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle
@@ -6,8 +6,6 @@
  * Side Public License, v 1.
  */
 
-import org.elasticsearch.gradle.Version
-import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
@@ -21,9 +19,6 @@ dependencies {
   javaRestTestImplementation(testArtifact(project(":qa:full-cluster-restart"), "javaRestTest"))
 }
 
-assert Version.fromString(VersionProperties.getVersions().get("elasticsearch")).getMajor() == 8:
-  "If we are targeting a branch other than 8, we should enable migration tests"
-
 BuildParams.bwcVersions.withWireCompatible(v -> v.after("8.8.0")) { bwcVersion, baseName ->
   tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {
     usesBwcDistribution(bwcVersion)
diff --git a/x-pack/plugin/ent-search/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/xpack/application/FullClusterRestartIT.java b/x-pack/plugin/ent-search/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/xpack/application/FullClusterRestartIT.java
index e01b8de94185..5e3fd5eb6d11 100644
--- a/x-pack/plugin/ent-search/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/xpack/application/FullClusterRestartIT.java
+++ b/x-pack/plugin/ent-search/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/xpack/application/FullClusterRestartIT.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.elasticsearch.test.rest.ObjectPath;
@@ -25,6 +26,7 @@
 import static org.elasticsearch.Version.V_8_12_0;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
+@UpdateForV9 // Investigate what needs to be added in terms of 9.0 migration testing
 public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCase {
     // DSL was introduced with version 8.12.0 of ES.
     private static final Version DSL_DEFAULT_RETENTION_VERSION = V_8_12_0;
diff --git a/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EsEQLCorrectnessIT.java b/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EsEQLCorrectnessIT.java
index 1d5ed1ffdcba..478e2f93db25 100644
--- a/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EsEQLCorrectnessIT.java
+++ b/x-pack/plugin/eql/qa/correctness/src/javaRestTest/java/org/elasticsearch/xpack/eql/EsEQLCorrectnessIT.java
@@ -13,6 +13,7 @@
 import org.apache.http.HttpHost;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.lucene.tests.util.LuceneTestCase.AwaitsFix;
 import org.apache.lucene.tests.util.TimeUnits;
 import org.elasticsearch.client.HttpAsyncResponseConsumerFactory;
 import org.elasticsearch.client.Request;
@@ -45,6 +46,7 @@
 
 @TimeoutSuite(millis = 30 * TimeUnits.MINUTE)
 @TestLogging(value = "org.elasticsearch.xpack.eql.EsEQLCorrectnessIT:INFO", reason = "Log query execution time")
+@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/112572")
 public class EsEQLCorrectnessIT extends ESRestTestCase {
 
     private static final String PARAM_FORMATTING = "%1$s";
diff --git a/x-pack/plugin/eql/qa/correctness/src/javaRestTest/resources/config.properties b/x-pack/plugin/eql/qa/correctness/src/javaRestTest/resources/config.properties
index dec98c95b625..d9a4d843bf92 100644
--- a/x-pack/plugin/eql/qa/correctness/src/javaRestTest/resources/config.properties
+++ b/x-pack/plugin/eql/qa/correctness/src/javaRestTest/resources/config.properties
@@ -11,7 +11,7 @@ fetch_size=1000
 size=2000
 result_position=tail
 gcs_repo_name=eql_correctness_gcs_repo
-gcs_snapshot_name=correctness-snapshot_es7.10_lucene8.7.0
+gcs_snapshot_name=correctness-snapshot_es8.16_lucene9.11.1
 gcs_bucket_name=eql-gcs
 gcs_base_path=correctness-data
 gcs_client_name=eql_test
diff --git a/x-pack/plugin/eql/qa/rest/build.gradle b/x-pack/plugin/eql/qa/rest/build.gradle
index 5f1911dd579b..d5b0cc42091f 100644
--- a/x-pack/plugin/eql/qa/rest/build.gradle
+++ b/x-pack/plugin/eql/qa/rest/build.gradle
@@ -26,7 +26,7 @@ tasks.named('javaRestTest') {
 tasks.named('yamlRestTest') {
   usesDefaultDistribution()
 }
-tasks.named('yamlRestTestV7CompatTest') {
+tasks.named('yamlRestCompatTest') {
   usesDefaultDistribution()
 }
 
diff --git a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/NumericUtils.java b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/NumericUtils.java
index 3bff45db5023..1f960f79c790 100644
--- a/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/NumericUtils.java
+++ b/x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/NumericUtils.java
@@ -88,6 +88,18 @@ public static Number unsignedLongAsNumber(long l) {
         return l < 0 ? twosComplement(l) : LONG_MAX_PLUS_ONE_AS_BIGINTEGER.add(BigInteger.valueOf(l));
     }
 
+    /**
+     * Converts an unsigned long value "encoded" into a (signed) long.
+     * In case of overflow, an ArithmeticException is thrown.
+     */
+    public static long unsignedLongAsLongExact(long l) {
+        if (l < 0) {
+            return twosComplement(l);
+        }
+
+        throw new ArithmeticException(UNSIGNED_LONG_OVERFLOW);
+    }
+
     public static BigInteger unsignedLongAsBigInteger(long l) {
         return l < 0 ? BigInteger.valueOf(twosComplement(l)) : LONG_MAX_PLUS_ONE_AS_BIGINTEGER.add(BigInteger.valueOf(l));
     }
diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorImplementer.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorImplementer.java
index 67ce0cf70970..48269e7e2af9 100644
--- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorImplementer.java
+++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorImplementer.java
@@ -240,8 +240,10 @@ private TypeSpec type() {
         builder.addMethod(intermediateStateDesc());
         builder.addMethod(intermediateBlockCount());
         builder.addMethod(addRawInput());
-        builder.addMethod(addRawVector());
-        builder.addMethod(addRawBlock());
+        builder.addMethod(addRawVector(false));
+        builder.addMethod(addRawVector(true));
+        builder.addMethod(addRawBlock(false));
+        builder.addMethod(addRawBlock(true));
         builder.addMethod(addIntermediateInput());
         builder.addMethod(evaluateIntermediate());
         builder.addMethod(evaluateFinal());
@@ -345,22 +347,48 @@ private MethodSpec intermediateBlockCount() {
 
     private MethodSpec addRawInput() {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("addRawInput");
-        builder.addAnnotation(Override.class).addModifiers(Modifier.PUBLIC).addParameter(PAGE, "page");
+        builder.addAnnotation(Override.class).addModifiers(Modifier.PUBLIC).addParameter(PAGE, "page").addParameter(BOOLEAN_VECTOR, "mask");
         if (stateTypeHasFailed) {
             builder.beginControlFlow("if (state.failed())");
             builder.addStatement("return");
             builder.endControlFlow();
         }
+        builder.beginControlFlow("if (mask.isConstant())");
+        {
+            builder.beginControlFlow("if (mask.getBoolean(0) == false)");
+            {
+                builder.addComment("Entire page masked away");
+                builder.addStatement("return");
+            }
+            builder.endControlFlow();
+            builder.addComment("No masking");
+            builder.addStatement("$T block = page.getBlock(channels.get(0))", valueBlockType(init, combine));
+            builder.addStatement("$T vector = block.asVector()", valueVectorType(init, combine));
+            builder.beginControlFlow("if (vector != null)");
+            builder.addStatement("addRawVector(vector)");
+            builder.nextControlFlow("else");
+            builder.addStatement("addRawBlock(block)");
+            builder.endControlFlow();
+            builder.addStatement("return");
+        }
+        builder.endControlFlow();
+        builder.addComment("Some positions masked away, others kept");
         builder.addStatement("$T block = page.getBlock(channels.get(0))", valueBlockType(init, combine));
         builder.addStatement("$T vector = block.asVector()", valueVectorType(init, combine));
-        builder.beginControlFlow("if (vector != null)").addStatement("addRawVector(vector)");
-        builder.nextControlFlow("else").addStatement("addRawBlock(block)").endControlFlow();
+        builder.beginControlFlow("if (vector != null)");
+        builder.addStatement("addRawVector(vector, mask)");
+        builder.nextControlFlow("else");
+        builder.addStatement("addRawBlock(block, mask)");
+        builder.endControlFlow();
         return builder.build();
     }
 
-    private MethodSpec addRawVector() {
+    private MethodSpec addRawVector(boolean masked) {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("addRawVector");
         builder.addModifiers(Modifier.PRIVATE).addParameter(valueVectorType(init, combine), "vector");
+        if (masked) {
+            builder.addParameter(BOOLEAN_VECTOR, "mask");
+        }
 
         if (stateTypeHasSeen) {
             builder.addStatement("state.seen(true)");
@@ -372,6 +400,9 @@ private MethodSpec addRawVector() {
 
         builder.beginControlFlow("for (int i = 0; i < vector.getPositionCount(); i++)");
         {
+            if (masked) {
+                builder.beginControlFlow("if (mask.getBoolean(i) == false)").addStatement("continue").endControlFlow();
+            }
             combineRawInput(builder, "vector");
         }
         builder.endControlFlow();
@@ -381,9 +412,12 @@ private MethodSpec addRawVector() {
         return builder.build();
     }
 
-    private MethodSpec addRawBlock() {
+    private MethodSpec addRawBlock(boolean masked) {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("addRawBlock");
         builder.addModifiers(Modifier.PRIVATE).addParameter(valueBlockType(init, combine), "block");
+        if (masked) {
+            builder.addParameter(BOOLEAN_VECTOR, "mask");
+        }
 
         if (valuesIsBytesRef) {
             // Add bytes_ref scratch var that will only be used for bytes_ref blocks/vectors
@@ -391,6 +425,9 @@ private MethodSpec addRawBlock() {
         }
         builder.beginControlFlow("for (int p = 0; p < block.getPositionCount(); p++)");
         {
+            if (masked) {
+                builder.beginControlFlow("if (mask.getBoolean(p) == false)").addStatement("continue").endControlFlow();
+            }
             builder.beginControlFlow("if (block.isNull(p))");
             builder.addStatement("continue");
             builder.endControlFlow();
diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java
index 4b1f946a1d17..863db86eb934 100644
--- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java
+++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorProcessor.java
@@ -52,7 +52,7 @@ public Set<String> getSupportedAnnotationTypes() {
 
     @Override
     public SourceVersion getSupportedSourceVersion() {
-        return SourceVersion.RELEASE_17;
+        return SourceVersion.RELEASE_21;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java
index b76b1cc7ea74..b4e74d52ffeb 100644
--- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java
+++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/ConsumeProcessor.java
@@ -48,7 +48,7 @@ public Set<String> getSupportedAnnotationTypes() {
 
     @Override
     public SourceVersion getSupportedSourceVersion() {
-        return SourceVersion.latest();
+        return SourceVersion.RELEASE_21;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java
index 09012c7b3a48..ec3690883366 100644
--- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java
+++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java
@@ -44,7 +44,7 @@ public Set<String> getSupportedAnnotationTypes() {
 
     @Override
     public SourceVersion getSupportedSourceVersion() {
-        return SourceVersion.RELEASE_17;
+        return SourceVersion.RELEASE_21;
     }
 
     @Override
diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java
index 3dffbcf84eb7..23240bbd50ea 100644
--- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java
+++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/GroupingAggregatorImplementer.java
@@ -182,6 +182,7 @@ private TypeSpec type() {
         builder.addMethod(addRawInputLoop(INT_VECTOR, valueVectorType(init, combine)));
         builder.addMethod(addRawInputLoop(INT_BLOCK, valueBlockType(init, combine)));
         builder.addMethod(addRawInputLoop(INT_BLOCK, valueVectorType(init, combine)));
+        builder.addMethod(selectedMayContainUnseenGroups());
         builder.addMethod(addIntermediateInput());
         builder.addMethod(addIntermediateRowInput());
         builder.addMethod(evaluateIntermediate());
@@ -338,6 +339,9 @@ private TypeSpec addInput(Consumer<MethodSpec.Builder> addBlock) {
         addBlock.accept(vector);
         builder.addMethod(vector.build());
 
+        MethodSpec.Builder close = MethodSpec.methodBuilder("close").addAnnotation(Override.class).addModifiers(Modifier.PUBLIC);
+        builder.addMethod(close.build());
+
         return builder.build();
     }
 
@@ -485,6 +489,14 @@ private void combineRawInputForBytesRef(MethodSpec.Builder builder, String block
         builder.addStatement("$T.combine(state, groupId, $L.getBytesRef($L, scratch))", declarationType, blockVariable, offsetVariable);
     }
 
+    private MethodSpec selectedMayContainUnseenGroups() {
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("selectedMayContainUnseenGroups");
+        builder.addAnnotation(Override.class).addModifiers(Modifier.PUBLIC);
+        builder.addParameter(SEEN_GROUP_IDS, "seenGroupIds");
+        builder.addStatement("state.enableGroupIdTracking(seenGroupIds)");
+        return builder.build();
+    }
+
     private MethodSpec addIntermediateInput() {
         MethodSpec.Builder builder = MethodSpec.methodBuilder("addIntermediateInput");
         builder.addAnnotation(Override.class).addModifiers(Modifier.PUBLIC);
diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/MvEvaluatorImplementer.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/MvEvaluatorImplementer.java
index 993b8363fb35..d6e062facdbf 100644
--- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/MvEvaluatorImplementer.java
+++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/MvEvaluatorImplementer.java
@@ -107,7 +107,7 @@ public MvEvaluatorImplementer(
             this.resultType = TypeName.get(processFunction.getReturnType());
         }
         this.singleValueFunction = SingleValueFunction.from(declarationType, singleValueMethodName, resultType, fieldType);
-        this.ascendingFunction = AscendingFunction.from(this, declarationType, ascendingMethodName);
+        this.ascendingFunction = AscendingFunction.from(this, declarationType, workType, ascendingMethodName);
         this.warnExceptions = warnExceptions;
         this.implementation = ClassName.get(
             elements.getPackageOf(declarationType).toString(),
@@ -511,7 +511,7 @@ private void call(MethodSpec.Builder builder) {
      * Function handling blocks of ascending values.
      */
     private class AscendingFunction {
-        static AscendingFunction from(MvEvaluatorImplementer impl, TypeElement declarationType, String name) {
+        static AscendingFunction from(MvEvaluatorImplementer impl, TypeElement declarationType, TypeName workType, String name) {
             if (name.equals("")) {
                 return null;
             }
@@ -523,8 +523,9 @@ static AscendingFunction from(MvEvaluatorImplementer impl, TypeElement declarati
                 m -> m.getParameters().size() == 1 && m.getParameters().get(0).asType().getKind() == TypeKind.INT
             );
             if (fn != null) {
-                return impl.new AscendingFunction(fn, false);
+                return impl.new AscendingFunction(fn, false, false);
             }
+            // Block mode without work parameter
             fn = findMethod(
                 declarationType,
                 new String[] { name },
@@ -532,17 +533,31 @@ static AscendingFunction from(MvEvaluatorImplementer impl, TypeElement declarati
                     && m.getParameters().get(1).asType().getKind() == TypeKind.INT
                     && m.getParameters().get(2).asType().getKind() == TypeKind.INT
             );
-            if (fn == null) {
-                throw new IllegalArgumentException("Couldn't find " + declarationType + "#" + name + "(block, int, int)");
+            if (fn != null) {
+                return impl.new AscendingFunction(fn, true, false);
             }
-            return impl.new AscendingFunction(fn, true);
+            // Block mode with work parameter
+            fn = findMethod(
+                declarationType,
+                new String[] { name },
+                m -> m.getParameters().size() == 4
+                    && TypeName.get(m.getParameters().get(0).asType()).equals(workType)
+                    && m.getParameters().get(2).asType().getKind() == TypeKind.INT
+                    && m.getParameters().get(3).asType().getKind() == TypeKind.INT
+            );
+            if (fn != null) {
+                return impl.new AscendingFunction(fn, true, true);
+            }
+            throw new IllegalArgumentException("Couldn't find " + declarationType + "#" + name + "(block, int, int)");
         }
 
         private final List<Object> invocationArgs = new ArrayList<>();
         private final boolean blockMode;
+        private final boolean withWorkParameter;
 
-        private AscendingFunction(ExecutableElement fn, boolean blockMode) {
+        private AscendingFunction(ExecutableElement fn, boolean blockMode, boolean withWorkParameter) {
             this.blockMode = blockMode;
+            this.withWorkParameter = withWorkParameter;
             if (blockMode) {
                 invocationArgs.add(resultType);
             }
@@ -552,7 +567,11 @@ private AscendingFunction(ExecutableElement fn, boolean blockMode) {
 
         private void call(MethodSpec.Builder builder) {
             if (blockMode) {
-                builder.addStatement("$T result = $T.$L(v, first, valueCount)", invocationArgs.toArray());
+                if (withWorkParameter) {
+                    builder.addStatement("$T result = $T.$L(work, v, first, valueCount)", invocationArgs.toArray());
+                } else {
+                    builder.addStatement("$T result = $T.$L(v, first, valueCount)", invocationArgs.toArray());
+                }
             } else {
                 builder.addStatement("int idx = $T.$L(valueCount)", invocationArgs.toArray());
                 fetch(builder, "result", resultType, "first + idx", workType.equals(fieldType) ? "firstScratch" : "valueScratch");
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregatorFunction.java
index e9b4498d5026..37543714717d 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanAggregatorFunction.java
@@ -53,13 +53,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BooleanBlock block = page.getBlock(channels.get(0));
+      BooleanVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BooleanBlock block = page.getBlock(channels.get(0));
     BooleanVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -69,6 +85,15 @@ private void addRawVector(BooleanVector vector) {
     }
   }
 
+  private void addRawVector(BooleanVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      CountDistinctBooleanAggregator.combine(state, vector.getBoolean(i));
+    }
+  }
+
   private void addRawBlock(BooleanBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -82,6 +107,22 @@ private void addRawBlock(BooleanBlock block) {
     }
   }
 
+  private void addRawBlock(BooleanBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        CountDistinctBooleanAggregator.combine(state, block.getBoolean(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanGroupingAggregatorFunction.java
index 98e57b71db41..4cdecd9944f7 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBooleanGroupingAggregatorFunction.java
@@ -73,6 +73,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -85,6 +89,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -144,6 +152,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BooleanVector valu
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregatorFunction.java
index 83917ba21828..77d7e88cf9a9 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -56,13 +57,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -73,6 +90,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      CountDistinctBytesRefAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -87,6 +114,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        CountDistinctBytesRefAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefGroupingAggregatorFunction.java
index 35fd83598b9d..2261a60ff247 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctBytesRefGroupingAggregatorFunction.java
@@ -76,6 +76,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -88,6 +92,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -151,6 +159,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregatorFunction.java
index c720df313bd9..4f0604b4f03c 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.DoubleBlock;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      DoubleBlock block = page.getBlock(channels.get(0));
+      DoubleVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     DoubleBlock block = page.getBlock(channels.get(0));
     DoubleVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(DoubleVector vector) {
     }
   }
 
+  private void addRawVector(DoubleVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      CountDistinctDoubleAggregator.combine(state, vector.getDouble(i));
+    }
+  }
+
   private void addRawBlock(DoubleBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(DoubleBlock block) {
     }
   }
 
+  private void addRawBlock(DoubleBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        CountDistinctDoubleAggregator.combine(state, block.getDouble(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleGroupingAggregatorFunction.java
index 894b81b31136..c769a157e5ec 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctDoubleGroupingAggregatorFunction.java
@@ -78,6 +78,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -90,6 +94,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -149,6 +157,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatAggregatorFunction.java
index aad616eac95a..00e5335138aa 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      FloatBlock block = page.getBlock(channels.get(0));
+      FloatVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     FloatBlock block = page.getBlock(channels.get(0));
     FloatVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(FloatVector vector) {
     }
   }
 
+  private void addRawVector(FloatVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      CountDistinctFloatAggregator.combine(state, vector.getFloat(i));
+    }
+  }
+
   private void addRawBlock(FloatBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(FloatBlock block) {
     }
   }
 
+  private void addRawBlock(FloatBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        CountDistinctFloatAggregator.combine(state, block.getFloat(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatGroupingAggregatorFunction.java
index 5f6b4211e6c5..0b1c93aad5e2 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctFloatGroupingAggregatorFunction.java
@@ -78,6 +78,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -90,6 +94,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -149,6 +157,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntAggregatorFunction.java
index 083c483a9c9b..90b4947b77d9 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      IntBlock block = page.getBlock(channels.get(0));
+      IntVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     IntBlock block = page.getBlock(channels.get(0));
     IntVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(IntVector vector) {
     }
   }
 
+  private void addRawVector(IntVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      CountDistinctIntAggregator.combine(state, vector.getInt(i));
+    }
+  }
+
   private void addRawBlock(IntBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(IntBlock block) {
     }
   }
 
+  private void addRawBlock(IntBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        CountDistinctIntAggregator.combine(state, block.getInt(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntGroupingAggregatorFunction.java
index 83300393e560..7642ca7dcc6a 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctIntGroupingAggregatorFunction.java
@@ -76,6 +76,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -88,6 +92,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -147,6 +155,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongAggregatorFunction.java
index ee6fb5b47044..99dc37d58a88 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      CountDistinctLongAggregator.combine(state, vector.getLong(i));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        CountDistinctLongAggregator.combine(state, block.getLong(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongGroupingAggregatorFunction.java
index 44e9fefb3161..00d0e955ba88 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/CountDistinctLongGroupingAggregatorFunction.java
@@ -78,6 +78,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -90,6 +94,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -149,6 +157,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanAggregatorFunction.java
index 2ffbcfc2d945..38de18bea776 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanAggregatorFunction.java
@@ -53,13 +53,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BooleanBlock block = page.getBlock(channels.get(0));
+      BooleanVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BooleanBlock block = page.getBlock(channels.get(0));
     BooleanVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -70,6 +86,16 @@ private void addRawVector(BooleanVector vector) {
     }
   }
 
+  private void addRawVector(BooleanVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.booleanValue(MaxBooleanAggregator.combine(state.booleanValue(), vector.getBoolean(i)));
+    }
+  }
+
   private void addRawBlock(BooleanBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -84,6 +110,23 @@ private void addRawBlock(BooleanBlock block) {
     }
   }
 
+  private void addRawBlock(BooleanBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.booleanValue(MaxBooleanAggregator.combine(state.booleanValue(), block.getBoolean(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java
index 084e346a7b09..dd7760273bfa 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBooleanGroupingAggregatorFunction.java
@@ -73,6 +73,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -85,6 +89,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -144,6 +152,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BooleanVector valu
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefAggregatorFunction.java
index 62897c61ea80..1a4d440d2b8b 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefAggregatorFunction.java
@@ -56,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -73,6 +89,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      MaxBytesRefAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -87,6 +113,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        MaxBytesRefAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefGroupingAggregatorFunction.java
index a50cf8593a6e..fcb87428e9b7 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxBytesRefGroupingAggregatorFunction.java
@@ -76,6 +76,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -88,6 +92,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -151,6 +159,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleAggregatorFunction.java
index f78a8773ccfc..266977e2a689 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      DoubleBlock block = page.getBlock(channels.get(0));
+      DoubleVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     DoubleBlock block = page.getBlock(channels.get(0));
     DoubleVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(DoubleVector vector) {
     }
   }
 
+  private void addRawVector(DoubleVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.doubleValue(MaxDoubleAggregator.combine(state.doubleValue(), vector.getDouble(i)));
+    }
+  }
+
   private void addRawBlock(DoubleBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(DoubleBlock block) {
     }
   }
 
+  private void addRawBlock(DoubleBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.doubleValue(MaxDoubleAggregator.combine(state.doubleValue(), block.getDouble(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleGroupingAggregatorFunction.java
index b874bc43dc23..42588ea81367 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxDoubleGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatAggregatorFunction.java
index 0dcef4341727..3a4dcaa3289f 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      FloatBlock block = page.getBlock(channels.get(0));
+      FloatVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     FloatBlock block = page.getBlock(channels.get(0));
     FloatVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(FloatVector vector) {
     }
   }
 
+  private void addRawVector(FloatVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.floatValue(MaxFloatAggregator.combine(state.floatValue(), vector.getFloat(i)));
+    }
+  }
+
   private void addRawBlock(FloatBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(FloatBlock block) {
     }
   }
 
+  private void addRawBlock(FloatBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.floatValue(MaxFloatAggregator.combine(state.floatValue(), block.getFloat(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatGroupingAggregatorFunction.java
index f3ebd468ebc7..006ee147b15e 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxFloatGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntAggregatorFunction.java
index 6f83ee722487..d5c0cea24349 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      IntBlock block = page.getBlock(channels.get(0));
+      IntVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     IntBlock block = page.getBlock(channels.get(0));
     IntVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(IntVector vector) {
     }
   }
 
+  private void addRawVector(IntVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.intValue(MaxIntAggregator.combine(state.intValue(), vector.getInt(i)));
+    }
+  }
+
   private void addRawBlock(IntBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(IntBlock block) {
     }
   }
 
+  private void addRawBlock(IntBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.intValue(MaxIntAggregator.combine(state.intValue(), block.getInt(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntGroupingAggregatorFunction.java
index 8b364e7a02e9..faea5a63eac9 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIntGroupingAggregatorFunction.java
@@ -73,6 +73,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -85,6 +89,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -144,6 +152,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpAggregatorFunction.java
index 9f714246ea33..13c74775d279 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpAggregatorFunction.java
@@ -56,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -73,6 +89,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      MaxIpAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -87,6 +113,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        MaxIpAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpGroupingAggregatorFunction.java
index a722d95f3b10..f5715949094f 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxIpGroupingAggregatorFunction.java
@@ -76,6 +76,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -88,6 +92,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -151,6 +159,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongAggregatorFunction.java
index 8826128a6883..d2acff0509df 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.longValue(MaxLongAggregator.combine(state.longValue(), vector.getLong(i)));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.longValue(MaxLongAggregator.combine(state.longValue(), block.getLong(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongGroupingAggregatorFunction.java
index fee2f5a9c2e7..a5f115ad0d2b 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MaxLongGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleAggregatorFunction.java
index 4bcf08ce0fa3..068bb7a2bf0a 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.DoubleBlock;
@@ -55,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      DoubleBlock block = page.getBlock(channels.get(0));
+      DoubleVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     DoubleBlock block = page.getBlock(channels.get(0));
     DoubleVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -71,6 +88,15 @@ private void addRawVector(DoubleVector vector) {
     }
   }
 
+  private void addRawVector(DoubleVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      MedianAbsoluteDeviationDoubleAggregator.combine(state, vector.getDouble(i));
+    }
+  }
+
   private void addRawBlock(DoubleBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -84,6 +110,22 @@ private void addRawBlock(DoubleBlock block) {
     }
   }
 
+  private void addRawBlock(DoubleBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        MedianAbsoluteDeviationDoubleAggregator.combine(state, block.getDouble(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleGroupingAggregatorFunction.java
index 836248428f23..4a6fc2bfce4f 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationDoubleGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatAggregatorFunction.java
index 38a16859140f..71cb9964001f 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -55,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      FloatBlock block = page.getBlock(channels.get(0));
+      FloatVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     FloatBlock block = page.getBlock(channels.get(0));
     FloatVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -71,6 +88,15 @@ private void addRawVector(FloatVector vector) {
     }
   }
 
+  private void addRawVector(FloatVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      MedianAbsoluteDeviationFloatAggregator.combine(state, vector.getFloat(i));
+    }
+  }
+
   private void addRawBlock(FloatBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -84,6 +110,22 @@ private void addRawBlock(FloatBlock block) {
     }
   }
 
+  private void addRawBlock(FloatBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        MedianAbsoluteDeviationFloatAggregator.combine(state, block.getFloat(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatGroupingAggregatorFunction.java
index 7a67f0d3449f..35f18ef0df55 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationFloatGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntAggregatorFunction.java
index db9dbdab5224..b4f547fb5b42 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -55,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      IntBlock block = page.getBlock(channels.get(0));
+      IntVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     IntBlock block = page.getBlock(channels.get(0));
     IntVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -71,6 +88,15 @@ private void addRawVector(IntVector vector) {
     }
   }
 
+  private void addRawVector(IntVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      MedianAbsoluteDeviationIntAggregator.combine(state, vector.getInt(i));
+    }
+  }
+
   private void addRawBlock(IntBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -84,6 +110,22 @@ private void addRawBlock(IntBlock block) {
     }
   }
 
+  private void addRawBlock(IntBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        MedianAbsoluteDeviationIntAggregator.combine(state, block.getInt(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntGroupingAggregatorFunction.java
index 315034a28ff8..9819f4472c1a 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationIntGroupingAggregatorFunction.java
@@ -73,6 +73,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -85,6 +89,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -144,6 +152,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongAggregatorFunction.java
index bf5fd51d7ed1..946e0243cf6f 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -55,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -71,6 +88,15 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      MedianAbsoluteDeviationLongAggregator.combine(state, vector.getLong(i));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -84,6 +110,22 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        MedianAbsoluteDeviationLongAggregator.combine(state, block.getLong(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongGroupingAggregatorFunction.java
index af0374012be5..70da9fb19568 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MedianAbsoluteDeviationLongGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanAggregatorFunction.java
index 101a6c7f9169..9bd63ed8efbd 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanAggregatorFunction.java
@@ -53,13 +53,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BooleanBlock block = page.getBlock(channels.get(0));
+      BooleanVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BooleanBlock block = page.getBlock(channels.get(0));
     BooleanVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -70,6 +86,16 @@ private void addRawVector(BooleanVector vector) {
     }
   }
 
+  private void addRawVector(BooleanVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.booleanValue(MinBooleanAggregator.combine(state.booleanValue(), vector.getBoolean(i)));
+    }
+  }
+
   private void addRawBlock(BooleanBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -84,6 +110,23 @@ private void addRawBlock(BooleanBlock block) {
     }
   }
 
+  private void addRawBlock(BooleanBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.booleanValue(MinBooleanAggregator.combine(state.booleanValue(), block.getBoolean(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanGroupingAggregatorFunction.java
index 45e677ee25b5..71e636001cd5 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBooleanGroupingAggregatorFunction.java
@@ -73,6 +73,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -85,6 +89,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -144,6 +152,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BooleanVector valu
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefAggregatorFunction.java
index 3346dd762f17..2789f18a19df 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefAggregatorFunction.java
@@ -56,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -73,6 +89,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      MinBytesRefAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -87,6 +113,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        MinBytesRefAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefGroupingAggregatorFunction.java
index e092dd93210f..1650c6c513fd 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinBytesRefGroupingAggregatorFunction.java
@@ -76,6 +76,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -88,6 +92,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -151,6 +159,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleAggregatorFunction.java
index 7d7544e5d847..e736f91e0b38 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      DoubleBlock block = page.getBlock(channels.get(0));
+      DoubleVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     DoubleBlock block = page.getBlock(channels.get(0));
     DoubleVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(DoubleVector vector) {
     }
   }
 
+  private void addRawVector(DoubleVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.doubleValue(MinDoubleAggregator.combine(state.doubleValue(), vector.getDouble(i)));
+    }
+  }
+
   private void addRawBlock(DoubleBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(DoubleBlock block) {
     }
   }
 
+  private void addRawBlock(DoubleBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.doubleValue(MinDoubleAggregator.combine(state.doubleValue(), block.getDouble(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleGroupingAggregatorFunction.java
index 970a8a759751..729c77a22504 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinDoubleGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatAggregatorFunction.java
index ecabcbdcf57b..9d67ccb8fb73 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      FloatBlock block = page.getBlock(channels.get(0));
+      FloatVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     FloatBlock block = page.getBlock(channels.get(0));
     FloatVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(FloatVector vector) {
     }
   }
 
+  private void addRawVector(FloatVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.floatValue(MinFloatAggregator.combine(state.floatValue(), vector.getFloat(i)));
+    }
+  }
+
   private void addRawBlock(FloatBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(FloatBlock block) {
     }
   }
 
+  private void addRawBlock(FloatBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.floatValue(MinFloatAggregator.combine(state.floatValue(), block.getFloat(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatGroupingAggregatorFunction.java
index 4e8b4cc9417c..d3d59935e62d 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinFloatGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntAggregatorFunction.java
index 0f2385cc120f..a5ead0bd635c 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      IntBlock block = page.getBlock(channels.get(0));
+      IntVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     IntBlock block = page.getBlock(channels.get(0));
     IntVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(IntVector vector) {
     }
   }
 
+  private void addRawVector(IntVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.intValue(MinIntAggregator.combine(state.intValue(), vector.getInt(i)));
+    }
+  }
+
   private void addRawBlock(IntBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(IntBlock block) {
     }
   }
 
+  private void addRawBlock(IntBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.intValue(MinIntAggregator.combine(state.intValue(), block.getInt(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntGroupingAggregatorFunction.java
index 6e976a582a89..7095608ca50c 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIntGroupingAggregatorFunction.java
@@ -73,6 +73,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -85,6 +89,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -144,6 +152,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpAggregatorFunction.java
index a47c901d70db..60ba1993f45d 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpAggregatorFunction.java
@@ -56,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -73,6 +89,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      MinIpAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -87,6 +113,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        MinIpAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpGroupingAggregatorFunction.java
index 146515d363af..0cb4154009a9 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinIpGroupingAggregatorFunction.java
@@ -76,6 +76,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -88,6 +92,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -151,6 +159,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongAggregatorFunction.java
index 805729588158..b7bab86d6423 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.longValue(MinLongAggregator.combine(state.longValue(), vector.getLong(i)));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.longValue(MinLongAggregator.combine(state.longValue(), block.getLong(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongGroupingAggregatorFunction.java
index a3db9a270466..0498c4b8d866 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/MinLongGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleAggregatorFunction.java
index cd7a5b597444..5a00e71baecd 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.DoubleBlock;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      DoubleBlock block = page.getBlock(channels.get(0));
+      DoubleVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     DoubleBlock block = page.getBlock(channels.get(0));
     DoubleVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(DoubleVector vector) {
     }
   }
 
+  private void addRawVector(DoubleVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      PercentileDoubleAggregator.combine(state, vector.getDouble(i));
+    }
+  }
+
   private void addRawBlock(DoubleBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(DoubleBlock block) {
     }
   }
 
+  private void addRawBlock(DoubleBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        PercentileDoubleAggregator.combine(state, block.getDouble(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleGroupingAggregatorFunction.java
index 871e93a72d90..c10d25c05968 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileDoubleGroupingAggregatorFunction.java
@@ -78,6 +78,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -90,6 +94,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -149,6 +157,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatAggregatorFunction.java
index 8f0ffd81e64b..f3ce29a57d57 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      FloatBlock block = page.getBlock(channels.get(0));
+      FloatVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     FloatBlock block = page.getBlock(channels.get(0));
     FloatVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(FloatVector vector) {
     }
   }
 
+  private void addRawVector(FloatVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      PercentileFloatAggregator.combine(state, vector.getFloat(i));
+    }
+  }
+
   private void addRawBlock(FloatBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(FloatBlock block) {
     }
   }
 
+  private void addRawBlock(FloatBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        PercentileFloatAggregator.combine(state, block.getFloat(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatGroupingAggregatorFunction.java
index 8b0f28b2632d..982b07da1bd8 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileFloatGroupingAggregatorFunction.java
@@ -78,6 +78,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -90,6 +94,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -149,6 +157,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntAggregatorFunction.java
index b9b1c2e90b76..8c4985e83012 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      IntBlock block = page.getBlock(channels.get(0));
+      IntVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     IntBlock block = page.getBlock(channels.get(0));
     IntVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(IntVector vector) {
     }
   }
 
+  private void addRawVector(IntVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      PercentileIntAggregator.combine(state, vector.getInt(i));
+    }
+  }
+
   private void addRawBlock(IntBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(IntBlock block) {
     }
   }
 
+  private void addRawBlock(IntBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        PercentileIntAggregator.combine(state, block.getInt(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntGroupingAggregatorFunction.java
index fc1031dcbe0d..ed50eb683ba9 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileIntGroupingAggregatorFunction.java
@@ -76,6 +76,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -88,6 +92,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -147,6 +155,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongAggregatorFunction.java
index cc785ce55bb5..09093ddb3f42 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      PercentileLongAggregator.combine(state, vector.getLong(i));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        PercentileLongAggregator.combine(state, block.getLong(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongGroupingAggregatorFunction.java
index 1b14f02356b8..12f64133d10f 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/PercentileLongGroupingAggregatorFunction.java
@@ -78,6 +78,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -90,6 +94,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -149,6 +157,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateDoubleGroupingAggregatorFunction.java
index c85cf78a39c4..2fca5c1d19c5 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateDoubleGroupingAggregatorFunction.java
@@ -85,6 +85,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock, timestampsVector);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -97,6 +101,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector, timestampsVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -162,6 +170,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateFloatGroupingAggregatorFunction.java
index a5d2131a2445..628503f12900 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateFloatGroupingAggregatorFunction.java
@@ -87,6 +87,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock, timestampsVector);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -99,6 +103,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector, timestampsVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -164,6 +172,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateIntGroupingAggregatorFunction.java
index 0fb0b05c1116..2f030544da61 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateIntGroupingAggregatorFunction.java
@@ -85,6 +85,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock, timestampsVector);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -97,6 +101,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector, timestampsVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -162,6 +170,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values,
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateLongGroupingAggregatorFunction.java
index 82297b618b03..fd272e47fa6a 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/RateLongGroupingAggregatorFunction.java
@@ -85,6 +85,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock, timestampsVector);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -97,6 +101,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector, timestampsVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -162,6 +170,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values,
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleAggregatorFunction.java
index 354726f82b8f..7f0e0b4e1515 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleAggregatorFunction.java
@@ -56,13 +56,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      DoubleBlock block = page.getBlock(channels.get(0));
+      DoubleVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     DoubleBlock block = page.getBlock(channels.get(0));
     DoubleVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -73,6 +89,16 @@ private void addRawVector(DoubleVector vector) {
     }
   }
 
+  private void addRawVector(DoubleVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      SumDoubleAggregator.combine(state, vector.getDouble(i));
+    }
+  }
+
   private void addRawBlock(DoubleBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,23 @@ private void addRawBlock(DoubleBlock block) {
     }
   }
 
+  private void addRawBlock(DoubleBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        SumDoubleAggregator.combine(state, block.getDouble(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleGroupingAggregatorFunction.java
index 4f0bcae66ee4..71b282c58aca 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumDoubleGroupingAggregatorFunction.java
@@ -76,6 +76,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -88,6 +92,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -147,6 +155,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatAggregatorFunction.java
index 3dedc327294d..d916b832d77f 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatAggregatorFunction.java
@@ -58,13 +58,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      FloatBlock block = page.getBlock(channels.get(0));
+      FloatVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     FloatBlock block = page.getBlock(channels.get(0));
     FloatVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -75,6 +91,16 @@ private void addRawVector(FloatVector vector) {
     }
   }
 
+  private void addRawVector(FloatVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      SumFloatAggregator.combine(state, vector.getFloat(i));
+    }
+  }
+
   private void addRawBlock(FloatBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -89,6 +115,23 @@ private void addRawBlock(FloatBlock block) {
     }
   }
 
+  private void addRawBlock(FloatBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        SumFloatAggregator.combine(state, block.getFloat(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatGroupingAggregatorFunction.java
index 2f4165dfeadf..664f616acee9 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumFloatGroupingAggregatorFunction.java
@@ -78,6 +78,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -90,6 +94,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -149,6 +157,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntAggregatorFunction.java
index e210429991aa..5cd1abc35d28 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntAggregatorFunction.java
@@ -57,13 +57,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      IntBlock block = page.getBlock(channels.get(0));
+      IntVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     IntBlock block = page.getBlock(channels.get(0));
     IntVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +90,16 @@ private void addRawVector(IntVector vector) {
     }
   }
 
+  private void addRawVector(IntVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.longValue(SumIntAggregator.combine(state.longValue(), vector.getInt(i)));
+    }
+  }
+
   private void addRawBlock(IntBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -88,6 +114,23 @@ private void addRawBlock(IntBlock block) {
     }
   }
 
+  private void addRawBlock(IntBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.longValue(SumIntAggregator.combine(state.longValue(), block.getInt(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntGroupingAggregatorFunction.java
index 95d380c455bf..2f369374d8cd 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumIntGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongAggregatorFunction.java
index 38d1b3de7826..e7781f82b102 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongAggregatorFunction.java
@@ -55,13 +55,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -72,6 +88,16 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    state.seen(true);
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      state.longValue(SumLongAggregator.combine(state.longValue(), vector.getLong(i)));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -86,6 +112,23 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      state.seen(true);
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        state.longValue(SumLongAggregator.combine(state.longValue(), block.getLong(i)));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongGroupingAggregatorFunction.java
index 324d8f53e65c..c8c0990de4e5 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/SumLongGroupingAggregatorFunction.java
@@ -75,6 +75,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -87,6 +91,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -146,6 +154,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanAggregatorFunction.java
index 617ebfd00480..0580dc297a36 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanAggregatorFunction.java
@@ -58,13 +58,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BooleanBlock block = page.getBlock(channels.get(0));
+      BooleanVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BooleanBlock block = page.getBlock(channels.get(0));
     BooleanVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +90,15 @@ private void addRawVector(BooleanVector vector) {
     }
   }
 
+  private void addRawVector(BooleanVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      TopBooleanAggregator.combine(state, vector.getBoolean(i));
+    }
+  }
+
   private void addRawBlock(BooleanBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +112,22 @@ private void addRawBlock(BooleanBlock block) {
     }
   }
 
+  private void addRawBlock(BooleanBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        TopBooleanAggregator.combine(state, block.getBoolean(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanGroupingAggregatorFunction.java
index d169c456329b..cd35595eeadb 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopBooleanGroupingAggregatorFunction.java
@@ -79,6 +79,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -91,6 +95,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -150,6 +158,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BooleanVector valu
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleAggregatorFunction.java
index 8549da42c0d8..899af1a58851 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleAggregatorFunction.java
@@ -10,6 +10,7 @@
 import java.lang.StringBuilder;
 import java.util.List;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.DoubleBlock;
 import org.elasticsearch.compute.data.DoubleVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      DoubleBlock block = page.getBlock(channels.get(0));
+      DoubleVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     DoubleBlock block = page.getBlock(channels.get(0));
     DoubleVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(DoubleVector vector) {
     }
   }
 
+  private void addRawVector(DoubleVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      TopDoubleAggregator.combine(state, vector.getDouble(i));
+    }
+  }
+
   private void addRawBlock(DoubleBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(DoubleBlock block) {
     }
   }
 
+  private void addRawBlock(DoubleBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        TopDoubleAggregator.combine(state, block.getDouble(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleGroupingAggregatorFunction.java
index 07da387f88ce..6b76ff7772ad 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopDoubleGroupingAggregatorFunction.java
@@ -79,6 +79,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -91,6 +95,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -150,6 +158,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatAggregatorFunction.java
index 40ac1432caee..168e7685c527 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatAggregatorFunction.java
@@ -10,6 +10,7 @@
 import java.lang.StringBuilder;
 import java.util.List;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.FloatBlock;
 import org.elasticsearch.compute.data.FloatVector;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      FloatBlock block = page.getBlock(channels.get(0));
+      FloatVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     FloatBlock block = page.getBlock(channels.get(0));
     FloatVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(FloatVector vector) {
     }
   }
 
+  private void addRawVector(FloatVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      TopFloatAggregator.combine(state, vector.getFloat(i));
+    }
+  }
+
   private void addRawBlock(FloatBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(FloatBlock block) {
     }
   }
 
+  private void addRawBlock(FloatBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        TopFloatAggregator.combine(state, block.getFloat(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatGroupingAggregatorFunction.java
index 369fa7401e50..ffaf85864544 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopFloatGroupingAggregatorFunction.java
@@ -79,6 +79,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -91,6 +95,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -150,6 +158,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntAggregatorFunction.java
index f6e858b69a63..80964decf572 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntAggregatorFunction.java
@@ -10,6 +10,7 @@
 import java.lang.StringBuilder;
 import java.util.List;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.compute.data.IntVector;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      IntBlock block = page.getBlock(channels.get(0));
+      IntVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     IntBlock block = page.getBlock(channels.get(0));
     IntVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(IntVector vector) {
     }
   }
 
+  private void addRawVector(IntVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      TopIntAggregator.combine(state, vector.getInt(i));
+    }
+  }
+
   private void addRawBlock(IntBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(IntBlock block) {
     }
   }
 
+  private void addRawBlock(IntBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        TopIntAggregator.combine(state, block.getInt(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntGroupingAggregatorFunction.java
index 04b53fe6aab6..a3453126e055 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIntGroupingAggregatorFunction.java
@@ -77,6 +77,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -89,6 +93,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -148,6 +156,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpAggregatorFunction.java
index 43f4d78d59cd..90d8d7c12424 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -59,13 +60,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -76,6 +93,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      TopIpAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -90,6 +117,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        TopIpAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpGroupingAggregatorFunction.java
index 272b4827b581..74a6987962b7 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopIpGroupingAggregatorFunction.java
@@ -80,6 +80,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -92,6 +96,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -155,6 +163,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongAggregatorFunction.java
index c355e401478d..18eef5a29b89 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongAggregatorFunction.java
@@ -10,6 +10,7 @@
 import java.lang.StringBuilder;
 import java.util.List;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.LongBlock;
 import org.elasticsearch.compute.data.LongVector;
@@ -58,13 +59,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -74,6 +91,15 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      TopLongAggregator.combine(state, vector.getLong(i));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -87,6 +113,22 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        TopLongAggregator.combine(state, block.getLong(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongGroupingAggregatorFunction.java
index 9d1ed395c596..b4a4b7154e62 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/TopLongGroupingAggregatorFunction.java
@@ -79,6 +79,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -91,6 +95,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -150,6 +158,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanAggregatorFunction.java
index 3e9bc91e0039..d71d9a7b45bd 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanAggregatorFunction.java
@@ -52,13 +52,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BooleanBlock block = page.getBlock(channels.get(0));
+      BooleanVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BooleanBlock block = page.getBlock(channels.get(0));
     BooleanVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -68,6 +84,15 @@ private void addRawVector(BooleanVector vector) {
     }
   }
 
+  private void addRawVector(BooleanVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      ValuesBooleanAggregator.combine(state, vector.getBoolean(i));
+    }
+  }
+
   private void addRawBlock(BooleanBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -81,6 +106,22 @@ private void addRawBlock(BooleanBlock block) {
     }
   }
 
+  private void addRawBlock(BooleanBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        ValuesBooleanAggregator.combine(state, block.getBoolean(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanGroupingAggregatorFunction.java
index 062a49dbf4f7..b51da118e0f8 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBooleanGroupingAggregatorFunction.java
@@ -72,6 +72,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -84,6 +88,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -143,6 +151,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BooleanVector valu
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregatorFunction.java
index 24b88f59e38f..56e79b64e3b8 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefAggregatorFunction.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -53,13 +54,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -70,6 +87,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      ValuesBytesRefAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -84,6 +111,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        ValuesBytesRefAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java
index 0a929913e9fd..bdce606f9216 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesBytesRefGroupingAggregatorFunction.java
@@ -73,6 +73,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -85,6 +89,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -148,6 +156,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleAggregatorFunction.java
index a6295038dbd7..3ec31b0fd5a4 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleAggregatorFunction.java
@@ -10,6 +10,7 @@
 import java.lang.StringBuilder;
 import java.util.List;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.DoubleBlock;
 import org.elasticsearch.compute.data.DoubleVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -52,13 +53,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      DoubleBlock block = page.getBlock(channels.get(0));
+      DoubleVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     DoubleBlock block = page.getBlock(channels.get(0));
     DoubleVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -68,6 +85,15 @@ private void addRawVector(DoubleVector vector) {
     }
   }
 
+  private void addRawVector(DoubleVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      ValuesDoubleAggregator.combine(state, vector.getDouble(i));
+    }
+  }
+
   private void addRawBlock(DoubleBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -81,6 +107,22 @@ private void addRawBlock(DoubleBlock block) {
     }
   }
 
+  private void addRawBlock(DoubleBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        ValuesDoubleAggregator.combine(state, block.getDouble(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleGroupingAggregatorFunction.java
index b8ca2d2b9665..5b8c2ac80266 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesDoubleGroupingAggregatorFunction.java
@@ -72,6 +72,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -84,6 +88,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -143,6 +151,11 @@ private void addRawInput(int positionOffset, IntBlock groups, DoubleVector value
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatAggregatorFunction.java
index c7385e87bfbf..00ab8db1c4ac 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatAggregatorFunction.java
@@ -10,6 +10,7 @@
 import java.lang.StringBuilder;
 import java.util.List;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.FloatBlock;
 import org.elasticsearch.compute.data.FloatVector;
@@ -52,13 +53,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      FloatBlock block = page.getBlock(channels.get(0));
+      FloatVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     FloatBlock block = page.getBlock(channels.get(0));
     FloatVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -68,6 +85,15 @@ private void addRawVector(FloatVector vector) {
     }
   }
 
+  private void addRawVector(FloatVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      ValuesFloatAggregator.combine(state, vector.getFloat(i));
+    }
+  }
+
   private void addRawBlock(FloatBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -81,6 +107,22 @@ private void addRawBlock(FloatBlock block) {
     }
   }
 
+  private void addRawBlock(FloatBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        ValuesFloatAggregator.combine(state, block.getFloat(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatGroupingAggregatorFunction.java
index 0c4e9c32328c..f50c5a67d15a 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesFloatGroupingAggregatorFunction.java
@@ -72,6 +72,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -84,6 +88,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -143,6 +151,11 @@ private void addRawInput(int positionOffset, IntBlock groups, FloatVector values
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntAggregatorFunction.java
index 19e578936cd1..5a0d7c893e60 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntAggregatorFunction.java
@@ -10,6 +10,7 @@
 import java.lang.StringBuilder;
 import java.util.List;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.compute.data.IntVector;
@@ -52,13 +53,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      IntBlock block = page.getBlock(channels.get(0));
+      IntVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     IntBlock block = page.getBlock(channels.get(0));
     IntVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -68,6 +85,15 @@ private void addRawVector(IntVector vector) {
     }
   }
 
+  private void addRawVector(IntVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      ValuesIntAggregator.combine(state, vector.getInt(i));
+    }
+  }
+
   private void addRawBlock(IntBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -81,6 +107,22 @@ private void addRawBlock(IntBlock block) {
     }
   }
 
+  private void addRawBlock(IntBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        ValuesIntAggregator.combine(state, block.getInt(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntGroupingAggregatorFunction.java
index 95e527c018cd..c90fcedb291c 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesIntGroupingAggregatorFunction.java
@@ -70,6 +70,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -82,6 +86,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -141,6 +149,11 @@ private void addRawInput(int positionOffset, IntBlock groups, IntVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongAggregatorFunction.java
index 420da87076a3..ca9a8347e3a4 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongAggregatorFunction.java
@@ -10,6 +10,7 @@
 import java.lang.StringBuilder;
 import java.util.List;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.LongBlock;
 import org.elasticsearch.compute.data.LongVector;
@@ -52,13 +53,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -68,6 +85,15 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      ValuesLongAggregator.combine(state, vector.getLong(i));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -81,6 +107,22 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        ValuesLongAggregator.combine(state, block.getLong(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongGroupingAggregatorFunction.java
index a7963447037a..8a79cd7d942e 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/ValuesLongGroupingAggregatorFunction.java
@@ -72,6 +72,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -84,6 +88,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -143,6 +151,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesAggregatorFunction.java
index eef094ce2ecf..a427c75c63ff 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesAggregatorFunction.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.compute.aggregation.AggregatorFunction;
 import org.elasticsearch.compute.aggregation.IntermediateStateDesc;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.DoubleBlock;
 import org.elasticsearch.compute.data.DoubleVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -60,13 +61,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -76,6 +93,15 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      SpatialCentroidCartesianPointDocValuesAggregator.combine(state, vector.getLong(i));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -89,6 +115,22 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        SpatialCentroidCartesianPointDocValuesAggregator.combine(state, block.getLong(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction.java
index dc3c1cf2917e..cc2fb38bb925 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointDocValuesGroupingAggregatorFunction.java
@@ -81,6 +81,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -93,6 +97,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -152,6 +160,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesAggregatorFunction.java
index bdc7c58a6c96..c2086f2ab3d9 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesAggregatorFunction.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.compute.aggregation.AggregatorFunction;
 import org.elasticsearch.compute.aggregation.IntermediateStateDesc;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.DoubleBlock;
@@ -63,13 +64,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -80,6 +97,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      SpatialCentroidCartesianPointSourceValuesAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -94,6 +121,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        SpatialCentroidCartesianPointSourceValuesAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction.java
index 0d1378ce988f..6ae2b444efe9 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidCartesianPointSourceValuesGroupingAggregatorFunction.java
@@ -84,6 +84,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -96,6 +100,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -159,6 +167,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesAggregatorFunction.java
index fcd17d4c5cd8..0509c03ebf77 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesAggregatorFunction.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.compute.aggregation.AggregatorFunction;
 import org.elasticsearch.compute.aggregation.IntermediateStateDesc;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.DoubleBlock;
 import org.elasticsearch.compute.data.DoubleVector;
 import org.elasticsearch.compute.data.ElementType;
@@ -60,13 +61,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      LongBlock block = page.getBlock(channels.get(0));
+      LongVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     LongBlock block = page.getBlock(channels.get(0));
     LongVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -76,6 +93,15 @@ private void addRawVector(LongVector vector) {
     }
   }
 
+  private void addRawVector(LongVector vector, BooleanVector mask) {
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      SpatialCentroidGeoPointDocValuesAggregator.combine(state, vector.getLong(i));
+    }
+  }
+
   private void addRawBlock(LongBlock block) {
     for (int p = 0; p < block.getPositionCount(); p++) {
       if (block.isNull(p)) {
@@ -89,6 +115,22 @@ private void addRawBlock(LongBlock block) {
     }
   }
 
+  private void addRawBlock(LongBlock block, BooleanVector mask) {
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        SpatialCentroidGeoPointDocValuesAggregator.combine(state, block.getLong(i));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction.java
index f5604e9e2320..0cce9b7cf1cd 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointDocValuesGroupingAggregatorFunction.java
@@ -81,6 +81,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -93,6 +97,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -152,6 +160,11 @@ private void addRawInput(int positionOffset, IntBlock groups, LongVector values)
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesAggregatorFunction.java
index be7b8d9758d1..10a29c841b79 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesAggregatorFunction.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.compute.aggregation.AggregatorFunction;
 import org.elasticsearch.compute.aggregation.IntermediateStateDesc;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.BytesRefBlock;
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.DoubleBlock;
@@ -63,13 +64,29 @@ public int intermediateBlockCount() {
   }
 
   @Override
-  public void addRawInput(Page page) {
+  public void addRawInput(Page page, BooleanVector mask) {
+    if (mask.isConstant()) {
+      if (mask.getBoolean(0) == false) {
+        // Entire page masked away
+        return;
+      }
+      // No masking
+      BytesRefBlock block = page.getBlock(channels.get(0));
+      BytesRefVector vector = block.asVector();
+      if (vector != null) {
+        addRawVector(vector);
+      } else {
+        addRawBlock(block);
+      }
+      return;
+    }
+    // Some positions masked away, others kept
     BytesRefBlock block = page.getBlock(channels.get(0));
     BytesRefVector vector = block.asVector();
     if (vector != null) {
-      addRawVector(vector);
+      addRawVector(vector, mask);
     } else {
-      addRawBlock(block);
+      addRawBlock(block, mask);
     }
   }
 
@@ -80,6 +97,16 @@ private void addRawVector(BytesRefVector vector) {
     }
   }
 
+  private void addRawVector(BytesRefVector vector, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int i = 0; i < vector.getPositionCount(); i++) {
+      if (mask.getBoolean(i) == false) {
+        continue;
+      }
+      SpatialCentroidGeoPointSourceValuesAggregator.combine(state, vector.getBytesRef(i, scratch));
+    }
+  }
+
   private void addRawBlock(BytesRefBlock block) {
     BytesRef scratch = new BytesRef();
     for (int p = 0; p < block.getPositionCount(); p++) {
@@ -94,6 +121,23 @@ private void addRawBlock(BytesRefBlock block) {
     }
   }
 
+  private void addRawBlock(BytesRefBlock block, BooleanVector mask) {
+    BytesRef scratch = new BytesRef();
+    for (int p = 0; p < block.getPositionCount(); p++) {
+      if (mask.getBoolean(p) == false) {
+        continue;
+      }
+      if (block.isNull(p)) {
+        continue;
+      }
+      int start = block.getFirstValueIndex(p);
+      int end = start + block.getValueCount(p);
+      for (int i = start; i < end; i++) {
+        SpatialCentroidGeoPointSourceValuesAggregator.combine(state, block.getBytesRef(i, scratch));
+      }
+    }
+  }
+
   @Override
   public void addIntermediateInput(Page page) {
     assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction.java
index b3caeef925a7..6c4d6635846d 100644
--- a/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/generated/org/elasticsearch/compute/aggregation/spatial/SpatialCentroidGeoPointSourceValuesGroupingAggregatorFunction.java
@@ -84,6 +84,10 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
           addRawInput(positionOffset, groupIds, valuesBlock);
         }
+
+        @Override
+        public void close() {
+        }
       };
     }
     return new GroupingAggregatorFunction.AddInput() {
@@ -96,6 +100,10 @@ public void add(int positionOffset, IntBlock groupIds) {
       public void add(int positionOffset, IntVector groupIds) {
         addRawInput(positionOffset, groupIds, valuesVector);
       }
+
+      @Override
+      public void close() {
+      }
     };
   }
 
@@ -159,6 +167,11 @@ private void addRawInput(int positionOffset, IntBlock groups, BytesRefVector val
     }
   }
 
+  @Override
+  public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+    state.enableGroupIdTracking(seenGroupIds);
+  }
+
   @Override
   public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
     state.enableGroupIdTracking(new SeenGroupIds.Empty());
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/Aggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/Aggregator.java
index 1a58a27e3377..f0471a995f21 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/Aggregator.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/Aggregator.java
@@ -9,6 +9,7 @@
 
 import org.elasticsearch.compute.Describable;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.operator.DriverContext;
 import org.elasticsearch.core.Releasable;
@@ -16,9 +17,6 @@
 import java.util.function.Function;
 
 public class Aggregator implements Releasable {
-
-    public static final Object[] EMPTY_PARAMS = new Object[] {};
-
     private final AggregatorFunction aggregatorFunction;
 
     private final AggregatorMode mode;
@@ -35,11 +33,14 @@ public int evaluateBlockCount() {
         return mode.isOutputPartial() ? aggregatorFunction.intermediateBlockCount() : 1;
     }
 
-    public void processPage(Page page) {
+    public void processPage(Page page, BooleanVector mask) {
         if (mode.isInputPartial()) {
+            if (mask.isConstant() == false || mask.getBoolean(0) == false) {
+                throw new IllegalStateException("can't mask intermediate input");
+            }
             aggregatorFunction.addIntermediateInput(page);
         } else {
-            aggregatorFunction.addRawInput(page);
+            aggregatorFunction.addRawInput(page, mask);
         }
     }
 
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/AggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/AggregatorFunction.java
index 3d214ff3d2e0..6050c774dd20 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/AggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/AggregatorFunction.java
@@ -8,18 +8,43 @@
 package org.elasticsearch.compute.aggregation;
 
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.Page;
+import org.elasticsearch.compute.operator.Driver;
 import org.elasticsearch.compute.operator.DriverContext;
 import org.elasticsearch.core.Releasable;
 
+/**
+ * A non-grouped aggregation.
+ */
 public interface AggregatorFunction extends Releasable {
-
-    void addRawInput(Page page);
-
+    /**
+     * Add a page worth of data to the aggregation.
+     * @param mask a mask to apply to the positions. If the position is {@code false} then
+     *             the aggregation should skip it.
+     */
+    void addRawInput(Page page, BooleanVector mask);
+
+    /**
+     * Add a pre-aggregated page worth of "intermediate" input. This intermediate input
+     * will have been created by calling {@link #evaluateIntermediate} on this agg, though
+     * likely in a different {@link Driver} and <strong>maybe</strong> on a different
+     * physical node.
+     */
     void addIntermediateInput(Page page);
 
+    /**
+     * Build pre-aggregated "intermediate" data to pass to the {@link #addIntermediateInput}.
+     * @param blocks write the output into this array
+     * @param offset write the first {@link Block} at this offset in {@code blocks}
+     */
     void evaluateIntermediate(Block[] blocks, int offset, DriverContext driverContext);
 
+    /**
+     * Build the final results from running this agg.
+     * @param blocks write the output into this array
+     * @param offset write the first {@link Block} at this offset in {@code blocks}
+     */
     void evaluateFinal(Block[] blocks, int offset, DriverContext driverContext);
 
     /** The number of blocks used by intermediate state. */
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountAggregatorFunction.java
index c32f6f4703a7..c6416f6d075d 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountAggregatorFunction.java
@@ -72,13 +72,39 @@ private int blockIndex() {
     }
 
     @Override
-    public void addRawInput(Page page) {
+    public void addRawInput(Page page, BooleanVector mask) {
         Block block = page.getBlock(blockIndex());
         LongState state = this.state;
-        int count = countAll ? block.getPositionCount() : block.getTotalValueCount();
+        int count;
+        if (mask.isConstant()) {
+            if (mask.getBoolean(0) == false) {
+                return;
+            }
+            count = countAll ? block.getPositionCount() : block.getTotalValueCount();
+        } else {
+            count = countMasked(block, mask);
+        }
         state.longValue(state.longValue() + count);
     }
 
+    private int countMasked(Block block, BooleanVector mask) {
+        int count = 0;
+        if (countAll) {
+            for (int p = 0; p < block.getPositionCount(); p++) {
+                if (mask.getBoolean(p)) {
+                    count++;
+                }
+            }
+            return count;
+        }
+        for (int p = 0; p < block.getPositionCount(); p++) {
+            if (mask.getBoolean(p)) {
+                count += block.getValueCount(p);
+            }
+        }
+        return count;
+    }
+
     @Override
     public void addIntermediateInput(Page page) {
         assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountGroupingAggregatorFunction.java
index 5dba070172ae..f610abf271cf 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/CountGroupingAggregatorFunction.java
@@ -76,6 +76,9 @@ public void add(int positionOffset, IntBlock groupIds) {
                     public void add(int positionOffset, IntVector groupIds) {
                         addRawInput(positionOffset, groupIds, valuesBlock);
                     }
+
+                    @Override
+                    public void close() {}
                 };
             }
         }
@@ -89,6 +92,9 @@ public void add(int positionOffset, IntBlock groupIds) {
             public void add(int positionOffset, IntVector groupIds) {
                 addRawInput(groupIds);
             }
+
+            @Override
+            public void close() {}
         };
     }
 
@@ -149,6 +155,11 @@ private void addRawInput(IntBlock groups) {
         }
     }
 
+    @Override
+    public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+        state.enableGroupIdTracking(seenGroupIds);
+    }
+
     @Override
     public void addIntermediateInput(int positionOffset, IntVector groups, Page page) {
         assert channels.size() == intermediateBlockCount();
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunction.java
new file mode 100644
index 000000000000..04d78673c42e
--- /dev/null
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunction.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.compute.aggregation;
+
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanBlock;
+import org.elasticsearch.compute.data.BooleanVector;
+import org.elasticsearch.compute.data.Page;
+import org.elasticsearch.compute.data.ToMask;
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+import org.elasticsearch.core.Releasables;
+
+/**
+ * A {@link AggregatorFunction} that wraps another, filtering which positions
+ * are supplied to the aggregator.
+ * <p>
+ *     This works by running the filter and providing its results in the {@code mask}
+ *     parameter for {@link #addRawInput}.
+ * </p>
+ */
+record FilteredAggregatorFunction(AggregatorFunction next, EvalOperator.ExpressionEvaluator filter) implements AggregatorFunction {
+    @Override
+    public void addRawInput(Page page, BooleanVector mask) {
+        if (mask.isConstant() == false || mask.getBoolean(0) == false) {
+            throw new UnsupportedOperationException("can't filter twice");
+        }
+        try (BooleanBlock filterResult = ((BooleanBlock) filter.eval(page)); ToMask m = filterResult.toMask()) {
+            // TODO warn on mv fields
+            next.addRawInput(page, m.mask());
+        }
+    }
+
+    @Override
+    public void addIntermediateInput(Page page) {
+        next.addIntermediateInput(page);
+    }
+
+    @Override
+    public void evaluateIntermediate(Block[] blocks, int offset, DriverContext driverContext) {
+        next.evaluateIntermediate(blocks, offset, driverContext);
+    }
+
+    @Override
+    public void evaluateFinal(Block[] blocks, int offset, DriverContext driverContext) {
+        next.evaluateFinal(blocks, offset, driverContext);
+    }
+
+    @Override
+    public int intermediateBlockCount() {
+        return next.intermediateBlockCount();
+    }
+
+    @Override
+    public void close() {
+        Releasables.close(next, filter);
+    }
+}
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunctionSupplier.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunctionSupplier.java
new file mode 100644
index 000000000000..ed63a283b356
--- /dev/null
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunctionSupplier.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.compute.aggregation;
+
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+import org.elasticsearch.core.Releasables;
+
+/**
+ * A {@link AggregatorFunctionSupplier} that wraps another, filtering which positions
+ * are supplied to the aggregator.
+ */
+public record FilteredAggregatorFunctionSupplier(AggregatorFunctionSupplier next, EvalOperator.ExpressionEvaluator.Factory filter)
+    implements
+        AggregatorFunctionSupplier {
+
+    @Override
+    public AggregatorFunction aggregator(DriverContext driverContext) {
+        AggregatorFunction next = this.next.aggregator(driverContext);
+        EvalOperator.ExpressionEvaluator filter = null;
+        try {
+            filter = this.filter.get(driverContext);
+            AggregatorFunction result = new FilteredAggregatorFunction(next, filter);
+            next = null;
+            filter = null;
+            return result;
+        } finally {
+            Releasables.closeExpectNoException(next, filter);
+        }
+    }
+
+    @Override
+    public GroupingAggregatorFunction groupingAggregator(DriverContext driverContext) {
+        GroupingAggregatorFunction next = this.next.groupingAggregator(driverContext);
+        EvalOperator.ExpressionEvaluator filter = null;
+        try {
+            filter = this.filter.get(driverContext);
+            GroupingAggregatorFunction result = new FilteredGroupingAggregatorFunction(next, filter);
+            next = null;
+            filter = null;
+            return result;
+        } finally {
+            Releasables.closeExpectNoException(next, filter);
+        }
+    }
+
+    @Override
+    public String describe() {
+        return "Filtered[next=" + next.describe() + ", filter=" + filter + "]";
+    }
+}
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunction.java
new file mode 100644
index 000000000000..3e38b6d6fe9f
--- /dev/null
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunction.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.compute.aggregation;
+
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanBlock;
+import org.elasticsearch.compute.data.BooleanVector;
+import org.elasticsearch.compute.data.IntBlock;
+import org.elasticsearch.compute.data.IntVector;
+import org.elasticsearch.compute.data.Page;
+import org.elasticsearch.compute.data.ToMask;
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+import org.elasticsearch.core.Releasables;
+
+import java.util.stream.IntStream;
+
+/**
+ * A {@link GroupingAggregatorFunction} that wraps another, filtering which positions
+ * are supplied to the aggregator.
+ * <p>
+ *     This filtering works by setting all of the group ids for filtered positions to
+ *     {@code null}. {@link GroupingAggregatorFunction} will then skip collecting those
+ *     positions.
+ * </p>
+ */
+record FilteredGroupingAggregatorFunction(GroupingAggregatorFunction next, EvalOperator.ExpressionEvaluator filter)
+    implements
+        GroupingAggregatorFunction {
+
+    FilteredGroupingAggregatorFunction {
+        next.selectedMayContainUnseenGroups(new SeenGroupIds.Empty());
+    }
+
+    @Override
+    public AddInput prepareProcessPage(SeenGroupIds seenGroupIds, Page page) {
+        try (BooleanBlock filterResult = ((BooleanBlock) filter.eval(page))) {
+            ToMask mask = filterResult.toMask();
+            // TODO warn on mv fields
+            AddInput nextAdd = null;
+            try {
+                nextAdd = next.prepareProcessPage(seenGroupIds, page);
+                AddInput result = new FilteredAddInput(mask.mask(), nextAdd, page.getPositionCount());
+                mask = null;
+                nextAdd = null;
+                return result;
+            } finally {
+                Releasables.close(mask, nextAdd);
+            }
+        }
+    }
+
+    private record FilteredAddInput(BooleanVector mask, AddInput nextAdd, int positionCount) implements AddInput {
+        @Override
+        public void add(int positionOffset, IntBlock groupIds) {
+            if (positionOffset == 0) {
+                try (IntBlock filtered = groupIds.keepMask(mask)) {
+                    nextAdd.add(positionOffset, filtered);
+                }
+            } else {
+                try (
+                    BooleanVector offsetMask = mask.filter(
+                        IntStream.range(positionOffset, positionOffset + groupIds.getPositionCount()).toArray()
+                    );
+                    IntBlock filtered = groupIds.keepMask(offsetMask)
+                ) {
+                    nextAdd.add(positionOffset, filtered);
+                }
+            }
+        }
+
+        @Override
+        public void add(int positionOffset, IntVector groupIds) {
+            add(positionOffset, groupIds.asBlock());
+        }
+
+        @Override
+        public void close() {
+            Releasables.close(mask, nextAdd);
+        }
+    }
+
+    @Override
+    public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+        // nothing to do - we already put the underlying agg into this state
+    }
+
+    @Override
+    public void addIntermediateInput(int positionOffset, IntVector groupIdVector, Page page) {
+        next.addIntermediateInput(positionOffset, groupIdVector, page);
+    }
+
+    @Override
+    public void addIntermediateRowInput(int groupId, GroupingAggregatorFunction input, int position) {
+        next.addIntermediateRowInput(groupId, input, position);
+    }
+
+    @Override
+    public void evaluateIntermediate(Block[] blocks, int offset, IntVector selected) {
+        next.evaluateIntermediate(blocks, offset, selected);
+    }
+
+    @Override
+    public void evaluateFinal(Block[] blocks, int offset, IntVector selected, DriverContext driverContext) {
+        next.evaluateFinal(blocks, offset, selected, driverContext);
+    }
+
+    @Override
+    public int intermediateBlockCount() {
+        return next.intermediateBlockCount();
+    }
+
+    @Override
+    public void close() {
+        Releasables.closeExpectNoException(next, filter);
+    }
+}
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialAggregatorFunction.java
index 8d4ce2971d34..1f6270528593 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialAggregatorFunction.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.aggregation;
 
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.CompositeBlock;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.IntVector;
@@ -41,7 +42,10 @@ public FromPartialAggregatorFunction(DriverContext driverContext, GroupingAggreg
     }
 
     @Override
-    public void addRawInput(Page page) {
+    public void addRawInput(Page page, BooleanVector mask) {
+        if (mask.isConstant() == false || mask.getBoolean(0) == false) {
+            throw new IllegalStateException("can't mask partial");
+        }
         addIntermediateInput(page);
     }
 
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialGroupingAggregatorFunction.java
index 675fbe88f198..5c1a22340456 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/FromPartialGroupingAggregatorFunction.java
@@ -51,9 +51,17 @@ public void add(int positionOffset, IntBlock groupIds) {
             public void add(int positionOffset, IntVector groupIds) {
                 addIntermediateInput(positionOffset, groupIds, page);
             }
+
+            @Override
+            public void close() {}
         };
     }
 
+    @Override
+    public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+        delegate.selectedMayContainUnseenGroups(seenGroupIds);
+    }
+
     @Override
     public void addIntermediateInput(int positionOffset, IntVector groupIdVector, Page page) {
         final CompositeBlock inputBlock = page.getBlock(inputChannel);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregator.java
index 21bcded6caee..3612ca999619 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregator.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregator.java
@@ -49,6 +49,9 @@ public void add(int positionOffset, IntBlock groupIds) {
                 public void add(int positionOffset, IntVector groupIds) {
                     aggregatorFunction.addIntermediateInput(positionOffset, groupIds, page);
                 }
+
+                @Override
+                public void close() {}
             };
         } else {
             return aggregatorFunction.prepareProcessPage(seenGroupIds, page);
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunction.java
index b2f8e6b1bc33..fbd2ddaa816b 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunction.java
@@ -24,7 +24,7 @@ public interface GroupingAggregatorFunction extends Releasable {
      * Consume group ids to cause the {@link GroupingAggregatorFunction}
      * to group values at a particular position into a particular group.
      */
-    interface AddInput {
+    interface AddInput extends Releasable {
         /**
          * Send a batch of group ids to the aggregator. The {@code groupIds}
          * may be offset from the start of the block to allow for sending chunks
@@ -43,6 +43,12 @@ interface AddInput {
          *     {@code groupIds} {@linkplain Block} that contains thousands of
          *     values at a single positions.
          * </p>
+         * <p>
+         *     Finally, it's possible for a single position to be collected into
+         *     <strong>groupIds</strong>. In that case it's positionOffset may
+         *     be skipped entirely or the groupIds block could contain a
+         *     {@code null} value at that position.
+         * </p>
          * @param positionOffset offset into the {@link Page} used to build this
          *                       {@link AddInput} of these ids
          * @param groupIds {@link Block} of group id, some of which may be null
@@ -68,7 +74,7 @@ interface AddInput {
     }
 
     /**
-     * Prepare to process a single page of results.
+     * Prepare to process a single page of input.
      * <p>
      *     This should load the input {@link Block}s and check their types and
      *     select an optimal path and return that path as an {@link AddInput}.
@@ -76,6 +82,16 @@ interface AddInput {
      */
     AddInput prepareProcessPage(SeenGroupIds seenGroupIds, Page page);  // TODO allow returning null to opt out of the callback loop
 
+    /**
+     * Call this to signal to the aggregation that the {@code selected}
+     * parameter that's passed to {@link #evaluateIntermediate} or
+     * {@link #evaluateFinal} may reference groups that haven't been
+     * seen. This puts the underlying storage into a mode where it'll
+     * track which group ids have been seen, even if that increases the
+     * overhead.
+     */
+    void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds);
+
     /**
      * Add data produced by {@link #evaluateIntermediate}.
      */
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialAggregatorFunction.java
index 2083b8ebbfff..6524af116d41 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialAggregatorFunction.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.compute.aggregation;
 
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.CompositeBlock;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.Page;
@@ -37,8 +38,8 @@ public ToPartialAggregatorFunction(AggregatorFunction delegate, List<Integer> ch
     }
 
     @Override
-    public void addRawInput(Page page) {
-        delegate.addRawInput(page);
+    public void addRawInput(Page page, BooleanVector mask) {
+        delegate.addRawInput(page, mask);
     }
 
     @Override
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialGroupingAggregatorFunction.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialGroupingAggregatorFunction.java
index 13d4bd5d6c0d..18b907a3d708 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialGroupingAggregatorFunction.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/ToPartialGroupingAggregatorFunction.java
@@ -60,6 +60,11 @@ public AddInput prepareProcessPage(SeenGroupIds seenGroupIds, Page page) {
         return delegate.prepareProcessPage(seenGroupIds, page);
     }
 
+    @Override
+    public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+        delegate.selectedMayContainUnseenGroups(seenGroupIds);
+    }
+
     @Override
     public void addIntermediateInput(int positionOffset, IntVector groupIdVector, Page page) {
         final CompositeBlock inputBlock = page.getBlock(channels.get(0));
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/AddBlock.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/AddPage.java
similarity index 80%
rename from x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/AddBlock.java
rename to x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/AddPage.java
index 786c61e6f602..4e051c73a364 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/AddBlock.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/AddPage.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.core.Releasable;
+import org.elasticsearch.core.Releasables;
 
 /**
  * Helper for adding a {@link Page} worth of {@link Block}s to a {@link BlockHash}
@@ -21,13 +22,17 @@
  * for how to add values to it. After adding all values, call {@link #emitOrds} to
  * flush the last batch of values to the aggs.
  */
-public class AddBlock implements Releasable {
+public class AddPage implements Releasable {
     private final BlockFactory blockFactory;
-    private final int emitBatchSize;
+    private final long emitBatchSize;
     private final GroupingAggregatorFunction.AddInput addInput;
 
     private int positionOffset = 0;
-    private int added = 0;
+    /**
+     * Number of added documents. This is a {@code long} because callers will
+     * often perform the combinatorial explosion of values.
+     */
+    private long added = 0;
     private IntBlock.Builder ords;
     /**
      * State of the current position.
@@ -49,7 +54,7 @@ public class AddBlock implements Releasable {
      */
     private int firstOrd = -1;
 
-    public AddBlock(BlockFactory blockFactory, int emitBatchSize, GroupingAggregatorFunction.AddInput addInput) {
+    public AddPage(BlockFactory blockFactory, int emitBatchSize, GroupingAggregatorFunction.AddInput addInput) {
         this.blockFactory = blockFactory;
         this.emitBatchSize = emitBatchSize;
         this.addInput = addInput;
@@ -57,6 +62,10 @@ public AddBlock(BlockFactory blockFactory, int emitBatchSize, GroupingAggregator
         this.ords = blockFactory.newIntBlockBuilder(emitBatchSize);
     }
 
+    long added() {
+        return added;
+    }
+
     /**
      * Append a single valued ordinal. This will flush the ordinals to the aggs
      * if we've added {@link #emitBatchSize}.
@@ -64,7 +73,7 @@ public AddBlock(BlockFactory blockFactory, int emitBatchSize, GroupingAggregator
     protected final void appendOrdSv(int position, int ord) {
         assert firstOrd == -1 : "currently in a multivalue position";
         ords.appendInt(ord);
-        if (++added % emitBatchSize == 0) {
+        if (++added % emitBatchSize == 0L) {
             rollover(position + 1);
         }
     }
@@ -77,7 +86,7 @@ protected final void appendOrdSv(int position, int ord) {
     @Deprecated
     protected final void appendNullSv(int position) {
         ords.appendNull();
-        if (++added % emitBatchSize == 0) {
+        if (++added % emitBatchSize == 0L) {
             rollover(position + 1);
         }
     }
@@ -94,7 +103,7 @@ protected final void appendNullSv(int position) {
      * }</pre>
      */
     protected final void appendOrdInMv(int position, int ord) {
-        if (++added % emitBatchSize == 0) {
+        if (++added % emitBatchSize == 0L) {
             switch (firstOrd) {
                 case -1 -> ords.appendInt(ord);
                 case -2 -> {
@@ -135,7 +144,20 @@ protected final void finishMv() {
         firstOrd = -1;
     }
 
-    protected final void emitOrds() {
+    /**
+     * Call when finished to emit all remaining ordinals to the aggs.
+     */
+    protected final void flushRemaining() {
+        if (firstOrd != -1) {
+            throw new IllegalStateException("in the middle of a position");
+        }
+        if (added % emitBatchSize != 0) {
+            // If the % is 0 then we just flushed and there isn't any need to flush an empty block.
+            emitOrds();
+        }
+    }
+
+    private void emitOrds() {
         try (IntBlock ordsBlock = ords.build()) {
             addInput.add(positionOffset, ordsBlock);
         }
@@ -144,11 +166,11 @@ protected final void emitOrds() {
     private void rollover(int position) {
         emitOrds();
         positionOffset = position;
-        ords = blockFactory.newIntBlockBuilder(emitBatchSize); // TODO add a clear method to the builder?
+        ords = blockFactory.newIntBlockBuilder(Math.toIntExact(emitBatchSize));
     }
 
     @Override
     public void close() {
-        ords.close();
+        Releasables.closeExpectNoException(ords, addInput);
     }
 }
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/BytesRef3BlockHash.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/BytesRef3BlockHash.java
index 07600cd7a1dc..54bf068b4de3 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/BytesRef3BlockHash.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/BytesRef3BlockHash.java
@@ -98,7 +98,7 @@ private void addVectors(BytesRefVector v1, BytesRefVector v2, BytesRefVector v3,
         }
     }
 
-    private class AddWork extends AddBlock {
+    private class AddWork extends AddPage {
         final IntBlock b1;
         final IntBlock b2;
         final IntBlock b3;
@@ -137,7 +137,7 @@ void add() {
                 }
                 finishMv();
             }
-            emitOrds();
+            flushRemaining();
         }
     }
 
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/PackedValuesBlockHash.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/PackedValuesBlockHash.java
index 85b3cec274e3..6eb3aef6dfc8 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/PackedValuesBlockHash.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/blockhash/PackedValuesBlockHash.java
@@ -117,7 +117,7 @@ public void close() {
         }
     }
 
-    class AddWork extends AddBlock {
+    class AddWork extends AddPage {
         final Group[] groups;
         final int positionCount;
         int position;
@@ -142,7 +142,7 @@ void add() {
                     addMultipleEntries();
                 }
             }
-            emitOrds();
+            flushRemaining();
         }
 
         private void addSingleEntry() {
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/table/BlockHashRowInTableLookup.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/table/BlockHashRowInTableLookup.java
index 1acd1c30ed33..c198853bb36a 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/table/BlockHashRowInTableLookup.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/aggregation/table/BlockHashRowInTableLookup.java
@@ -65,6 +65,9 @@ public void add(int positionOffset, IntVector groupIds) {
                         lastOrd = ord;
                     }
                 }
+
+                @Override
+                public void close() {}
             });
             success = true;
         } finally {
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AggregationOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AggregationOperator.java
index 260b72dc35d9..175f550ab5d3 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AggregationOperator.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/AggregationOperator.java
@@ -17,6 +17,7 @@
 import org.elasticsearch.compute.aggregation.Aggregator.Factory;
 import org.elasticsearch.compute.aggregation.AggregatorMode;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.core.Releasables;
 import org.elasticsearch.core.TimeValue;
@@ -93,9 +94,9 @@ public void addInput(Page page) {
         long start = System.nanoTime();
         checkState(needsInput(), "Operator is already finishing");
         requireNonNull(page, "page is null");
-        try {
+        try (BooleanVector noMasking = driverContext.blockFactory().newConstantBooleanVector(true, page.getPositionCount())) {
             for (Aggregator aggregator : aggregators) {
-                aggregator.processPage(page);
+                aggregator.processPage(page, noMasking);
             }
         } finally {
             page.releaseBlocks();
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/HashAggregationOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/HashAggregationOperator.java
index 42bc75a49f4a..03a4ca2b0ad5 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/HashAggregationOperator.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/HashAggregationOperator.java
@@ -150,18 +150,23 @@ private void end() {
                     hashStart = System.nanoTime();
                     aggregationNanos += hashStart - aggStart;
                 }
+
+                @Override
+                public void close() {
+                    Releasables.closeExpectNoException(prepared);
+                }
             }
-            AddInput add = new AddInput();
+            try (AddInput add = new AddInput()) {
+                checkState(needsInput(), "Operator is already finishing");
+                requireNonNull(page, "page is null");
 
-            checkState(needsInput(), "Operator is already finishing");
-            requireNonNull(page, "page is null");
+                for (int i = 0; i < prepared.length; i++) {
+                    prepared[i] = aggregators.get(i).prepareProcessPage(blockHash, page);
+                }
 
-            for (int i = 0; i < prepared.length; i++) {
-                prepared[i] = aggregators.get(i).prepareProcessPage(blockHash, page);
+                blockHash.add(wrapPage(page), add);
+                hashNanos += System.nanoTime() - add.hashStart;
             }
-
-            blockHash.add(wrapPage(page), add);
-            hashNanos += System.nanoTime() - add.hashStart;
         } finally {
             page.releaseBlocks();
             pagesProcessed++;
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/mvdedupe/IntLongBlockAdd.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/mvdedupe/IntLongBlockAdd.java
index ecd7df1a7e6c..eb0351c09579 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/mvdedupe/IntLongBlockAdd.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/mvdedupe/IntLongBlockAdd.java
@@ -9,13 +9,13 @@
 
 import org.elasticsearch.common.util.LongLongHash;
 import org.elasticsearch.compute.aggregation.GroupingAggregatorFunction;
-import org.elasticsearch.compute.aggregation.blockhash.AddBlock;
+import org.elasticsearch.compute.aggregation.blockhash.AddPage;
 import org.elasticsearch.compute.aggregation.blockhash.BlockHash;
 import org.elasticsearch.compute.data.BlockFactory;
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.compute.data.LongBlock;
 
-public class IntLongBlockAdd extends AddBlock {
+public class IntLongBlockAdd extends AddPage {
     private final LongLongHash hash;
     private final MultivalueDedupeInt block1;
     private final MultivalueDedupeLong block2;
@@ -39,7 +39,7 @@ public void add() {
         for (int p = 0; p < positions; p++) {
             add1(p);
         }
-        emitOrds();
+        flushRemaining();
     }
 
     private void add1(int position) {
diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/mvdedupe/LongLongBlockAdd.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/mvdedupe/LongLongBlockAdd.java
index 1f117498b078..b59a43f0f93a 100644
--- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/mvdedupe/LongLongBlockAdd.java
+++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/mvdedupe/LongLongBlockAdd.java
@@ -9,12 +9,12 @@
 
 import org.elasticsearch.common.util.LongLongHash;
 import org.elasticsearch.compute.aggregation.GroupingAggregatorFunction;
-import org.elasticsearch.compute.aggregation.blockhash.AddBlock;
+import org.elasticsearch.compute.aggregation.blockhash.AddPage;
 import org.elasticsearch.compute.aggregation.blockhash.BlockHash;
 import org.elasticsearch.compute.data.BlockFactory;
 import org.elasticsearch.compute.data.LongBlock;
 
-public class LongLongBlockAdd extends AddBlock {
+public class LongLongBlockAdd extends AddPage {
     private final LongLongHash hash;
     private final MultivalueDedupeLong block1;
     private final MultivalueDedupeLong block2;
@@ -38,7 +38,7 @@ public void add() {
         for (int p = 0; p < positions; p++) {
             add1(p);
         }
-        emitOrds();
+        flushRemaining();
     }
 
     private void add1(int position) {
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/AggregatorFunctionTestCase.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/AggregatorFunctionTestCase.java
index 6e56b96bda06..275038e6d2f0 100644
--- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/AggregatorFunctionTestCase.java
+++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/AggregatorFunctionTestCase.java
@@ -69,8 +69,14 @@ protected final Matcher<String> expectedDescriptionOfSimple() {
 
     @Override
     protected final Matcher<String> expectedToStringOfSimple() {
+        return equalTo(
+            "AggregationOperator[aggregators=[Aggregator[aggregatorFunction=" + expectedToStringOfSimpleAggregator() + ", mode=SINGLE]]]"
+        );
+    }
+
+    protected String expectedToStringOfSimpleAggregator() {
         String type = getClass().getSimpleName().replace("Tests", "");
-        return equalTo("AggregationOperator[aggregators=[Aggregator[aggregatorFunction=" + type + "[channels=[0]], mode=SINGLE]]]");
+        return type + "[channels=[0]]";
     }
 
     @Override
@@ -162,7 +168,7 @@ public final void testEmptyInputInitialIntermediateFinal() {
 
     // Returns an intermediate state that is equivalent to what the local execution planner will emit
     // if it determines that certain shards have no relevant data.
-    final List<Page> nullIntermediateState(BlockFactory blockFactory) {
+    List<Page> nullIntermediateState(BlockFactory blockFactory) {
         try (var agg = aggregatorFunction(List.of()).aggregator(driverContext())) {
             var method = agg.getClass().getMethod("intermediateStateDesc");
             @SuppressWarnings("unchecked")
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunctionTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunctionTests.java
new file mode 100644
index 000000000000..6ad3251d3c12
--- /dev/null
+++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/FilteredAggregatorFunctionTests.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.compute.aggregation;
+
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BlockFactory;
+import org.elasticsearch.compute.data.IntBlock;
+import org.elasticsearch.compute.data.LongBlock;
+import org.elasticsearch.compute.data.Page;
+import org.elasticsearch.compute.operator.SequenceIntBlockSourceOperator;
+import org.elasticsearch.compute.operator.SourceOperator;
+import org.junit.After;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.equalTo;
+
+public class FilteredAggregatorFunctionTests extends AggregatorFunctionTestCase {
+    private final List<Exception> unclosed = Collections.synchronizedList(new ArrayList<>());
+
+    // TODO some version of this test that applies across all aggs
+    @Override
+    protected AggregatorFunctionSupplier aggregatorFunction(List<Integer> inputChannels) {
+        return new FilteredAggregatorFunctionSupplier(
+            new SumIntAggregatorFunctionSupplier(inputChannels),
+            new FilteredGroupingAggregatorFunctionTests.AnyGreaterThanFactory(unclosed, inputChannels)
+        );
+    }
+
+    @Override
+    protected String expectedDescriptionOfAggregator() {
+        return "Filtered[next=sum of ints, filter=any > 0]";
+    }
+
+    @Override
+    protected String expectedToStringOfSimpleAggregator() {
+        return "FilteredAggregatorFunction[next=SumIntAggregatorFunction[channels=[0]], filter=any > 0]";
+    }
+
+    @Override
+    protected void assertSimpleOutput(List<Block> input, Block result) {
+        long sum = 0;
+        for (Block block : input) {
+            IntBlock ints = (IntBlock) block;
+            for (int p = 0; p < ints.getPositionCount(); p++) {
+                /*
+                 * Perform the sum on the values *only* if any of the
+                 * values is > 0 to line up with the condition
+                 */
+                int start = ints.getFirstValueIndex(p);
+                int end = start + ints.getValueCount(p);
+                boolean selected = false;
+                for (int i = start; i < end; i++) {
+                    selected |= ints.getInt(i) > 0;
+                }
+                if (selected == false) {
+                    continue;
+                }
+                start = ints.getFirstValueIndex(p);
+                end = start + ints.getValueCount(p);
+                for (int i = start; i < end; i++) {
+                    sum += ints.getInt(i);
+                }
+            }
+        }
+        assertThat(((LongBlock) result).getLong(0), equalTo(sum));
+    }
+
+    @Override
+    protected List<Page> nullIntermediateState(BlockFactory blockFactory) {
+        return new SumIntAggregatorFunctionTests().nullIntermediateState(blockFactory);
+    }
+
+    @Override
+    protected SourceOperator simpleInput(BlockFactory blockFactory, int size) {
+        int max = between(1, Integer.MAX_VALUE / size / 5);
+        return new SequenceIntBlockSourceOperator(blockFactory, IntStream.range(0, size).map(l -> between(-max, max)));
+    }
+
+    @After
+    public void checkUnclosed() {
+        for (Exception tracker : unclosed) {
+            logger.error("unclosed", tracker);
+        }
+        assertThat(unclosed, empty());
+    }
+}
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunctionTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunctionTests.java
new file mode 100644
index 000000000000..87cb99bd0709
--- /dev/null
+++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/FilteredGroupingAggregatorFunctionTests.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.compute.aggregation;
+
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BlockFactory;
+import org.elasticsearch.compute.data.BooleanVector;
+import org.elasticsearch.compute.data.IntBlock;
+import org.elasticsearch.compute.data.LongBlock;
+import org.elasticsearch.compute.data.Page;
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+import org.elasticsearch.compute.operator.LongIntBlockSourceOperator;
+import org.elasticsearch.compute.operator.SourceOperator;
+import org.elasticsearch.core.Tuple;
+import org.junit.After;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.equalTo;
+
+public class FilteredGroupingAggregatorFunctionTests extends GroupingAggregatorFunctionTestCase {
+    private final List<Exception> unclosed = Collections.synchronizedList(new ArrayList<>());
+
+    // TODO some version of this test that applies across all aggs
+    @Override
+    protected AggregatorFunctionSupplier aggregatorFunction(List<Integer> inputChannels) {
+        return new FilteredAggregatorFunctionSupplier(
+            new SumIntAggregatorFunctionSupplier(inputChannels),
+            new AnyGreaterThanFactory(unclosed, inputChannels)
+        );
+    }
+
+    @Override
+    protected String expectedDescriptionOfAggregator() {
+        return "Filtered[next=sum of ints, filter=any > 0]";
+    }
+
+    @Override
+    protected String expectedToStringOfSimpleAggregator() {
+        return "FilteredGroupingAggregatorFunction[next=SumIntGroupingAggregatorFunction[channels=[1]], filter=any > 0]";
+    }
+
+    @Override
+    protected void assertSimpleGroup(List<Page> input, Block result, int position, Long group) {
+        long sum = 0;
+        for (Page page : input) {
+            LongBlock groups = page.getBlock(0);
+            IntBlock ints = page.getBlock(1);
+            for (int p = 0; p < ints.getPositionCount(); p++) {
+                /*
+                 * Perform the sum on the values *only* if:
+                 * 1. Any of the values is > 0 to line up with the condition
+                 * 2. Any of the groups matches the group we're asserting
+                 */
+                int start = ints.getFirstValueIndex(p);
+                int end = start + ints.getValueCount(p);
+                boolean selected = false;
+                for (int i = start; i < end; i++) {
+                    selected |= ints.getInt(i) > 0;
+                }
+                if (selected == false) {
+                    continue;
+                }
+                selected = false;
+                if (group == null) {
+                    selected = groups.isNull(p);
+                } else {
+                    start = groups.getFirstValueIndex(p);
+                    end = start + groups.getValueCount(p);
+                    for (int i = start; i < end; i++) {
+                        selected |= groups.getLong(i) == group;
+                    }
+                }
+                if (selected == false) {
+                    continue;
+                }
+
+                start = ints.getFirstValueIndex(p);
+                end = start + ints.getValueCount(p);
+                for (int i = start; i < end; i++) {
+                    sum += ints.getInt(i);
+                }
+            }
+        }
+        assertThat(((LongBlock) result).getLong(position), equalTo(sum));
+    }
+
+    @Override
+    protected SourceOperator simpleInput(BlockFactory blockFactory, int size) {
+        int max = between(1, Integer.MAX_VALUE / size / 5);
+        return new LongIntBlockSourceOperator(
+            blockFactory,
+            IntStream.range(0, size).mapToObj(l -> Tuple.tuple(randomLongBetween(0, 4), between(-max, max)))
+        );
+    }
+
+    @After
+    public void checkUnclosed() {
+        for (Exception tracker : unclosed) {
+            logger.error("unclosed", tracker);
+        }
+        assertThat(unclosed, empty());
+    }
+
+    /**
+     * This checks if *any* of the integers are > 0. If so we push the group to
+     * the aggregation.
+     */
+    record AnyGreaterThanFactory(List<Exception> unclosed, List<Integer> inputChannels)
+        implements
+            EvalOperator.ExpressionEvaluator.Factory {
+        @Override
+        public EvalOperator.ExpressionEvaluator get(DriverContext context) {
+            Exception tracker = new Exception(Integer.toString(unclosed.size()));
+            unclosed.add(tracker);
+            return new AnyGreaterThan(context.blockFactory(), unclosed, tracker, inputChannels);
+        }
+
+        @Override
+        public String toString() {
+            return "any > 0";
+        }
+    }
+
+    private record AnyGreaterThan(BlockFactory blockFactory, List<Exception> unclosed, Exception tracker, List<Integer> inputChannels)
+        implements
+            EvalOperator.ExpressionEvaluator {
+        @Override
+        public Block eval(Page page) {
+            IntBlock ints = page.getBlock(inputChannels.get(0));
+            try (BooleanVector.FixedBuilder result = blockFactory.newBooleanVectorFixedBuilder(ints.getPositionCount())) {
+                position: for (int p = 0; p < ints.getPositionCount(); p++) {
+                    int start = ints.getFirstValueIndex(p);
+                    int end = start + ints.getValueCount(p);
+                    for (int i = start; i < end; i++) {
+                        if (ints.getInt(i) > 0) {
+                            result.appendBoolean(p, true);
+                            continue position;
+                        }
+                    }
+                    result.appendBoolean(p, false);
+                }
+                return result.build().asBlock();
+            }
+        }
+
+        @Override
+        public void close() {
+            if (unclosed.remove(tracker) == false) {
+                throw new IllegalStateException("close failure!");
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "any > 0";
+        }
+    }
+}
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java
index f6558d54b277..de9337f5fce2 100644
--- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java
+++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/GroupingAggregatorFunctionTestCase.java
@@ -52,11 +52,14 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 
+/**
+ * Shared tests for testing grouped aggregations.
+ */
 public abstract class GroupingAggregatorFunctionTestCase extends ForkingOperatorTestCase {
     protected abstract AggregatorFunctionSupplier aggregatorFunction(List<Integer> inputChannels);
 
     protected final int aggregatorIntermediateBlockCount() {
-        try (var agg = aggregatorFunction(List.of()).aggregator(driverContext())) {
+        try (var agg = aggregatorFunction(List.of()).groupingAggregator(driverContext())) {
             return agg.intermediateBlockCount();
         }
     }
@@ -101,16 +104,20 @@ protected final Matcher<String> expectedDescriptionOfSimple() {
     @Override
     protected final Matcher<String> expectedToStringOfSimple() {
         String hash = "blockHash=LongBlockHash{channel=0, entries=0, seenNull=false}";
-        String type = getClass().getSimpleName().replace("Tests", "");
         return equalTo(
             "HashAggregationOperator["
                 + hash
                 + ", aggregators=[GroupingAggregator[aggregatorFunction="
-                + type
-                + "[channels=[1]], mode=SINGLE]]]"
+                + expectedToStringOfSimpleAggregator()
+                + ", mode=SINGLE]]]"
         );
     }
 
+    protected String expectedToStringOfSimpleAggregator() {
+        String type = getClass().getSimpleName().replace("Tests", "");
+        return type + "[channels=[1]]";
+    }
+
     private SeenGroups seenGroups(List<Page> input) {
         boolean seenNullGroup = false;
         SortedSet<Long> seenGroups = new TreeSet<>();
@@ -544,7 +551,7 @@ public GroupingAggregatorFunction groupingAggregator(DriverContext driverContext
                     @Override
                     public AddInput prepareProcessPage(SeenGroupIds ignoredSeenGroupIds, Page page) {
                         return new AddInput() {
-                            AddInput delegateAddInput = delegate.prepareProcessPage(bigArrays -> {
+                            final AddInput delegateAddInput = delegate.prepareProcessPage(bigArrays -> {
                                 BitArray seen = new BitArray(0, bigArrays);
                                 seen.or(seenGroupIds);
                                 return seen;
@@ -595,9 +602,19 @@ public void add(int positionOffset, IntVector groupIds) {
                                     delegateAddInput.add(positionOffset + offset, blockFactory.newIntArrayVector(chunk, count));
                                 }
                             }
+
+                            @Override
+                            public void close() {
+                                delegateAddInput.close();
+                            }
                         };
                     }
 
+                    @Override
+                    public void selectedMayContainUnseenGroups(SeenGroupIds seenGroupIds) {
+                        delegate.selectedMayContainUnseenGroups(seenGroupIds);
+                    }
+
                     @Override
                     public void addIntermediateInput(int positionOffset, IntVector groupIds, Page page) {
                         int[] chunk = new int[emitChunkSize];
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/AddBlockTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/AddPageTests.java
similarity index 63%
rename from x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/AddBlockTests.java
rename to x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/AddPageTests.java
index fbe696aa2997..810402d82c9d 100644
--- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/AddBlockTests.java
+++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/AddPageTests.java
@@ -19,32 +19,35 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
 import static org.hamcrest.Matchers.equalTo;
 
-public class AddBlockTests extends ESTestCase {
+public class AddPageTests extends ESTestCase {
     private final BlockFactory blockFactory = BlockFactoryTests.blockFactory(ByteSizeValue.ofGb(1));
 
     public void testSv() {
         TestAddInput result = new TestAddInput();
         List<Added> expected = new ArrayList<>();
-        try (AddBlock add = new AddBlock(blockFactory, 3, result)) {
+        try (AddPage add = new AddPage(blockFactory, 3, result)) {
             add.appendOrdSv(0, 0);
             add.appendOrdSv(1, 2);
             add.appendOrdSv(2, 3);
             expected.add(added(0, 0, 2, 3));
             assertThat(result.added, equalTo(expected));
             add.appendOrdSv(3, 4);
-            add.emitOrds();
+            add.flushRemaining();
+            assertThat(add.added(), equalTo(4L));
         }
         expected.add(added(3, 4));
         assertThat(result.added, equalTo(expected));
+        assertThat(result.closed, equalTo(true));
     }
 
     public void testMvBlockEndsOnBatchBoundary() {
         TestAddInput result = new TestAddInput();
         List<Added> expected = new ArrayList<>();
-        try (AddBlock add = new AddBlock(blockFactory, 3, result)) {
+        try (AddPage add = new AddPage(blockFactory, 3, result)) {
             add.appendOrdInMv(0, 0);
             add.appendOrdInMv(0, 2);
             add.appendOrdInMv(0, 3);
@@ -57,17 +60,22 @@ public void testMvBlockEndsOnBatchBoundary() {
             expected.add(new Added(0, List.of(List.of(4), List.of(0, 2))));
             assertThat(result.added, equalTo(expected));
             add.finishMv();
-            add.emitOrds();
+            add.flushRemaining();
+            assertThat(add.added(), equalTo(6L));
         }
-        // We uselessly flush an empty position if emitBatchSize lines up with the total count
-        expected.add(new Added(1, List.of(List.of())));
+        /*
+         * We do *not* uselessly flush an empty Block of ordinals. Doing so would
+         * be a slight performance hit, but, worse, makes testing harder to reason
+         * about.
+         */
         assertThat(result.added, equalTo(expected));
+        assertThat(result.closed, equalTo(true));
     }
 
     public void testMvPositionEndOnBatchBoundary() {
         TestAddInput result = new TestAddInput();
         List<Added> expected = new ArrayList<>();
-        try (AddBlock add = new AddBlock(blockFactory, 4, result)) {
+        try (AddPage add = new AddPage(blockFactory, 4, result)) {
             add.appendOrdInMv(0, 0);
             add.appendOrdInMv(0, 2);
             add.appendOrdInMv(0, 3);
@@ -78,17 +86,19 @@ public void testMvPositionEndOnBatchBoundary() {
             add.appendOrdInMv(1, 0);
             add.appendOrdInMv(1, 2);
             add.finishMv();
-            add.emitOrds();
+            add.flushRemaining();
+            assertThat(add.added(), equalTo(6L));
         }
         // Because the first position ended on a block boundary we uselessly emit an empty position there
         expected.add(new Added(0, List.of(List.of(), List.of(0, 2))));
         assertThat(result.added, equalTo(expected));
+        assertThat(result.closed, equalTo(true));
     }
 
     public void testMv() {
         TestAddInput result = new TestAddInput();
         List<Added> expected = new ArrayList<>();
-        try (AddBlock add = new AddBlock(blockFactory, 5, result)) {
+        try (AddPage add = new AddPage(blockFactory, 5, result)) {
             add.appendOrdInMv(0, 0);
             add.appendOrdInMv(0, 2);
             add.appendOrdInMv(0, 3);
@@ -99,10 +109,41 @@ public void testMv() {
             assertThat(result.added, equalTo(expected));
             add.appendOrdInMv(1, 2);
             add.finishMv();
-            add.emitOrds();
+            add.flushRemaining();
+            assertThat(add.added(), equalTo(6L));
         }
         expected.add(new Added(1, List.of(List.of(2))));
         assertThat(result.added, equalTo(expected));
+        assertThat(result.closed, equalTo(true));
+    }
+
+    /**
+     * Test that we can add more than {@link Integer#MAX_VALUE} values. That's
+     * more than two billion values. We've made the call as fast as we can.
+     * Locally this test takes about 40 seconds for Nik.
+     */
+    public void testMvBillions() {
+        CountingAddInput counter = new CountingAddInput();
+        try (AddPage add = new AddPage(blockFactory, 5, counter)) {
+            for (int i = 0; i < Integer.MAX_VALUE; i++) {
+                add.appendOrdInMv(0, 0);
+                assertThat(add.added(), equalTo((long) i + 1));
+                if (i % 5 == 0) {
+                    assertThat(counter.count, equalTo(i / 5));
+                }
+                if (i % 10_000_000 == 0) {
+                    logger.info(String.format(Locale.ROOT, "Progress: %02.0f%%", 100 * ((double) i / Integer.MAX_VALUE)));
+                }
+            }
+            add.finishMv();
+            add.appendOrdInMv(1, 0);
+            assertThat(add.added(), equalTo(Integer.MAX_VALUE + 1L));
+            add.appendOrdInMv(1, 0);
+            assertThat(add.added(), equalTo(Integer.MAX_VALUE + 2L));
+            add.finishMv();
+            add.flushRemaining();
+            assertThat(counter.count, equalTo(Integer.MAX_VALUE / 5 + 1));
+        }
     }
 
     @After
@@ -117,6 +158,8 @@ Added added(int positionOffset, int... ords) {
     }
 
     private class TestAddInput implements GroupingAggregatorFunction.AddInput {
+        private boolean closed = false;
+
         private final List<Added> added = new ArrayList<>();
 
         @Override
@@ -139,5 +182,27 @@ public void add(int positionOffset, IntBlock groupIds) {
         public void add(int positionOffset, IntVector groupIds) {
             add(positionOffset, groupIds.asBlock());
         }
+
+        @Override
+        public void close() {
+            closed = true;
+        }
+    }
+
+    private class CountingAddInput implements GroupingAggregatorFunction.AddInput {
+        private int count;
+
+        @Override
+        public void add(int positionOffset, IntBlock groupIds) {
+            count++;
+        }
+
+        @Override
+        public void add(int positionOffset, IntVector groupIds) {
+            count++;
+        }
+
+        @Override
+        public void close() {}
     }
 }
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/BlockHashTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/BlockHashTests.java
index 259d4f1249d6..c4042ea15afc 100644
--- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/BlockHashTests.java
+++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/aggregation/blockhash/BlockHashTests.java
@@ -1166,6 +1166,9 @@ public void add(int positionOffset, IntVector groupIds) {
                     groupIds.incRef();
                     output1.add(new Output(positionOffset, null, groupIds));
                 }
+
+                @Override
+                public void close() {}
             });
             hash2.add(page, new GroupingAggregatorFunction.AddInput() {
                 @Override
@@ -1179,6 +1182,9 @@ public void add(int positionOffset, IntVector groupIds) {
                     groupIds.incRef();
                     output2.add(new Output(positionOffset, null, groupIds));
                 }
+
+                @Override
+                public void close() {}
             });
             assertThat(output1.size(), equalTo(output1.size()));
             for (int i = 0; i < output1.size(); i++) {
@@ -1297,6 +1303,9 @@ public void add(int positionOffset, IntBlock groupIds) {
             public void add(int positionOffset, IntVector groupIds) {
                 add(positionOffset, groupIds.asBlock());
             }
+
+            @Override
+            public void close() {}
         });
         if (blockHash instanceof LongLongBlockHash == false
             && blockHash instanceof BytesRefLongBlockHash == false
diff --git a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockSerializationTests.java b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockSerializationTests.java
index 8ca02b64f01f..5a439becd475 100644
--- a/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockSerializationTests.java
+++ b/x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/data/BlockSerializationTests.java
@@ -236,10 +236,10 @@ public void testConstantNullBlock() throws IOException {
     public void testSimulateAggs() {
         DriverContext driverCtx = driverContext();
         Page page = new Page(blockFactory.newLongArrayVector(new long[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }, 10).asBlock());
-        var bigArrays = BigArrays.NON_RECYCLING_INSTANCE;
-        var params = new Object[] {};
         var function = SumLongAggregatorFunction.create(driverCtx, List.of(0));
-        function.addRawInput(page);
+        try (BooleanVector noMasking = driverContext().blockFactory().newConstantBooleanVector(true, page.getPositionCount())) {
+            function.addRawInput(page, noMasking);
+        }
         Block[] blocks = new Block[function.intermediateBlockCount()];
         try {
             function.evaluateIntermediate(blocks, 0, driverCtx);
diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/FieldExtractorTestCase.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/FieldExtractorTestCase.java
index 6fec6e2fca28..f5de02814c65 100644
--- a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/FieldExtractorTestCase.java
+++ b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/FieldExtractorTestCase.java
@@ -220,7 +220,8 @@ public void testFloat() throws IOException {
 
     public void testScaledFloat() throws IOException {
         double value = randomBoolean() ? randomDoubleBetween(-Double.MAX_VALUE, Double.MAX_VALUE, true) : randomFloat();
-        double scalingFactor = randomDoubleBetween(0, Double.MAX_VALUE, false);
+        // Scale factors less than about 5.6e-309 will result in NaN (due to 1/scaleFactor being infinity)
+        double scalingFactor = randomDoubleBetween(1e-308, Double.MAX_VALUE, false);
         new Test("scaled_float").expectedType("double")
             .randomIgnoreMalformedUnlessSynthetic()
             .randomDocValuesUnlessSynthetic()
diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java
index 6f5297bbeef4..d9d11c3568ab 100644
--- a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java
+++ b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java
@@ -609,6 +609,41 @@ public void testErrorMessageForInvalidParams() throws IOException {
         assertThat(EntityUtils.toString(re.getResponse().getEntity()), containsString("Unknown query parameter [n0], did you mean [n1]"));
     }
 
+    public void testErrorMessageForInvalidIntervalParams() throws IOException {
+        ResponseException re = expectThrows(
+            ResponseException.class,
+            () -> runEsqlSync(
+                requestObjectBuilder().query("row x = ?n1::datetime | eval y = x + ?n2::time_duration")
+                    .params("[{\"n1\": \"2024-01-01\"}, {\"n2\": \"3 days\"}]")
+            )
+        );
+
+        String error = re.getMessage().replaceAll("\\\\\n\s+\\\\", "");
+        assertThat(
+            error,
+            containsString(
+                "Invalid interval value in [?n2::time_duration], expected integer followed by one of "
+                    + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 days]"
+            )
+        );
+
+        re = expectThrows(
+            ResponseException.class,
+            () -> runEsqlSync(
+                requestObjectBuilder().query("row x = ?n1::datetime | eval y = x - ?n2::date_period")
+                    .params("[{\"n1\": \"2024-01-01\"}, {\"n2\": \"3 hours\"}]")
+            )
+        );
+        error = re.getMessage().replaceAll("\\\\\n\s+\\\\", "");
+        assertThat(
+            error,
+            containsString(
+                "Invalid interval value in [?n2::date_period], expected integer followed by one of "
+                    + "[DAY, DAYS, D, WEEK, WEEKS, W, MONTH, MONTHS, MO, QUARTER, QUARTERS, Q, YEAR, YEARS, YR, Y] but got [3 hours]"
+            )
+        );
+    }
+
     public void testErrorMessageForLiteralDateMathOverflow() throws IOException {
         List<String> dateMathOverflowExpressions = List.of(
             "2147483647 day + 1 day",
diff --git a/x-pack/plugin/esql/qa/testFixtures/build.gradle b/x-pack/plugin/esql/qa/testFixtures/build.gradle
index e8a95011100f..b6ed61040663 100644
--- a/x-pack/plugin/esql/qa/testFixtures/build.gradle
+++ b/x-pack/plugin/esql/qa/testFixtures/build.gradle
@@ -2,16 +2,18 @@ apply plugin: 'elasticsearch.java'
 apply plugin: org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin
 
 dependencies {
-    implementation project(':x-pack:plugin:esql:compute')
-    implementation project(':x-pack:plugin:esql')
-    compileOnly project(path: xpackModule('core'))
-    implementation project(":libs:elasticsearch-x-content")
-    implementation project(':client:rest')
-    implementation project(':libs:elasticsearch-logging')
-    implementation project(':test:framework')
-    api(testArtifact(project(xpackModule('esql-core'))))
-    implementation project(':server')
-    implementation "net.sf.supercsv:super-csv:${versions.supercsv}"
+  implementation project(':x-pack:plugin:esql:compute')
+  implementation project(':x-pack:plugin:esql')
+  compileOnly project(path: xpackModule('core'))
+  implementation project(":libs:elasticsearch-x-content")
+  implementation project(':client:rest')
+  implementation project(':libs:elasticsearch-logging')
+  implementation project(':test:framework')
+  api(testArtifact(project(xpackModule('esql-core'))))
+  implementation project(':server')
+  implementation "net.sf.supercsv:super-csv:${versions.supercsv}"
+  implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
+  implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
 }
 
 /**
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java
index c934a8926ee7..70a054f233a3 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestUtils.java
@@ -118,7 +118,7 @@ public static Tuple<Version, Version> skipVersionRange(String testName, String i
         return null;
     }
 
-    public static Tuple<Page, List<String>> loadPageFromCsv(URL source) throws Exception {
+    public static Tuple<Page, List<String>> loadPageFromCsv(URL source, Map<String, String> typeMapping) throws Exception {
 
         record CsvColumn(String name, Type type, BuilderWrapper builderWrapper) implements Releasable {
             void append(String stringValue) {
@@ -164,21 +164,16 @@ public void close() {
                     if (columns == null) {
                         columns = new CsvColumn[entries.length];
                         for (int i = 0; i < entries.length; i++) {
-                            int split = entries[i].indexOf(':');
-                            String name, typeName;
+                            String[] header = entries[i].split(":");
+                            String name = header[0].trim();
+                            String typeName = (typeMapping != null && typeMapping.containsKey(name)) ? typeMapping.get(name)
+                                : header.length > 1 ? header[1].trim()
+                                : null;
 
-                            if (split < 0) {
+                            if (typeName == null || typeName.isEmpty()) {
                                 throw new IllegalArgumentException(
                                     "A type is always expected in the schema definition; found " + entries[i]
                                 );
-                            } else {
-                                name = entries[i].substring(0, split).trim();
-                                typeName = entries[i].substring(split + 1).trim();
-                                if (typeName.length() == 0) {
-                                    throw new IllegalArgumentException(
-                                        "A type is always expected in the schema definition; found " + entries[i]
-                                    );
-                                }
                             }
                             Type type = Type.asType(typeName);
                             if (type == null) {
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
index 9ee22113a424..068adf190653 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvTestsDataLoader.java
@@ -6,6 +6,10 @@
  */
 package org.elasticsearch.xpack.esql;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
@@ -17,20 +21,13 @@
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
-import org.elasticsearch.cluster.ClusterModule;
-import org.elasticsearch.common.CheckedBiFunction;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.logging.LogConfigurator;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.logging.LogManager;
 import org.elasticsearch.logging.Logger;
 import org.elasticsearch.test.rest.ESRestTestCase;
-import org.elasticsearch.xcontent.NamedXContentRegistry;
-import org.elasticsearch.xcontent.XContent;
-import org.elasticsearch.xcontent.XContentParser;
-import org.elasticsearch.xcontent.XContentParserConfiguration;
 import org.elasticsearch.xcontent.XContentType;
 
 import java.io.BufferedReader;
@@ -51,66 +48,43 @@
 
 public class CsvTestsDataLoader {
     private static final int BULK_DATA_SIZE = 100_000;
-    private static final TestsDataset EMPLOYEES = new TestsDataset("employees", "mapping-default.json", "employees.csv", null, false);
-    private static final TestsDataset HOSTS = new TestsDataset("hosts", "mapping-hosts.json", "hosts.csv");
-    private static final TestsDataset APPS = new TestsDataset("apps", "mapping-apps.json", "apps.csv");
-    private static final TestsDataset LANGUAGES = new TestsDataset("languages", "mapping-languages.json", "languages.csv");
-    private static final TestsDataset ALERTS = new TestsDataset("alerts", "mapping-alerts.json", "alerts.csv");
-    private static final TestsDataset UL_LOGS = new TestsDataset("ul_logs", "mapping-ul_logs.json", "ul_logs.csv");
-    private static final TestsDataset SAMPLE_DATA = new TestsDataset("sample_data", "mapping-sample_data.json", "sample_data.csv");
-    private static final TestsDataset SAMPLE_DATA_STR = new TestsDataset(
-        "sample_data_str",
-        "mapping-sample_data_str.json",
-        "sample_data_str.csv"
-    );
-    private static final TestsDataset SAMPLE_DATA_TS_LONG = new TestsDataset(
-        "sample_data_ts_long",
-        "mapping-sample_data_ts_long.json",
-        "sample_data_ts_long.csv"
-    );
-    private static final TestsDataset MISSING_IP_SAMPLE_DATA = new TestsDataset(
-        "missing_ip_sample_data",
-        "mapping-missing_ip_sample_data.json",
-        "missing_ip_sample_data.csv"
-    );
-    private static final TestsDataset CLIENT_IPS = new TestsDataset("clientips", "mapping-clientips.json", "clientips.csv");
-    private static final TestsDataset CLIENT_CIDR = new TestsDataset("client_cidr", "mapping-client_cidr.json", "client_cidr.csv");
-    private static final TestsDataset AGES = new TestsDataset("ages", "mapping-ages.json", "ages.csv");
-    private static final TestsDataset HEIGHTS = new TestsDataset("heights", "mapping-heights.json", "heights.csv");
-    private static final TestsDataset DECADES = new TestsDataset("decades", "mapping-decades.json", "decades.csv");
-    private static final TestsDataset AIRPORTS = new TestsDataset("airports", "mapping-airports.json", "airports.csv");
-    private static final TestsDataset AIRPORTS_MP = new TestsDataset("airports_mp", "mapping-airports.json", "airports_mp.csv");
-    private static final TestsDataset AIRPORTS_WEB = new TestsDataset("airports_web", "mapping-airports_web.json", "airports_web.csv");
-    private static final TestsDataset DATE_NANOS = new TestsDataset("date_nanos", "mapping-date_nanos.json", "date_nanos.csv");
-    private static final TestsDataset COUNTRIES_BBOX = new TestsDataset(
-        "countries_bbox",
-        "mapping-countries_bbox.json",
-        "countries_bbox.csv"
-    );
-    private static final TestsDataset COUNTRIES_BBOX_WEB = new TestsDataset(
-        "countries_bbox_web",
-        "mapping-countries_bbox_web.json",
-        "countries_bbox_web.csv"
-    );
-    private static final TestsDataset AIRPORT_CITY_BOUNDARIES = new TestsDataset(
-        "airport_city_boundaries",
-        "mapping-airport_city_boundaries.json",
-        "airport_city_boundaries.csv"
-    );
-    private static final TestsDataset CARTESIAN_MULTIPOLYGONS = new TestsDataset(
-        "cartesian_multipolygons",
-        "mapping-cartesian_multipolygons.json",
-        "cartesian_multipolygons.csv"
-    );
-    private static final TestsDataset DISTANCES = new TestsDataset("distances", "mapping-distances.json", "distances.csv");
-    private static final TestsDataset K8S = new TestsDataset("k8s", "k8s-mappings.json", "k8s.csv", "k8s-settings.json", true);
-    private static final TestsDataset ADDRESSES = new TestsDataset("addresses", "mapping-addresses.json", "addresses.csv", null, true);
-    private static final TestsDataset BOOKS = new TestsDataset("books", "mapping-books.json", "books.csv", null, true);
+    private static final TestsDataset EMPLOYEES = new TestsDataset("employees", "mapping-default.json", "employees.csv").noSubfields();
+    private static final TestsDataset HOSTS = new TestsDataset("hosts");
+    private static final TestsDataset APPS = new TestsDataset("apps");
+    private static final TestsDataset APPS_SHORT = APPS.withIndex("apps_short").withTypeMapping(Map.of("id", "short"));
+    private static final TestsDataset LANGUAGES = new TestsDataset("languages");
+    private static final TestsDataset ALERTS = new TestsDataset("alerts");
+    private static final TestsDataset UL_LOGS = new TestsDataset("ul_logs");
+    private static final TestsDataset SAMPLE_DATA = new TestsDataset("sample_data");
+    private static final TestsDataset SAMPLE_DATA_STR = SAMPLE_DATA.withIndex("sample_data_str")
+        .withTypeMapping(Map.of("client_ip", "keyword"));
+    private static final TestsDataset SAMPLE_DATA_TS_LONG = SAMPLE_DATA.withIndex("sample_data_ts_long")
+        .withData("sample_data_ts_long.csv")
+        .withTypeMapping(Map.of("@timestamp", "long"));
+    private static final TestsDataset MISSING_IP_SAMPLE_DATA = new TestsDataset("missing_ip_sample_data");
+    private static final TestsDataset CLIENT_IPS = new TestsDataset("clientips");
+    private static final TestsDataset CLIENT_CIDR = new TestsDataset("client_cidr");
+    private static final TestsDataset AGES = new TestsDataset("ages");
+    private static final TestsDataset HEIGHTS = new TestsDataset("heights");
+    private static final TestsDataset DECADES = new TestsDataset("decades");
+    private static final TestsDataset AIRPORTS = new TestsDataset("airports");
+    private static final TestsDataset AIRPORTS_MP = AIRPORTS.withIndex("airports_mp").withData("airports_mp.csv");
+    private static final TestsDataset AIRPORTS_WEB = new TestsDataset("airports_web");
+    private static final TestsDataset DATE_NANOS = new TestsDataset("date_nanos");
+    private static final TestsDataset COUNTRIES_BBOX = new TestsDataset("countries_bbox");
+    private static final TestsDataset COUNTRIES_BBOX_WEB = new TestsDataset("countries_bbox_web");
+    private static final TestsDataset AIRPORT_CITY_BOUNDARIES = new TestsDataset("airport_city_boundaries");
+    private static final TestsDataset CARTESIAN_MULTIPOLYGONS = new TestsDataset("cartesian_multipolygons");
+    private static final TestsDataset DISTANCES = new TestsDataset("distances");
+    private static final TestsDataset K8S = new TestsDataset("k8s", "k8s-mappings.json", "k8s.csv").withSetting("k8s-settings.json");
+    private static final TestsDataset ADDRESSES = new TestsDataset("addresses");
+    private static final TestsDataset BOOKS = new TestsDataset("books");
 
     public static final Map<String, TestsDataset> CSV_DATASET_MAP = Map.ofEntries(
         Map.entry(EMPLOYEES.indexName, EMPLOYEES),
         Map.entry(HOSTS.indexName, HOSTS),
         Map.entry(APPS.indexName, APPS),
+        Map.entry(APPS_SHORT.indexName, APPS_SHORT),
         Map.entry(LANGUAGES.indexName, LANGUAGES),
         Map.entry(UL_LOGS.indexName, UL_LOGS),
         Map.entry(SAMPLE_DATA.indexName, SAMPLE_DATA),
@@ -258,18 +232,8 @@ public static void loadDataSetIntoEs(RestClient client, Logger logger) throws IO
     }
 
     private static void loadDataSetIntoEs(RestClient client, Logger logger, IndexCreator indexCreator) throws IOException {
-        for (var dataSet : CSV_DATASET_MAP.values()) {
-            final String settingName = dataSet.settingFileName != null ? "/" + dataSet.settingFileName : null;
-            load(
-                client,
-                dataSet.indexName,
-                "/" + dataSet.mappingFileName,
-                settingName,
-                "/" + dataSet.dataFileName,
-                dataSet.allowSubFields,
-                logger,
-                indexCreator
-            );
+        for (var dataset : CSV_DATASET_MAP.values()) {
+            load(client, dataset, logger, indexCreator);
         }
         forceMerge(client, CSV_DATASET_MAP.keySet(), logger);
         for (var policy : ENRICH_POLICIES) {
@@ -291,32 +255,51 @@ private static void loadEnrichPolicy(RestClient client, String policyName, Strin
         client.performRequest(request);
     }
 
-    private static void load(
-        RestClient client,
-        String indexName,
-        String mappingName,
-        String settingName,
-        String dataName,
-        boolean allowSubFields,
-        Logger logger,
-        IndexCreator indexCreator
-    ) throws IOException {
+    private static void load(RestClient client, TestsDataset dataset, Logger logger, IndexCreator indexCreator) throws IOException {
+        final String mappingName = "/" + dataset.mappingFileName;
         URL mapping = CsvTestsDataLoader.class.getResource(mappingName);
         if (mapping == null) {
             throw new IllegalArgumentException("Cannot find resource " + mappingName);
         }
+        final String dataName = "/" + dataset.dataFileName;
         URL data = CsvTestsDataLoader.class.getResource(dataName);
         if (data == null) {
             throw new IllegalArgumentException("Cannot find resource " + dataName);
         }
         Settings indexSettings = Settings.EMPTY;
+        final String settingName = dataset.settingFileName != null ? "/" + dataset.settingFileName : null;
         if (settingName != null) {
             indexSettings = Settings.builder()
                 .loadFromStream(settingName, CsvTestsDataLoader.class.getResourceAsStream(settingName), false)
                 .build();
         }
-        indexCreator.createIndex(client, indexName, readTextFile(mapping), indexSettings);
-        loadCsvData(client, indexName, data, allowSubFields, CsvTestsDataLoader::createParser, logger);
+        indexCreator.createIndex(client, dataset.indexName, readMappingFile(mapping, dataset.typeMapping), indexSettings);
+        loadCsvData(client, dataset.indexName, data, dataset.allowSubFields, logger);
+    }
+
+    private static String readMappingFile(URL resource, Map<String, String> typeMapping) throws IOException {
+        String mappingJsonText = readTextFile(resource);
+        if (typeMapping == null || typeMapping.isEmpty()) {
+            return mappingJsonText;
+        }
+        boolean modified = false;
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode mappingNode = mapper.readTree(mappingJsonText);
+        JsonNode propertiesNode = mappingNode.path("properties");
+
+        for (Map.Entry<String, String> entry : typeMapping.entrySet()) {
+            String key = entry.getKey();
+            String newType = entry.getValue();
+
+            if (propertiesNode.has(key)) {
+                modified = true;
+                ((ObjectNode) propertiesNode.get(key)).put("type", newType);
+            }
+        }
+        if (modified) {
+            return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(mappingNode);
+        }
+        return mappingJsonText;
     }
 
     public static String readTextFile(URL resource) throws IOException {
@@ -345,14 +328,8 @@ public static String readTextFile(URL resource) throws IOException {
      *   - multi-values are comma separated
      *   - commas inside multivalue fields can be escaped with \ (backslash) character
      */
-    private static void loadCsvData(
-        RestClient client,
-        String indexName,
-        URL resource,
-        boolean allowSubFields,
-        CheckedBiFunction<XContent, InputStream, XContentParser, IOException> p,
-        Logger logger
-    ) throws IOException {
+    private static void loadCsvData(RestClient client, String indexName, URL resource, boolean allowSubFields, Logger logger)
+        throws IOException {
         ArrayList<String> failures = new ArrayList<>();
         StringBuilder builder = new StringBuilder();
         try (BufferedReader reader = reader(resource)) {
@@ -371,27 +348,17 @@ private static void loadCsvData(
                         columns = new String[entries.length];
                         for (int i = 0; i < entries.length; i++) {
                             int split = entries[i].indexOf(':');
-                            String name, typeName;
-
                             if (split < 0) {
-                                throw new IllegalArgumentException(
-                                    "A type is always expected in the schema definition; found " + entries[i]
-                                );
+                                columns[i] = entries[i].trim();
                             } else {
-                                name = entries[i].substring(0, split).trim();
+                                String name = entries[i].substring(0, split).trim();
                                 if (allowSubFields || name.contains(".") == false) {
-                                    typeName = entries[i].substring(split + 1).trim();
-                                    if (typeName.isEmpty()) {
-                                        throw new IllegalArgumentException(
-                                            "A type is always expected in the schema definition; found " + entries[i]
-                                        );
-                                    }
+                                    columns[i] = name;
                                 } else {// if it's a subfield, ignore it in the _bulk request
-                                    name = null;
+                                    columns[i] = null;
                                     subFieldsIndices.add(i);
                                 }
                             }
-                            columns[i] = name;
                         }
                     }
                     // data rows
@@ -534,22 +501,40 @@ private static void forceMerge(RestClient client, Set<String> indices, Logger lo
         }
     }
 
-    private static XContentParser createParser(XContent xContent, InputStream data) throws IOException {
-        NamedXContentRegistry contentRegistry = new NamedXContentRegistry(ClusterModule.getNamedXWriteables());
-        XContentParserConfiguration config = XContentParserConfiguration.EMPTY.withRegistry(contentRegistry)
-            .withDeprecationHandler(LoggingDeprecationHandler.INSTANCE);
-        return xContent.createParser(config, data);
-    }
-
     public record TestsDataset(
         String indexName,
         String mappingFileName,
         String dataFileName,
         String settingFileName,
-        boolean allowSubFields
+        boolean allowSubFields,
+        Map<String, String> typeMapping
     ) {
         public TestsDataset(String indexName, String mappingFileName, String dataFileName) {
-            this(indexName, mappingFileName, dataFileName, null, true);
+            this(indexName, mappingFileName, dataFileName, null, true, null);
+        }
+
+        public TestsDataset(String indexName) {
+            this(indexName, "mapping-" + indexName + ".json", indexName + ".csv", null, true, null);
+        }
+
+        public TestsDataset withIndex(String indexName) {
+            return new TestsDataset(indexName, mappingFileName, dataFileName, settingFileName, allowSubFields, typeMapping);
+        }
+
+        public TestsDataset withData(String dataFileName) {
+            return new TestsDataset(indexName, mappingFileName, dataFileName, settingFileName, allowSubFields, typeMapping);
+        }
+
+        public TestsDataset withSetting(String settingFileName) {
+            return new TestsDataset(indexName, mappingFileName, dataFileName, settingFileName, allowSubFields, typeMapping);
+        }
+
+        public TestsDataset noSubfields() {
+            return new TestsDataset(indexName, mappingFileName, dataFileName, settingFileName, false, typeMapping);
+        }
+
+        public TestsDataset withTypeMapping(Map<String, String> typeMapping) {
+            return new TestsDataset(indexName, mappingFileName, dataFileName, settingFileName, allowSubFields, typeMapping);
         }
     }
 
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
index 1774f4a6d898..e67d8a72d25a 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
@@ -39,11 +39,15 @@
 import org.elasticsearch.xpack.esql.core.expression.Literal;
 import org.elasticsearch.xpack.esql.core.expression.ReferenceAttribute;
 import org.elasticsearch.xpack.esql.core.expression.predicate.Range;
+import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLikePattern;
+import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardPattern;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.core.type.EsField;
 import org.elasticsearch.xpack.esql.core.util.DateUtils;
 import org.elasticsearch.xpack.esql.core.util.StringUtils;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.WildcardLike;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThan;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThanOrEqual;
@@ -668,4 +672,12 @@ static Version randomVersion() {
             default -> throw new IllegalArgumentException();
         };
     }
+
+    public static WildcardLike wildcardLike(Expression left, String exp) {
+        return new WildcardLike(EMPTY, left, new WildcardPattern(exp));
+    }
+
+    public static RLike rlike(Expression left, String exp) {
+        return new RLike(EMPTY, left, new RLikePattern(exp));
+    }
 }
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/conditional.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/conditional.csv-spec
index d4b45ca37fc2..996b2b5030d8 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/conditional.csv-spec
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/conditional.csv-spec
@@ -94,6 +94,82 @@ M              |10
 M              |10           
 ;
 
+caseOnMv
+required_capability: case_mv
+
+FROM employees
+| WHERE emp_no == 10010
+| EVAL foo = CASE(still_hired, "still", is_rehired, "rehired", "not")
+| KEEP still_hired, is_rehired, foo;
+warning:Line 3:41: evaluation of [is_rehired] failed, treating result as false. Only first 20 failures recorded.
+warning:Line 3:41: java.lang.IllegalArgumentException: CASE expects a single-valued boolean
+
+still_hired:boolean |     is_rehired:boolean     | foo:keyword
+              false | [false, false, true, true] | not
+;
+
+caseOnConstantMvFalseTrue
+required_capability: case_mv
+
+ROW foo = CASE([false, true], "a", "b");
+warning:Line 1:16: evaluation of [[false, true]] failed, treating result as false. Only first 20 failures recorded.
+warning:Line 1:16: java.lang.IllegalArgumentException: CASE expects a single-valued boolean
+
+foo:keyword
+b
+;
+
+caseOnConstantMvTrueTrue
+required_capability: case_mv
+
+ROW foo = CASE([true, true], "a", "b");
+warning:Line 1:16: evaluation of [[true, true]] failed, treating result as false. Only first 20 failures recorded.
+warning:Line 1:16: java.lang.IllegalArgumentException: CASE expects a single-valued boolean
+
+foo:keyword
+b
+;
+
+caseOnMvSliceMv
+required_capability: case_mv
+
+ROW foo = [true, false, false] | EVAL foo = CASE(MV_SLICE(foo, 0, 1), "a", "b");
+warning:Line 1:50: evaluation of [MV_SLICE(foo, 0, 1)] failed, treating result as false. Only first 20 failures recorded.
+warning:Line 1:50: java.lang.IllegalArgumentException: CASE expects a single-valued boolean
+
+foo:keyword
+b
+;
+
+caseOnMvSliceSv
+required_capability: case_mv
+
+ROW foo = [true, false, false] | EVAL foo = CASE(MV_SLICE(foo, 0), "a", "b");
+
+foo:keyword
+a
+;
+
+caseOnConvertMvSliceMv
+required_capability: case_mv
+
+ROW foo = ["true", "false", "false"] | EVAL foo = CASE(MV_SLICE(foo::BOOLEAN, 0, 1), "a", "b");
+warning:Line 1:56: evaluation of [MV_SLICE(foo::BOOLEAN, 0, 1)] failed, treating result as false. Only first 20 failures recorded.
+warning:Line 1:56: java.lang.IllegalArgumentException: CASE expects a single-valued boolean
+
+foo:keyword
+b
+;
+
+caseOnConvertMvSliceSv
+required_capability: case_mv
+
+ROW foo = ["true", "false", "false"] | EVAL foo = CASE(MV_SLICE(foo::BOOLEAN, 0), "a", "b");
+
+foo:keyword
+a
+;
+
 docsCaseSuccessRate
 // tag::docsCaseSuccessRate[]
 FROM sample_data
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/convert.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/convert.csv-spec
index 42b5c0344b55..1397965145a1 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/convert.csv-spec
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/convert.csv-spec
@@ -214,3 +214,140 @@ from employees
 emp_no:integer | languages:integer | height:double
 10037          | 2                 | 2.0
 ;
+
+convertToDatePeriod
+required_capability: cast_string_literal_to_temporal_amount
+//tag::castToDatePeriod[]
+row x = "2024-01-01"::datetime | eval y = x + "3 DAYS"::date_period, z = x - to_dateperiod("3 days");
+//end::castToDatePeriod[]
+
+//tag::castToDatePeriod-result[]
+x:datetime |y:datetime |z:datetime
+2024-01-01 |2024-01-04 |2023-12-29
+//end::castToDatePeriod-result[]
+;
+
+convertToTimeDuration
+required_capability: cast_string_literal_to_temporal_amount
+//tag::castToTimeDuration[]
+row x = "2024-01-01"::datetime | eval y = x + "3 hours"::time_duration, z = x - to_timeduration("3 hours");
+//end::castToTimeDuration[]
+
+//tag::castToTimeDuration-result[]
+x:datetime |y:datetime               |z:datetime
+2024-01-01 |2024-01-01T03:00:00.000Z |2023-12-31T21:00:00.000Z
+//end::castToTimeDuration-result[]
+;
+
+convertToDatePeriodTimeDuration
+required_capability: cast_string_literal_to_temporal_amount
+row x = "2024-01-01"::datetime + "3 hours"::time_duration, y = "2024-01-01"::datetime - to_timeduration("3 hours"),
+z = "2024-01-01"::datetime + "3 DAYS"::date_period, w = "2024-01-01"::datetime - to_dateperiod("3 days"), u = "3 days",
+v = "3 hours"
+| eval a = "2024-01-01" + u::date_period, b = "2024-01-01" - v::time_duration
+| keep x, y, z, w, a, b;
+
+x:datetime               |y:datetime               |z:datetime               |w:datetime               |a:datetime               |b:datetime
+2024-01-01T03:00:00.000Z |2023-12-31T21:00:00.000Z |2024-01-04T00:00:00.000Z |2023-12-29T00:00:00.000Z |2024-01-04T00:00:00.000Z |2023-12-31T21:00:00.000Z
+;
+
+convertToDatePeriodNested
+required_capability: cast_string_literal_to_temporal_amount
+row x = "2024-01-01"::datetime
+| eval y = x + to_dateperiod("3 days"::date_period)
+;
+
+x:datetime |y:datetime
+2024-01-01 |2024-01-04
+;
+
+convertToTimeDurationNested
+required_capability: cast_string_literal_to_temporal_amount
+row x = "2024-01-01"::datetime
+| eval y = x + to_timeduration("3 hours"::time_duration)
+;
+
+x:datetime |y:datetime
+2024-01-01 |2024-01-01T03:00:00.000Z
+;
+
+convertToDatePeriodFromIndex
+required_capability: cast_string_literal_to_temporal_amount
+FROM employees
+| WHERE emp_no == 10001
+| EVAL x = birth_date + "3 days"::date_period, y = birth_date - to_dateperiod("3 days")
+| KEEP birth_date, x, y;
+
+birth_date:datetime  |x:datetime           |y:datetime
+1953-09-02T00:00:00Z |1953-09-05T00:00:00Z |1953-08-30T00:00:00Z
+;
+
+convertToTimeDurationFromIndex
+required_capability: cast_string_literal_to_temporal_amount
+FROM employees
+| WHERE emp_no == 10001
+| EVAL x = birth_date + "3 hours"::time_duration, y = birth_date - to_timeduration("3 hours")
+| KEEP birth_date, x, y;
+
+birth_date:datetime  |x:datetime           |y:datetime
+1953-09-02T00:00:00Z |1953-09-02T03:00:00Z |1953-09-01T21:00:00Z
+;
+
+convertToDatePeriodTimeDurationRef
+required_capability: cast_string_literal_to_temporal_amount
+FROM employees
+| WHERE emp_no == 10001
+| EVAL interval_timeduration = "3 hours", x = birth_date + interval_timeduration::time_duration, y = birth_date - concat("3 ", "hours")::time_duration
+| EVAL interval_dateperiod = "3 months", z = birth_date + interval_dateperiod::date_period, w = birth_date - concat("3 ", "months")::date_period
+| EVAL a = "3", b = "hours", c = birth_date + concat(concat(a, " "), b)::time_duration
+| KEEP birth_date, x, y, z, w, c;
+
+birth_date:datetime  |x:datetime           |y:datetime           |z:datetime           |w:datetime           |c:datetime
+1953-09-02T00:00:00Z |1953-09-02T03:00:00Z |1953-09-01T21:00:00Z |1953-12-02T00:00:00Z |1953-06-02T00:00:00Z |1953-09-02T03:00:00Z
+;
+
+convertToDatePeriodNull
+required_capability: cast_string_literal_to_temporal_amount
+FROM employees
+| WHERE emp_no == 10001
+| EVAL x = birth_date + null::date_period, y = birth_date - to_dateperiod(null), z = birth_date + to_string(null)::date_period
+| KEEP birth_date, x, y, z;
+
+birth_date:datetime  |x:datetime           |y:datetime           |z:datetime
+1953-09-02T00:00:00Z |null                 |null                 |null
+;
+
+convertToTimeDurationNull
+required_capability: cast_string_literal_to_temporal_amount
+FROM employees
+| WHERE emp_no == 10001
+| EVAL x = birth_date + null::time_duration, y = birth_date - to_timeduration(null), z = birth_date + to_string(null)::time_duration
+| KEEP birth_date, x, y, z;
+
+birth_date:datetime  |x:datetime           |y:datetime           |z:datetime
+1953-09-02T00:00:00Z |null                 |null                 |null
+;
+
+convertToDatePeriodIntegerLiteral
+required_capability: cast_string_literal_to_temporal_amount
+FROM employees
+| WHERE emp_no == 10001
+| EVAL x = birth_date + 3 days::date_period, y = birth_date - to_dateperiod(3 days),
+z = birth_date + 3 months + 3 days::date_period, w = birth_date + (3 months + 3 days)::date_period
+| KEEP birth_date, x, y, z, w;
+
+birth_date:datetime  |x:datetime           |y:datetime           |z:datetime           |w:datetime
+1953-09-02T00:00:00Z |1953-09-05T00:00:00Z |1953-08-30T00:00:00Z |1953-12-05T00:00:00Z |1953-12-05T00:00:00Z
+;
+
+convertToTimeDurationIntegerLiteral
+required_capability: cast_string_literal_to_temporal_amount
+FROM employees
+| WHERE emp_no == 10001
+| EVAL x = birth_date + 3 hours::time_duration, y = birth_date - to_timeduration(3 hours),
+z = birth_date + 3 hours + 3 minutes::time_duration, w = birth_date + (3 hours + 3 minutes)::time_duration
+| KEEP birth_date, x, y, z, w;
+
+birth_date:datetime  |x:datetime           |y:datetime           |z:datetime           |w:datetime
+1953-09-02T00:00:00Z |1953-09-02T03:00:00Z |1953-09-01T21:00:00Z |1953-09-02T03:03:00Z |1953-09-02T03:03:00Z
+;
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/enrich.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/enrich.csv-spec
index 925c08f31712..3c38bd190b0b 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/enrich.csv-spec
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/enrich.csv-spec
@@ -468,26 +468,6 @@ client_ip:ip | count_env:i | max_env:keyword
 ;
 
 
-enrichCidr2#[skip:-8.99.99, reason:ip_range support not added yet]
-required_capability: enrich_load
-
-FROM sample_data
-| ENRICH client_cidr_policy ON client_ip WITH env, client_cidr
-| KEEP client_ip, env, client_cidr
-| SORT client_ip
-;
-
-client_ip:ip | env:keyword               | client_cidr:ip_range
-172.21.3.15  | [Development, Production] | 172.21.3.0/24
-172.21.3.15  | [Development, Production] | 172.21.3.0/24
-172.21.3.15  | [Development, Production] | 172.21.3.0/24
-172.21.3.15  | [Development, Production] | 172.21.3.0/24
-172.21.0.5   | Development               | 172.21.0.0/16
-172.21.2.113 | [Development, QA]         | 172.21.2.0/24
-172.21.2.162 | [Development, QA]         | 172.21.2.0/24
-;
-
-
 enrichAgesStatsYear#[skip:-8.13.99, reason:ENRICH extended in 8.14.0]
 required_capability: enrich_load
 
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-sample_data_str.json b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-sample_data_str.json
deleted file mode 100644
index 9e97de8c9292..000000000000
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-sample_data_str.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "properties": {
-        "@timestamp": {
-            "type": "date"
-        },
-        "client_ip": {
-            "type": "keyword"
-        },
-        "event_duration": {
-            "type": "long"
-        },
-        "message": {
-            "type": "keyword"
-        }
-    }
-}
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-sample_data_ts_long.json b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-sample_data_ts_long.json
deleted file mode 100644
index ecf21a2a919d..000000000000
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-sample_data_ts_long.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "properties": {
-        "@timestamp": {
-            "type": "long"
-        },
-        "client_ip": {
-            "type": "ip"
-        },
-        "event_duration": {
-            "type": "long"
-        },
-        "message": {
-            "type": "keyword"
-        }
-    }
-}
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/median_absolute_deviation.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/median_absolute_deviation.csv-spec
new file mode 100644
index 000000000000..9427ef0a3097
--- /dev/null
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/median_absolute_deviation.csv-spec
@@ -0,0 +1,41 @@
+medianAbsoluteDeviation
+// tag::median-absolute-deviation[]
+FROM employees
+| STATS MEDIAN(salary), MEDIAN_ABSOLUTE_DEVIATION(salary)
+// end::median-absolute-deviation[]
+;
+
+// tag::median-absolute-deviation-result[]
+MEDIAN(salary):double | MEDIAN_ABSOLUTE_DEVIATION(salary):double
+47003                 | 10096.5
+// end::median-absolute-deviation-result[]
+;
+
+medianAbsoluteDeviationFold
+required_capability: fn_mv_median_absolute_deviation
+ROW x = [0, 2, 5, 6]
+| STATS
+    int_constant = MEDIAN_ABSOLUTE_DEVIATION([0, 2, 5, 6]::integer),
+    int_var = MEDIAN_ABSOLUTE_DEVIATION(x::integer),
+    long_constant = MEDIAN_ABSOLUTE_DEVIATION([0, 2, 5, 6]::long),
+    long_var = MEDIAN_ABSOLUTE_DEVIATION(x::long),
+    double_constant = MEDIAN_ABSOLUTE_DEVIATION([0, 2, 5, 6]::double),
+    double_var = MEDIAN_ABSOLUTE_DEVIATION(x::double)
+;
+
+int_constant:double | int_var:double | long_constant:double | long_var:double | double_constant:double | double_var:double
+2                   | 2              | 2                    | 2               | 2                      | 2
+;
+
+docsStatsMADNestedExpression#[skip:-8.12.99,reason:supported in 8.13+]
+// tag::docsStatsMADNestedExpression[]
+FROM employees
+| STATS m_a_d_max_salary_change = MEDIAN_ABSOLUTE_DEVIATION(MV_MAX(salary_change))
+// end::docsStatsMADNestedExpression[]
+;
+
+// tag::docsStatsMADNestedExpression-result[]
+m_a_d_max_salary_change:double
+5.69
+// end::docsStatsMADNestedExpression-result[]
+;
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/meta.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/meta.csv-spec
index 325b984c36d3..6909f0aeb42f 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/meta.csv-spec
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/meta.csv-spec
@@ -11,14 +11,14 @@ synopsis:keyword
 "double avg(number:double|integer|long)"
 "double|date bin(field:integer|long|double|date, buckets:integer|long|double|date_period|time_duration, ?from:integer|long|double|date|keyword|text, ?to:integer|long|double|date|keyword|text)"
 "double|date bucket(field:integer|long|double|date, buckets:integer|long|double|date_period|time_duration, ?from:integer|long|double|date|keyword|text, ?to:integer|long|double|date|keyword|text)"
-"boolean|cartesian_point|date|double|geo_point|integer|ip|keyword|long|text|unsigned_long|version case(condition:boolean, trueValue...:boolean|cartesian_point|date|double|geo_point|integer|ip|keyword|long|text|unsigned_long|version)"
+"boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version case(condition:boolean, trueValue...:boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version)"
 "double cbrt(number:double|integer|long|unsigned_long)"
 "double|integer|long|unsigned_long ceil(number:double|integer|long|unsigned_long)"
 "boolean cidr_match(ip:ip, blockX...:keyword|text)"
 "boolean|cartesian_point|cartesian_shape|date|geo_point|geo_shape|integer|ip|keyword|long|text|version coalesce(first:boolean|cartesian_point|cartesian_shape|date|geo_point|geo_shape|integer|ip|keyword|long|text|version, ?rest...:boolean|cartesian_point|cartesian_shape|date|geo_point|geo_shape|integer|ip|keyword|long|text|version)"
 "keyword concat(string1:keyword|text, string2...:keyword|text)"
 "double cos(angle:double|integer|long|unsigned_long)"
-"double cosh(angle:double|integer|long|unsigned_long)"
+"double cosh(number:double|integer|long|unsigned_long)"
 "long count(?field:boolean|cartesian_point|date|double|geo_point|integer|ip|keyword|long|text|unsigned_long|version)"
 "long count_distinct(field:boolean|date|double|integer|ip|keyword|long|text|version, ?precision:integer|long|unsigned_long)"
 "integer date_diff(unit:keyword|text, startTimestamp:date, endTimestamp:date)"
@@ -53,6 +53,7 @@ double e()
 "boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version mv_last(field:boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version)"
 "boolean|date|date_nanos|double|integer|ip|keyword|long|text|unsigned_long|version mv_max(field:boolean|date|date_nanos|double|integer|ip|keyword|long|text|unsigned_long|version)"
 "double|integer|long|unsigned_long mv_median(number:double|integer|long|unsigned_long)"
+"double|integer|long|unsigned_long mv_median_absolute_deviation(number:double|integer|long|unsigned_long)"
 "boolean|date|date_nanos|double|integer|ip|keyword|long|text|unsigned_long|version mv_min(field:boolean|date|date_nanos|double|integer|ip|keyword|long|text|unsigned_long|version)"
 "double|integer|long mv_percentile(number:double|integer|long, percentile:double|integer|long)"
 "double mv_pseries_weighted_sum(number:double, p:double)"
@@ -71,7 +72,8 @@ double pi()
 "keyword|text rtrim(string:keyword|text)"
 "double signum(number:double|integer|long|unsigned_long)"
 "double sin(angle:double|integer|long|unsigned_long)"
-"double sinh(angle:double|integer|long|unsigned_long)"
+"double sinh(number:double|integer|long|unsigned_long)"
+"keyword space(number:integer)"
 "keyword split(string:keyword|text, delim:keyword|text)"
 "double sqrt(number:double|integer|long|unsigned_long)"
 "geo_point|cartesian_point st_centroid_agg(field:geo_point|cartesian_point)"
@@ -86,13 +88,14 @@ double pi()
 "keyword substring(string:keyword|text, start:integer, ?length:integer)"
 "long|double sum(number:double|integer|long)"
 "double tan(angle:double|integer|long|unsigned_long)"
-"double tanh(angle:double|integer|long|unsigned_long)"
+"double tanh(number:double|integer|long|unsigned_long)"
 double tau()
 "keyword to_base64(string:keyword|text)"
 "boolean to_bool(field:boolean|keyword|text|double|long|unsigned_long|integer)"
 "boolean to_boolean(field:boolean|keyword|text|double|long|unsigned_long|integer)"
 "cartesian_point to_cartesianpoint(field:cartesian_point|keyword|text)"
 "cartesian_shape to_cartesianshape(field:cartesian_point|cartesian_shape|keyword|text)"
+"date_period to_dateperiod(field:date_period|keyword|text)"
 "date to_datetime(field:date|date_nanos|keyword|text|double|long|unsigned_long|integer)"
 "double to_dbl(field:boolean|date|keyword|text|double|long|unsigned_long|integer|counter_double|counter_integer|counter_long)"
 "double to_degrees(number:double|integer|long|unsigned_long)"
@@ -108,6 +111,7 @@ double tau()
 "double to_radians(number:double|integer|long|unsigned_long)"
 "keyword to_str(field:boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version)"
 "keyword to_string(field:boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version)"
+"time_duration to_timeduration(field:time_duration|keyword|text)"
 "unsigned_long to_ul(field:boolean|date|keyword|text|double|long|unsigned_long|integer)"
 "unsigned_long to_ulong(field:boolean|date|keyword|text|double|long|unsigned_long|integer)"
 "unsigned_long to_unsigned_long(field:boolean|date|keyword|text|double|long|unsigned_long|integer)"
@@ -135,14 +139,14 @@ atan2         |[y_coordinate, x_coordinate]        |["double|integer|long|unsign
 avg           |number                              |"double|integer|long"                                                                                                             |[""]
 bin           |[field, buckets, from, to]          |["integer|long|double|date", "integer|long|double|date_period|time_duration", "integer|long|double|date|keyword|text", "integer|long|double|date|keyword|text"]  |[Numeric or date expression from which to derive buckets., Target number of buckets\, or desired bucket size if `from` and `to` parameters are omitted., Start of the range. Can be a number\, a date or a date expressed as a string., End of the range. Can be a number\, a date or a date expressed as a string.]
 bucket        |[field, buckets, from, to]          |["integer|long|double|date", "integer|long|double|date_period|time_duration", "integer|long|double|date|keyword|text", "integer|long|double|date|keyword|text"]  |[Numeric or date expression from which to derive buckets., Target number of buckets\, or desired bucket size if `from` and `to` parameters are omitted., Start of the range. Can be a number\, a date or a date expressed as a string., End of the range. Can be a number\, a date or a date expressed as a string.]
-case          |[condition, trueValue]              |[boolean, "boolean|cartesian_point|date|double|geo_point|integer|ip|keyword|long|text|unsigned_long|version"]                     |[A condition., The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches.]
+case          |[condition, trueValue]              |[boolean, "boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version"] |[A condition., The value that's returned when the corresponding condition is the first to evaluate to `true`. The default value is returned when no condition matches.]
 cbrt          |number                              |"double|integer|long|unsigned_long"                                                                                               |"Numeric expression. If `null`, the function returns `null`."
 ceil          |number                              |"double|integer|long|unsigned_long"                                                                                               |Numeric expression. If `null`, the function returns `null`.
 cidr_match    |[ip, blockX]                        |[ip, "keyword|text"]                                                                                                              |[IP address of type `ip` (both IPv4 and IPv6 are supported)., CIDR block to test the IP against.]
 coalesce      |first                               |"boolean|cartesian_point|cartesian_shape|date|geo_point|geo_shape|integer|ip|keyword|long|text|version"                                   |Expression to evaluate.
 concat        |[string1, string2]                  |["keyword|text", "keyword|text"]                                                                                                  |[Strings to concatenate., Strings to concatenate.]
 cos           |angle                               |"double|integer|long|unsigned_long"                                                                                               |An angle, in radians. If `null`, the function returns `null`.
-cosh          |angle                               |"double|integer|long|unsigned_long"                                                                                               |An angle, in radians. If `null`, the function returns `null`.
+cosh          |number                              |"double|integer|long|unsigned_long"                                                                                               |Numeric expression. If `null`, the function returns `null`.
 count         |field                               |"boolean|cartesian_point|date|double|geo_point|integer|ip|keyword|long|text|unsigned_long|version"                                |Expression that outputs values to be counted. If omitted, equivalent to `COUNT(*)` (the number of rows).
 count_distinct|[field, precision]                  |["boolean|date|double|integer|ip|keyword|long|text|version", "integer|long|unsigned_long"]                                        |[Column or literal for which to count the number of distinct values., Precision threshold. Refer to <<esql-agg-count-distinct-approximate>>. The maximum supported value is 40000. Thresholds above this number will have the same effect as a threshold of 40000. The default value is 3000.]
 date_diff     |[unit, startTimestamp, endTimestamp]|["keyword|text", date, date]                                                                                                      |[Time difference unit, A string representing a start timestamp, A string representing an end timestamp]
@@ -177,6 +181,7 @@ mv_first      |field                               |"boolean|cartesian_point|car
 mv_last       |field                               |"boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version"      |Multivalue expression.
 mv_max        |field                               |"boolean|date|date_nanos|double|integer|ip|keyword|long|text|unsigned_long|version"                                               |Multivalue expression.
 mv_median     |number                              |"double|integer|long|unsigned_long"                                                                                               |Multivalue expression.
+mv_median_abso|number                              |"double|integer|long|unsigned_long"                                                                                               |Multivalue expression.
 mv_min        |field                               |"boolean|date|date_nanos|double|integer|ip|keyword|long|text|unsigned_long|version"                                               |Multivalue expression.
 mv_percentile |[number, percentile]                |["double|integer|long", "double|integer|long"]                                                                                    |[Multivalue expression., The percentile to calculate. Must be a number between 0 and 100. Numbers out of range will return a null instead.]
 mv_pseries_wei|[number, p]                         |[double, double]                                                                                                                  |[Multivalue expression., It is a constant number that represents the 'p' parameter in the P-Series. It impacts every element's contribution to the weighted sum.]
@@ -195,7 +200,8 @@ round         |[number, decimals]                  |["double|integer|long|unsign
 rtrim         |string                              |"keyword|text"                                                                                                                    |String expression. If `null`, the function returns `null`.
 signum        |number                              |"double|integer|long|unsigned_long"                                                                                               |"Numeric expression. If `null`, the function returns `null`."
 sin           |angle                               |"double|integer|long|unsigned_long"                                                                                               |An angle, in radians. If `null`, the function returns `null`.
-sinh          |angle                               |"double|integer|long|unsigned_long"                                                                                               |An angle, in radians. If `null`, the function returns `null`.
+sinh          |number                              |"double|integer|long|unsigned_long"                                                                                               |Numeric expression. If `null`, the function returns `null`.
+space         |number                              |"integer"                                                                                                                         |Number of spaces in result.
 split         |[string, delim]                     |["keyword|text", "keyword|text"]                                                                                                  |[String expression. If `null`\, the function returns `null`., Delimiter. Only single byte delimiters are currently supported.]
 sqrt          |number                              |"double|integer|long|unsigned_long"                                                                                               |"Numeric expression. If `null`, the function returns `null`."
 st_centroid_ag|field                               |"geo_point|cartesian_point"                                                                                                       |[""]
@@ -210,13 +216,14 @@ starts_with   |[str, prefix]                       |["keyword|text", "keyword|te
 substring     |[string, start, length]             |["keyword|text", integer, integer]                                                                                                |[String expression. If `null`\, the function returns `null`., Start position., Length of the substring from the start position. Optional; if omitted\, all positions after `start` are returned.]
 sum           |number                              |"double|integer|long"                                                                                                             |[""]
 tan           |angle                               |"double|integer|long|unsigned_long"                                                                                               |An angle, in radians. If `null`, the function returns `null`.
-tanh          |angle                               |"double|integer|long|unsigned_long"                                                                                               |An angle, in radians. If `null`, the function returns `null`.
+tanh          |number                              |"double|integer|long|unsigned_long"                                                                                               |Numeric expression. If `null`, the function returns `null`.
 tau           |null                                |null                                                                                                                              |null
 to_base64     |string                              |"keyword|text"                                                                                                                    |A string.
 to_bool       |field                               |"boolean|keyword|text|double|long|unsigned_long|integer"                                                                          |Input value. The input can be a single- or multi-valued column or an expression.
 to_boolean    |field                               |"boolean|keyword|text|double|long|unsigned_long|integer"                                                                          |Input value. The input can be a single- or multi-valued column or an expression.
 to_cartesianpo|field                               |"cartesian_point|keyword|text"                                                                                                    |Input value. The input can be a single- or multi-valued column or an expression.
 to_cartesiansh|field                               |"cartesian_point|cartesian_shape|keyword|text"                                                                                    |Input value. The input can be a single- or multi-valued column or an expression.
+to_dateperiod |field                               |"date_period|keyword|text"                                                                                                        |Input value. The input is a valid constant date period expression.
 to_datetime   |field                               |"date|date_nanos|keyword|text|double|long|unsigned_long|integer"                                                                             |Input value. The input can be a single- or multi-valued column or an expression.
 to_dbl        |field                               |"boolean|date|keyword|text|double|long|unsigned_long|integer|counter_double|counter_integer|counter_long"                         |Input value. The input can be a single- or multi-valued column or an expression.
 to_degrees    |number                              |"double|integer|long|unsigned_long"                                                                                               |Input value. The input can be a single- or multi-valued column or an expression.
@@ -232,6 +239,7 @@ to_lower      |str                                 |"keyword|text"
 to_radians    |number                              |"double|integer|long|unsigned_long"                                                                                               |Input value. The input can be a single- or multi-valued column or an expression.
 to_str        |field                               |"boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version"      |Input value. The input can be a single- or multi-valued column or an expression.
 to_string     |field                               |"boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version"      |Input value. The input can be a single- or multi-valued column or an expression.
+to_timeduratio|field                               |"time_duration|keyword|text"                                                                                                      |Input value. The input is a valid constant time duration expression.
 to_ul         |field                               |"boolean|date|keyword|text|double|long|unsigned_long|integer"                                                                     |Input value. The input can be a single- or multi-valued column or an expression.
 to_ulong      |field                               |"boolean|date|keyword|text|double|long|unsigned_long|integer"                                                                     |Input value. The input can be a single- or multi-valued column or an expression.
 to_unsigned_lo|field                               |"boolean|date|keyword|text|double|long|unsigned_long|integer"                                                                     |Input value. The input can be a single- or multi-valued column or an expression.
@@ -266,7 +274,7 @@ cidr_match    |Returns true if the provided IP is contained in one of the provid
 coalesce      |Returns the first of its arguments that is not null. If all arguments are null, it returns `null`.
 concat        |Concatenates two or more strings.
 cos           |Returns the {wikipedia}/Sine_and_cosine[cosine] of an angle.
-cosh          |Returns the {wikipedia}/Hyperbolic_functions[hyperbolic cosine] of an angle.
+cosh          |Returns the {wikipedia}/Hyperbolic_functions[hyperbolic cosine] of a number.
 count         |Returns the total number (count) of input values.
 count_distinct|Returns the approximate number of distinct values.
 date_diff     |Subtracts the `startTimestamp` from the `endTimestamp` and returns the difference in multiples of `unit`. If `startTimestamp` is later than the `endTimestamp`, negative values are returned.
@@ -301,6 +309,7 @@ mv_first      |Converts a multivalued expression into a single valued column con
 mv_last       |Converts a multivalue expression into a single valued column containing the last value. This is most useful when reading from a function that emits multivalued columns in a known order like <<esql-split>>.  The order that <<esql-multivalued-fields, multivalued fields>> are read from underlying storage is not guaranteed. It is *frequently* ascending, but don't rely on that. If you need the maximum value use <<esql-mv_max>> instead of `MV_LAST`. `MV_MAX` has optimizations for sorted values so there isn't a performance benefit to `MV_LAST`.
 mv_max        |Converts a multivalued expression into a single valued column containing the maximum value.
 mv_median     |Converts a multivalued field into a single valued field containing the median value.
+mv_median_abso|"Converts a multivalued field into a single valued field containing the median absolute deviation.  It is calculated as the median of each data point's deviation from the median of the entire sample. That is, for a random variable `X`, the median absolute deviation is `median(|median(X) - X|)`."
 mv_min        |Converts a multivalued expression into a single valued column containing the minimum value.
 mv_percentile |Converts a multivalued field into a single valued field containing the value at which a certain percentage of observed values occur.
 mv_pseries_wei|Converts a multivalued expression into a single-valued column by multiplying every element on the input list by its corresponding term in P-Series and computing the sum.
@@ -318,8 +327,9 @@ right         |Return the substring that extracts 'length' chars from 'str' star
 round         |Rounds a number to the specified number of decimal places. Defaults to 0, which returns the nearest integer. If the precision is a negative number, rounds to the number of digits left of the decimal point.
 rtrim         |Removes trailing whitespaces from a string.
 signum        |Returns the sign of the given number. It returns `-1` for negative numbers, `0` for `0` and `1` for positive numbers.
-sin           |Returns ths {wikipedia}/Sine_and_cosine[Sine] trigonometric function of an angle.
-sinh          |Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of an angle.
+sin           |Returns the {wikipedia}/Sine_and_cosine[sine] of an angle.
+sinh          |Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of a number.
+space         |Returns a string made of `number` spaces.
 split         |Split a single valued string into multiple strings.
 sqrt          |Returns the square root of a number. The input can be any numeric value, the return value is always a double. Square roots of negative numbers and infinities are null.
 st_centroid_ag|Calculate the spatial centroid over a field with spatial point geometry type.
@@ -333,14 +343,15 @@ st_y          |Extracts the `y` coordinate from the supplied point. If the point
 starts_with   |Returns a boolean that indicates whether a keyword string starts with another string.
 substring     |Returns a substring of a string, specified by a start position and an optional length.
 sum           |The sum of a numeric expression.
-tan           |Returns the {wikipedia}/Sine_and_cosine[Tangent] trigonometric function of an angle.
-tanh          |Returns the {wikipedia}/Hyperbolic_functions[Tangent] hyperbolic function of an angle.
+tan           |Returns the {wikipedia}/Sine_and_cosine[tangent] of an angle.
+tanh          |Returns the {wikipedia}/Hyperbolic_functions[hyperbolic tangent] of a number.
 tau           |Returns the https://tauday.com/tau-manifesto[ratio] of a circle's circumference to its radius.
 to_base64     |Encode a string to a base64 string.
 to_bool       |Converts an input value to a boolean value. A string value of *true* will be case-insensitive converted to the Boolean *true*. For anything else, including the empty string, the function will return *false*. The numerical value of *0* will be converted to *false*, anything else will be converted to *true*.
 to_boolean    |Converts an input value to a boolean value. A string value of *true* will be case-insensitive converted to the Boolean *true*. For anything else, including the empty string, the function will return *false*. The numerical value of *0* will be converted to *false*, anything else will be converted to *true*.
 to_cartesianpo|Converts an input value to a `cartesian_point` value. A string will only be successfully converted if it respects the {wikipedia}/Well-known_text_representation_of_geometry[WKT Point] format.
 to_cartesiansh|Converts an input value to a `cartesian_shape` value. A string will only be successfully converted if it respects the {wikipedia}/Well-known_text_representation_of_geometry[WKT] format.
+to_dateperiod |Converts an input value into a `date_period` value.
 to_datetime   |Converts an input value to a date value. A string will only be successfully converted if it's respecting the format `yyyy-MM-dd'T'HH:mm:ss.SSS'Z'`. To convert dates in other formats, use <<esql-date_parse>>.
 to_dbl        |Converts an input value to a double value. If the input parameter is of a date type, its value will be interpreted as milliseconds since the {wikipedia}/Unix_time[Unix epoch], converted to double. Boolean *true* will be converted to double *1.0*, *false* to *0.0*.
 to_degrees    |Converts a number in {wikipedia}/Radian[radians] to {wikipedia}/Degree_(angle)[degrees].
@@ -356,6 +367,7 @@ to_lower      |Returns a new string representing the input string converted to l
 to_radians    |Converts a number in {wikipedia}/Degree_(angle)[degrees] to {wikipedia}/Radian[radians].
 to_str        |Converts an input value into a string.
 to_string     |Converts an input value into a string.
+to_timeduratio|Converts an input value into a `time_duration` value.
 to_ul         |Converts an input value to an unsigned long value. If the input parameter is of a date type, its value will be interpreted as milliseconds since the {wikipedia}/Unix_time[Unix epoch], converted to unsigned long. Boolean *true* will be converted to unsigned long *1*, *false* to *0*.
 to_ulong      |Converts an input value to an unsigned long value. If the input parameter is of a date type, its value will be interpreted as milliseconds since the {wikipedia}/Unix_time[Unix epoch], converted to unsigned long. Boolean *true* will be converted to unsigned long *1*, *false* to *0*.
 to_unsigned_lo|Converts an input value to an unsigned long value. If the input parameter is of a date type, its value will be interpreted as milliseconds since the {wikipedia}/Unix_time[Unix epoch], converted to unsigned long. Boolean *true* will be converted to unsigned long *1*, *false* to *0*.
@@ -385,7 +397,7 @@ atan2         |double
 avg           |double                                                                                                                      |false                       |false           |true
 bin           |"double|date"                                                                                                               |[false, false, true, true]  |false           |false
 bucket        |"double|date"                                                                                                               |[false, false, true, true]  |false           |false
-case          |"boolean|cartesian_point|date|double|geo_point|integer|ip|keyword|long|text|unsigned_long|version"                          |[false, false]              |true            |false
+case          |"boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version"                          |[false, false]              |true            |false
 cbrt          |double                                                                                                                      |false                       |false           |false
 ceil          |"double|integer|long|unsigned_long"                                                                                         |false                       |false           |false
 cidr_match    |boolean                                                                                                                     |[false, false]              |true            |false
@@ -427,6 +439,7 @@ mv_first      |"boolean|cartesian_point|cartesian_shape|date|date_nanos|double|g
 mv_last       |"boolean|cartesian_point|cartesian_shape|date|date_nanos|double|geo_point|geo_shape|integer|ip|keyword|long|text|unsigned_long|version"|false                       |false           |false
 mv_max        |"boolean|date|date_nanos|double|integer|ip|keyword|long|text|unsigned_long|version"                                         |false                       |false           |false
 mv_median     |"double|integer|long|unsigned_long"                                                                                         |false                       |false           |false
+mv_median_abso|"double|integer|long|unsigned_long"                                                                                         |false                       |false           |false
 mv_min        |"boolean|date|date_nanos|double|integer|ip|keyword|long|text|unsigned_long|version"                                         |false                       |false           |false
 mv_percentile |"double|integer|long"                                                                                                       |[false, false]              |false           |false
 mv_pseries_wei|"double"                                                                                                                    |[false, false]              |false           |false 
@@ -446,6 +459,7 @@ rtrim         |"keyword|text"
 signum        |double                                                                                                                      |false                       |false           |false
 sin           |double                                                                                                                      |false                       |false           |false
 sinh          |double                                                                                                                      |false                       |false           |false
+space         |keyword                                                                                                                     |false                       |false           |false
 split         |keyword                                                                                                                     |[false, false]              |false           |false
 sqrt          |double                                                                                                                      |false                       |false           |false
 st_centroid_ag|"geo_point|cartesian_point"                                                                                                 |false                       |false           |true
@@ -467,6 +481,7 @@ to_bool       |boolean
 to_boolean    |boolean                                                                                                                     |false                       |false           |false
 to_cartesianpo|cartesian_point                                                                                                             |false                       |false           |false
 to_cartesiansh|cartesian_shape                                                                                                             |false                       |false           |false
+to_dateperiod |date_period                                                                                                                 |false                       |false           |false
 to_datetime   |date                                                                                                                        |false                       |false           |false
 to_dbl        |double                                                                                                                      |false                       |false           |false
 to_degrees    |double                                                                                                                      |false                       |false           |false
@@ -482,6 +497,7 @@ to_lower      |"keyword|text"
 to_radians    |double                                                                                                                      |false                       |false           |false
 to_str        |keyword                                                                                                                     |false                       |false           |false
 to_string     |keyword                                                                                                                     |false                       |false           |false
+to_timeduratio|time_duration                                                                                                               |false                       |false           |false
 to_ul         |unsigned_long                                                                                                               |false                       |false           |false
 to_ulong      |unsigned_long                                                                                                               |false                       |false           |false
 to_unsigned_lo|unsigned_long                                                                                                               |false                       |false           |false
@@ -499,14 +515,14 @@ META FUNCTIONS
 | WHERE STARTS_WITH(name, "sin")
 ;
 
-name:keyword |                      synopsis:keyword                  |argNames:keyword  |        argTypes:keyword            |             argDescriptions:keyword                             | returnType:keyword |                                             description:keyword                     | optionalArgs:boolean | variadic:boolean | isAggregation:boolean
-sin          |"double sin(angle:double|integer|long|unsigned_long)"   |angle             |"double|integer|long|unsigned_long" | "An angle, in radians. If `null`, the function returns `null`." | double             | "Returns ths {wikipedia}/Sine_and_cosine[Sine] trigonometric function of an angle." | false                | false            | false
-sinh         |"double sinh(angle:double|integer|long|unsigned_long)"  |angle             |"double|integer|long|unsigned_long" | "An angle, in radians. If `null`, the function returns `null`." | double             | "Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of an angle."        | false                | false            | false
+name:keyword |                      synopsis:keyword                  |argNames:keyword  |        argTypes:keyword            |             argDescriptions:keyword                             | returnType:keyword |                                      description:keyword                     | optionalArgs:boolean | variadic:boolean | isAggregation:boolean
+sin          |"double sin(angle:double|integer|long|unsigned_long)"   |angle             |"double|integer|long|unsigned_long" | "An angle, in radians. If `null`, the function returns `null`." | double             | "Returns the {wikipedia}/Sine_and_cosine[sine] of an angle."                 | false                | false            | false
+sinh         |"double sinh(number:double|integer|long|unsigned_long)" |number            |"double|integer|long|unsigned_long" | "Numeric expression. If `null`, the function returns `null`."   | double             | "Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of a number." | false                | false            | false
 ;
 
 countFunctions#[skip:-8.15.99]
 meta functions |  stats  a = count(*), b = count(*), c = count(*) |  mv_expand c;
 
 a:long | b:long | c:long
-115    | 115    | 115
+119    | 119    | 119
 ;
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mv_median_absolute_deviation.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mv_median_absolute_deviation.csv-spec
new file mode 100644
index 000000000000..f648fc563046
--- /dev/null
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/mv_median_absolute_deviation.csv-spec
@@ -0,0 +1,84 @@
+example
+required_capability: fn_mv_median_absolute_deviation
+
+// tag::example[]
+ROW values = [0, 2, 5, 6]
+| EVAL median_absolute_deviation = MV_MEDIAN_ABSOLUTE_DEVIATION(values), median = MV_MEDIAN(values)
+// end::example[]
+;
+
+// tag::example-result[]
+values:integer | median_absolute_deviation:integer | median:integer
+[0, 2, 5, 6]   | 2                                 | 3
+// end::example-result[]
+;
+
+fromIndex
+required_capability: fn_mv_median_absolute_deviation
+
+FROM employees
+| WHERE emp_no IN (10001, 10002, 10007, 10009)
+| SORT emp_no ASC
+| EVAL
+    int = MV_MEDIAN_ABSOLUTE_DEVIATION(salary_change.int),
+    long = MV_MEDIAN_ABSOLUTE_DEVIATION(salary_change.long),
+    double = MV_MEDIAN_ABSOLUTE_DEVIATION(salary_change)
+| KEEP emp_no, salary_change, int, long, double
+;
+
+emp_no:integer | salary_change:double | int:integer | long:long | double:double
+10001          | 1.19                 | 0           | 0         | 0
+10002          | [-7.23, 11.17]       | 9           | 9         | 9.2
+10007          | [-7.06,0.57,1.99]    | 1           | 1         | 1.42
+10009          | null                 | null        | null      | null
+;
+
+allTypes
+required_capability: fn_mv_median_absolute_deviation
+
+ROW x = [0, 2, 5, 6]
+| EVAL
+    int = MV_MEDIAN_ABSOLUTE_DEVIATION(x::INTEGER),
+    long = MV_MEDIAN_ABSOLUTE_DEVIATION(x::LONG),
+    double = MV_MEDIAN_ABSOLUTE_DEVIATION(x::DOUBLE),
+    ul = MV_MEDIAN_ABSOLUTE_DEVIATION(x::UNSIGNED_LONG)
+| KEEP int, long, double, ul
+;
+
+int:integer | long:long | double:double | ul:unsigned_long
+2           | 2         | 2             | 2
+;
+
+multipleExpressions
+required_capability: fn_mv_median_absolute_deviation
+
+ROW x = [0, 2, 5, 6]
+| EVAL
+    MV_MEDIAN_ABSOLUTE_DEVIATION(x),
+    a = MV_MEDIAN_ABSOLUTE_DEVIATION(x),
+    b = MV_MEDIAN_ABSOLUTE_DEVIATION(TO_DOUBLE([2, 5])),
+    c = MV_MEDIAN_ABSOLUTE_DEVIATION(CASE(true, x, [0, 1]))
+;
+
+x:integer    | MV_MEDIAN_ABSOLUTE_DEVIATION(x):integer | a:integer | b:double | c:integer
+[0, 2, 5, 6] | 2                                       | 2         | 1.5      | 2
+;
+
+nullsAndFolds
+required_capability: fn_mv_median_absolute_deviation
+
+ROW x = [0, 2, 5, 6], single = 300
+| EVAL evalNull = null / 2, evalValue = 31 + 1
+| LIMIT 1
+| EVAL
+    a = MV_MEDIAN_ABSOLUTE_DEVIATION(x),
+    b = MV_MEDIAN_ABSOLUTE_DEVIATION(single),
+    c = MV_MEDIAN_ABSOLUTE_DEVIATION(null),
+    d = MV_MEDIAN_ABSOLUTE_DEVIATION(evalNull),
+    e = MV_MEDIAN_ABSOLUTE_DEVIATION(evalValue)
+| KEEP a, b, c, d, e
+;
+
+a:integer | b:integer | c:null | d:integer | e:integer
+2         | 0         | null   | null      | 0
+;
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_str.csv b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_str.csv
deleted file mode 100644
index bc98671adc7f..000000000000
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample_data_str.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-@timestamp:date,client_ip:keyword,event_duration:long,message:keyword
-2023-10-23T13:55:01.543Z,172.21.3.15,1756467,Connected to 10.1.0.1
-2023-10-23T13:53:55.832Z,172.21.3.15,5033755,Connection error
-2023-10-23T13:52:55.015Z,172.21.3.15,8268153,Connection error
-2023-10-23T13:51:54.732Z,172.21.3.15,725448,Connection error
-2023-10-23T13:33:34.937Z,172.21.0.5,1232382,Disconnected
-2023-10-23T12:27:28.948Z,172.21.2.113,2764889,Connected to 10.1.0.2
-2023-10-23T12:15:03.360Z,172.21.2.162,3450233,Connected to 10.1.0.3
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats.csv-spec
index 02a2cac0513c..d59dda273ed6 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats.csv-spec
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats.csv-spec
@@ -1314,7 +1314,7 @@ COUNT(c):long | a:integer
             0 | 1
 ;
 
-countDistinctNull#[skip:-8.99.99,reason:not yet fixed]
+countDistinctNull#[skip:-9.99.99,reason:not yet fixed]
 ROW a = 1, c = null
 | STATS COUNT_DISTINCT(c) BY a;
 
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats_percentile.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats_percentile.csv-spec
index 2ac7a0cf6217..7f4b8b24dbe6 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats_percentile.csv-spec
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats_percentile.csv-spec
@@ -130,19 +130,6 @@ m:double           | p50:double           | job_positions:keyword
 3.9299999999999997 | 3.9299999999999997   | "Architect"
 ;
 
-medianAbsoluteDeviation
-// tag::median-absolute-deviation[]
-FROM employees
-| STATS MEDIAN(salary), MEDIAN_ABSOLUTE_DEVIATION(salary)
-// end::median-absolute-deviation[]
-;
-
-// tag::median-absolute-deviation-result[]
-MEDIAN(salary):double | MEDIAN_ABSOLUTE_DEVIATION(salary):double
-47003                 | 10096.5
-// end::median-absolute-deviation-result[]
-;
-
 medianViaExpression
 from employees | stats p50 = percentile(salary_change, 25*2);
 
@@ -170,19 +157,6 @@ median_max_salary_change:double
 // end::docsStatsMedianNestedExpression-result[]
 ;
 
-docsStatsMADNestedExpression#[skip:-8.12.99,reason:supported in 8.13+]
-// tag::docsStatsMADNestedExpression[]
-FROM employees
-| STATS m_a_d_max_salary_change = MEDIAN_ABSOLUTE_DEVIATION(MV_MAX(salary_change))
-// end::docsStatsMADNestedExpression[]
-;
-
-// tag::docsStatsMADNestedExpression-result[]
-m_a_d_max_salary_change:double
-5.69
-// end::docsStatsMADNestedExpression-result[]
-;
-
 docsStatsPercentileNestedExpression#[skip:-8.12.99,reason:supported in 8.13+]
 // tag::docsStatsPercentileNestedExpression[]
 FROM employees
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/string.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/string.csv-spec
index f85a3bb01ad4..ffcceab26bca 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/string.csv-spec
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/string.csv-spec
@@ -1595,4 +1595,100 @@ emp_no:integer | languages:integer | first_name:keyword
 10004 | 5 | ChirstianChirstianChirstianChirstianChirstian
 ;
 
+space
+required_capability: space
+// tag::space[]
+ROW message = CONCAT("Hello", SPACE(1), "World!");
+// end::space[]
 
+// tag::space-result[]
+message:keyword
+Hello World!
+// end::space-result[]
+;
+
+spaceLength
+required_capability: space
+ROW len = LENGTH(SPACE(12));
+
+len:integer
+12
+;
+
+spaceCalculated
+required_capability: space
+ROW inner_width = 20, title = "Title"
+| EVAL lspace = SPACE((inner_width-LENGTH(title))/2),
+       rspace = SPACE(inner_width-LENGTH(lspace)-LENGTH(title)),
+       centered_title = CONCAT("<",lspace,title,rspace,">")
+| KEEP inner_width, centered_title;
+
+inner_width:integer | centered_title:keyword
+20 | <       Title        >
+;
+
+spaceNumberFromIndex
+required_capability: space
+FROM employees
+| EVAL s = CONCAT("<",SPACE(languages),">")
+| WHERE emp_no < 10005
+| SORT emp_no
+| KEEP emp_no, languages, s;
+
+emp_no:integer | languages:integer | s:keyword
+10001 | 2 | <  >
+10002 | 5 | <     >
+10003 | 4 | <    >
+10004 | 5 | <     >
+;
+
+spaceZero
+required_capability: space
+ROW s = SPACE(0);
+
+s:keyword
+""
+;
+
+spaceNull
+required_capability: space
+ROW s = SPACE(null);
+
+s:keyword
+null
+;
+
+spaceNegative
+required_capability: space
+FROM employees | SORT emp_no | LIMIT 1 | EVAL s = SPACE(-LENGTH(first_name)) | KEEP s;
+
+warning:Line 1:51: evaluation of [SPACE(-LENGTH(first_name))] failed, treating result as null. Only first 20 failures recorded.
+warning:Line 1:51: java.lang.IllegalArgumentException: Number parameter cannot be negative, found [-6]
+
+s:keyword
+null
+;
+
+spaceComplex
+required_capability: space
+ROW x = 1+2+3, y = null | EVAL z = x + 5 | LIMIT 1
+| EVAL xs = SPACE(x), xsc = CONCAT("<",xs,">"),
+       xn = SPACE(null),
+       xz = SPACE(z), xzc = CONCAT("<",xz,">"),
+       lxz = LENGTH(xz), lxs = LENGTH(xs), ltr = LENGTH(TRIM(xz))
+| DROP xs, xz;
+
+x:integer | y:null | z:integer | xsc:keyword | xn:keyword | xzc:keyword | lxz:integer | lxs:integer | ltr:integer
+6 | null |  11 | <      > | null | <           > | 11 | 6 | 0
+;
+
+spaceMV
+required_capability: space
+ROW mv = [1,2,3] | EVAL x = space(mv) | KEEP x;
+
+warning:Line 1:29: evaluation of [space(mv)] failed, treating result as null. Only first 20 failures recorded.
+warning:Line 1:29: java.lang.IllegalArgumentException: single-value function encountered multi-value
+
+x:keyword
+null
+;
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/union_types.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/union_types.csv-spec
index c6a2d47a78dc..3218962678d9 100644
--- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/union_types.csv-spec
+++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/union_types.csv-spec
@@ -1351,3 +1351,54 @@ FROM sample_data, sample_data_ts_long
            null | 172.21.0.5   |             1232382 | Disconnected    | Disconnected
            null | 172.21.0.5   |             1232382 | Disconnected    | Disconnected
 ;
+
+shortIntegerWidening
+required_capability: union_types
+required_capability: metadata_fields
+required_capability: casting_operator
+required_capability: union_types_numeric_widening
+
+FROM apps, apps_short METADATA _index
+| EVAL id = id::integer
+| KEEP _index, id, version, name
+| WHERE name == "aaaaa" OR name == "hhhhh"
+| SORT _index ASC, id ASC
+;
+
+_index:keyword | id:integer  | version:version  | name:keyword
+apps           | 1           | 1                | aaaaa
+apps           | 8           | 1.2.3.4          | hhhhh
+apps           | 12          | 1.2.3.4          | aaaaa
+apps_short     | 1           | 1                | aaaaa
+apps_short     | 8           | 1.2.3.4          | hhhhh
+apps_short     | 12          | 1.2.3.4          | aaaaa
+;
+
+shortIntegerWideningStats
+required_capability: union_types
+required_capability: casting_operator
+required_capability: union_types_numeric_widening
+
+FROM apps, apps_short
+| EVAL id = id::integer
+| STATS count=count() BY name, id
+| KEEP id, name, count
+| SORT id ASC, name ASC
+;
+
+id:integer | name:keyword | count:long
+1          | aaaaa        | 2
+2          | bbbbb        | 2
+3          | ccccc        | 2
+4          | ddddd        | 2
+5          | eeeee        | 2
+6          | fffff        | 2
+7          | ggggg        | 2
+8          | hhhhh        | 2
+9          | iiiii        | 2
+10         | jjjjj        | 2
+11         | kkkkk        | 2
+12         | aaaaa        | 2
+13         | lllll        | 2
+14         | mmmmm        | 2
+;
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractEsqlIntegTestCase.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractEsqlIntegTestCase.java
index 84738f733f86..00efeb37a033 100644
--- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractEsqlIntegTestCase.java
+++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractEsqlIntegTestCase.java
@@ -118,14 +118,14 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
     protected void setRequestCircuitBreakerLimit(ByteSizeValue limit) {
         if (limit != null) {
             assertAcked(
-                clusterAdmin().prepareUpdateSettings()
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                     .setPersistentSettings(
                         Settings.builder().put(HierarchyCircuitBreakerService.REQUEST_CIRCUIT_BREAKER_LIMIT_SETTING.getKey(), limit).build()
                     )
             );
         } else {
             assertAcked(
-                clusterAdmin().prepareUpdateSettings()
+                clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                     .setPersistentSettings(
                         Settings.builder().putNull(HierarchyCircuitBreakerService.REQUEST_CIRCUIT_BREAKER_LIMIT_SETTING.getKey()).build()
                     )
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java
index 8d1d81795bf4..35c37eea1036 100644
--- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java
+++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java
@@ -128,7 +128,7 @@ public void testMetadataIndex() {
     void waitForNoInitializingShards(Client client, TimeValue timeout, String... indices) {
         ClusterHealthResponse resp = client.admin()
             .cluster()
-            .prepareHealth(indices)
+            .prepareHealth(TEST_REQUEST_TIMEOUT, indices)
             .setWaitForEvents(Priority.LANGUID)
             .setWaitForNoRelocatingShards(true)
             .setWaitForNoInitializingShards(true)
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java
index 0ec2f0da2d2a..e0bef22718d0 100644
--- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java
+++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java
@@ -1643,7 +1643,8 @@ public void testDefaultTruncationSizeSetting() {
 
         Settings settings = Settings.builder().put(EsqlPlugin.QUERY_RESULT_TRUNCATION_DEFAULT_SIZE.getKey(), 1).build();
 
-        ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest().persistentSettings(settings);
+        ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .persistentSettings(settings);
 
         client.updateSettings(settingsRequest).actionGet();
         try (EsqlQueryResponse results = run("from test")) {
@@ -1659,7 +1660,8 @@ public void testMaxTruncationSizeSetting() {
 
         Settings settings = Settings.builder().put(EsqlPlugin.QUERY_RESULT_TRUNCATION_MAX_SIZE.getKey(), 10).build();
 
-        ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest().persistentSettings(settings);
+        ClusterUpdateSettingsRequest settingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+            .persistentSettings(settings);
 
         client.updateSettings(settingsRequest).actionGet();
         try (EsqlQueryResponse results = run("from test | limit 40")) {
@@ -1677,7 +1679,9 @@ private void clearPersistentSettings(Setting<?>... settings) {
             clearedSettings.putNull(s.getKey());
         }
 
-        var clearSettingsRequest = new ClusterUpdateSettingsRequest().persistentSettings(clearedSettings.build());
+        var clearSettingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).persistentSettings(
+            clearedSettings.build()
+        );
         admin().cluster().updateSettings(clearSettingsRequest).actionGet();
     }
 
diff --git a/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationDoubleEvaluator.java
new file mode 100644
index 000000000000..7cefde819ded
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationDoubleEvaluator.java
@@ -0,0 +1,203 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License
+// 2.0; you may not use this file except in compliance with the Elastic License
+// 2.0.
+package org.elasticsearch.xpack.esql.expression.function.scalar.multivalue;
+
+import java.lang.Override;
+import java.lang.String;
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.DoubleBlock;
+import org.elasticsearch.compute.data.DoubleVector;
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+
+/**
+ * {@link EvalOperator.ExpressionEvaluator} implementation for {@link MvMedianAbsoluteDeviation}.
+ * This class is generated. Do not edit it.
+ */
+public final class MvMedianAbsoluteDeviationDoubleEvaluator extends AbstractMultivalueFunction.AbstractEvaluator {
+  public MvMedianAbsoluteDeviationDoubleEvaluator(EvalOperator.ExpressionEvaluator field,
+      DriverContext driverContext) {
+    super(driverContext, field);
+  }
+
+  @Override
+  public String name() {
+    return "MvMedianAbsoluteDeviation";
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field.
+   */
+  @Override
+  public Block evalNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNullable(fieldVal);
+    }
+    DoubleBlock v = (DoubleBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (DoubleBlock.Builder builder = driverContext.blockFactory().newDoubleBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Doubles work = new MvMedianAbsoluteDeviation.Doubles();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        if (valueCount == 1) {
+          double value = v.getDouble(first);
+          double result = MvMedianAbsoluteDeviation.single(value);
+          builder.appendDouble(result);
+          continue;
+        }
+        int end = first + valueCount;
+        for (int i = first; i < end; i++) {
+          double value = v.getDouble(i);
+          MvMedianAbsoluteDeviation.process(work, value);
+        }
+        double result = MvMedianAbsoluteDeviation.finish(work);
+        builder.appendDouble(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field.
+   */
+  @Override
+  public Block evalNotNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNotNullable(fieldVal);
+    }
+    DoubleBlock v = (DoubleBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (DoubleVector.FixedBuilder builder = driverContext.blockFactory().newDoubleVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Doubles work = new MvMedianAbsoluteDeviation.Doubles();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        if (valueCount == 1) {
+          double value = v.getDouble(first);
+          double result = MvMedianAbsoluteDeviation.single(value);
+          builder.appendDouble(result);
+          continue;
+        }
+        int end = first + valueCount;
+        for (int i = first; i < end; i++) {
+          double value = v.getDouble(i);
+          MvMedianAbsoluteDeviation.process(work, value);
+        }
+        double result = MvMedianAbsoluteDeviation.finish(work);
+        builder.appendDouble(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing only single valued fields.
+   */
+  @Override
+  public Block evalSingleValuedNullable(Block fieldVal) {
+    DoubleBlock v = (DoubleBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (DoubleBlock.Builder builder = driverContext.blockFactory().newDoubleBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Doubles work = new MvMedianAbsoluteDeviation.Doubles();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        assert valueCount == 1;
+        int first = v.getFirstValueIndex(p);
+        double value = v.getDouble(first);
+        double result = MvMedianAbsoluteDeviation.single(value);
+        builder.appendDouble(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing only single valued fields.
+   */
+  @Override
+  public Block evalSingleValuedNotNullable(Block fieldVal) {
+    DoubleBlock v = (DoubleBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (DoubleVector.FixedBuilder builder = driverContext.blockFactory().newDoubleVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Doubles work = new MvMedianAbsoluteDeviation.Doubles();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        assert valueCount == 1;
+        int first = v.getFirstValueIndex(p);
+        double value = v.getDouble(first);
+        double result = MvMedianAbsoluteDeviation.single(value);
+        builder.appendDouble(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNullable(Block fieldVal) {
+    DoubleBlock v = (DoubleBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (DoubleBlock.Builder builder = driverContext.blockFactory().newDoubleBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Doubles work = new MvMedianAbsoluteDeviation.Doubles();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        double result = MvMedianAbsoluteDeviation.ascending(work, v, first, valueCount);
+        builder.appendDouble(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNotNullable(Block fieldVal) {
+    DoubleBlock v = (DoubleBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (DoubleVector.FixedBuilder builder = driverContext.blockFactory().newDoubleVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Doubles work = new MvMedianAbsoluteDeviation.Doubles();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        double result = MvMedianAbsoluteDeviation.ascending(work, v, first, valueCount);
+        builder.appendDouble(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  public static class Factory implements EvalOperator.ExpressionEvaluator.Factory {
+    private final EvalOperator.ExpressionEvaluator.Factory field;
+
+    public Factory(EvalOperator.ExpressionEvaluator.Factory field) {
+      this.field = field;
+    }
+
+    @Override
+    public MvMedianAbsoluteDeviationDoubleEvaluator get(DriverContext context) {
+      return new MvMedianAbsoluteDeviationDoubleEvaluator(field.get(context), context);
+    }
+
+    @Override
+    public String toString() {
+      return "MvMedianAbsoluteDeviation[field=" + field + "]";
+    }
+  }
+}
diff --git a/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationIntEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationIntEvaluator.java
new file mode 100644
index 000000000000..76013ca1115d
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationIntEvaluator.java
@@ -0,0 +1,203 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License
+// 2.0; you may not use this file except in compliance with the Elastic License
+// 2.0.
+package org.elasticsearch.xpack.esql.expression.function.scalar.multivalue;
+
+import java.lang.Override;
+import java.lang.String;
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.IntBlock;
+import org.elasticsearch.compute.data.IntVector;
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+
+/**
+ * {@link EvalOperator.ExpressionEvaluator} implementation for {@link MvMedianAbsoluteDeviation}.
+ * This class is generated. Do not edit it.
+ */
+public final class MvMedianAbsoluteDeviationIntEvaluator extends AbstractMultivalueFunction.AbstractEvaluator {
+  public MvMedianAbsoluteDeviationIntEvaluator(EvalOperator.ExpressionEvaluator field,
+      DriverContext driverContext) {
+    super(driverContext, field);
+  }
+
+  @Override
+  public String name() {
+    return "MvMedianAbsoluteDeviation";
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field.
+   */
+  @Override
+  public Block evalNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNullable(fieldVal);
+    }
+    IntBlock v = (IntBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (IntBlock.Builder builder = driverContext.blockFactory().newIntBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        if (valueCount == 1) {
+          int value = v.getInt(first);
+          int result = MvMedianAbsoluteDeviation.single(value);
+          builder.appendInt(result);
+          continue;
+        }
+        int end = first + valueCount;
+        for (int i = first; i < end; i++) {
+          int value = v.getInt(i);
+          MvMedianAbsoluteDeviation.process(work, value);
+        }
+        int result = MvMedianAbsoluteDeviation.finishInts(work);
+        builder.appendInt(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field.
+   */
+  @Override
+  public Block evalNotNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNotNullable(fieldVal);
+    }
+    IntBlock v = (IntBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (IntVector.FixedBuilder builder = driverContext.blockFactory().newIntVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        if (valueCount == 1) {
+          int value = v.getInt(first);
+          int result = MvMedianAbsoluteDeviation.single(value);
+          builder.appendInt(result);
+          continue;
+        }
+        int end = first + valueCount;
+        for (int i = first; i < end; i++) {
+          int value = v.getInt(i);
+          MvMedianAbsoluteDeviation.process(work, value);
+        }
+        int result = MvMedianAbsoluteDeviation.finishInts(work);
+        builder.appendInt(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing only single valued fields.
+   */
+  @Override
+  public Block evalSingleValuedNullable(Block fieldVal) {
+    IntBlock v = (IntBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (IntBlock.Builder builder = driverContext.blockFactory().newIntBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        assert valueCount == 1;
+        int first = v.getFirstValueIndex(p);
+        int value = v.getInt(first);
+        int result = MvMedianAbsoluteDeviation.single(value);
+        builder.appendInt(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing only single valued fields.
+   */
+  @Override
+  public Block evalSingleValuedNotNullable(Block fieldVal) {
+    IntBlock v = (IntBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (IntVector.FixedBuilder builder = driverContext.blockFactory().newIntVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        assert valueCount == 1;
+        int first = v.getFirstValueIndex(p);
+        int value = v.getInt(first);
+        int result = MvMedianAbsoluteDeviation.single(value);
+        builder.appendInt(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNullable(Block fieldVal) {
+    IntBlock v = (IntBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (IntBlock.Builder builder = driverContext.blockFactory().newIntBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        int result = MvMedianAbsoluteDeviation.ascending(work, v, first, valueCount);
+        builder.appendInt(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNotNullable(Block fieldVal) {
+    IntBlock v = (IntBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (IntVector.FixedBuilder builder = driverContext.blockFactory().newIntVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        int result = MvMedianAbsoluteDeviation.ascending(work, v, first, valueCount);
+        builder.appendInt(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  public static class Factory implements EvalOperator.ExpressionEvaluator.Factory {
+    private final EvalOperator.ExpressionEvaluator.Factory field;
+
+    public Factory(EvalOperator.ExpressionEvaluator.Factory field) {
+      this.field = field;
+    }
+
+    @Override
+    public MvMedianAbsoluteDeviationIntEvaluator get(DriverContext context) {
+      return new MvMedianAbsoluteDeviationIntEvaluator(field.get(context), context);
+    }
+
+    @Override
+    public String toString() {
+      return "MvMedianAbsoluteDeviation[field=" + field + "]";
+    }
+  }
+}
diff --git a/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationLongEvaluator.java
new file mode 100644
index 000000000000..e7883d92708b
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationLongEvaluator.java
@@ -0,0 +1,203 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License
+// 2.0; you may not use this file except in compliance with the Elastic License
+// 2.0.
+package org.elasticsearch.xpack.esql.expression.function.scalar.multivalue;
+
+import java.lang.Override;
+import java.lang.String;
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.LongBlock;
+import org.elasticsearch.compute.data.LongVector;
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+
+/**
+ * {@link EvalOperator.ExpressionEvaluator} implementation for {@link MvMedianAbsoluteDeviation}.
+ * This class is generated. Do not edit it.
+ */
+public final class MvMedianAbsoluteDeviationLongEvaluator extends AbstractMultivalueFunction.AbstractEvaluator {
+  public MvMedianAbsoluteDeviationLongEvaluator(EvalOperator.ExpressionEvaluator field,
+      DriverContext driverContext) {
+    super(driverContext, field);
+  }
+
+  @Override
+  public String name() {
+    return "MvMedianAbsoluteDeviation";
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field.
+   */
+  @Override
+  public Block evalNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNullable(fieldVal);
+    }
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        if (valueCount == 1) {
+          long value = v.getLong(first);
+          long result = MvMedianAbsoluteDeviation.single(value);
+          builder.appendLong(result);
+          continue;
+        }
+        int end = first + valueCount;
+        for (int i = first; i < end; i++) {
+          long value = v.getLong(i);
+          MvMedianAbsoluteDeviation.process(work, value);
+        }
+        long result = MvMedianAbsoluteDeviation.finish(work);
+        builder.appendLong(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field.
+   */
+  @Override
+  public Block evalNotNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNotNullable(fieldVal);
+    }
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongVector.FixedBuilder builder = driverContext.blockFactory().newLongVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        if (valueCount == 1) {
+          long value = v.getLong(first);
+          long result = MvMedianAbsoluteDeviation.single(value);
+          builder.appendLong(result);
+          continue;
+        }
+        int end = first + valueCount;
+        for (int i = first; i < end; i++) {
+          long value = v.getLong(i);
+          MvMedianAbsoluteDeviation.process(work, value);
+        }
+        long result = MvMedianAbsoluteDeviation.finish(work);
+        builder.appendLong(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing only single valued fields.
+   */
+  @Override
+  public Block evalSingleValuedNullable(Block fieldVal) {
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        assert valueCount == 1;
+        int first = v.getFirstValueIndex(p);
+        long value = v.getLong(first);
+        long result = MvMedianAbsoluteDeviation.single(value);
+        builder.appendLong(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing only single valued fields.
+   */
+  @Override
+  public Block evalSingleValuedNotNullable(Block fieldVal) {
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongVector.FixedBuilder builder = driverContext.blockFactory().newLongVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        assert valueCount == 1;
+        int first = v.getFirstValueIndex(p);
+        long value = v.getLong(first);
+        long result = MvMedianAbsoluteDeviation.single(value);
+        builder.appendLong(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNullable(Block fieldVal) {
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        long result = MvMedianAbsoluteDeviation.ascending(work, v, first, valueCount);
+        builder.appendLong(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNotNullable(Block fieldVal) {
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongVector.FixedBuilder builder = driverContext.blockFactory().newLongVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        long result = MvMedianAbsoluteDeviation.ascending(work, v, first, valueCount);
+        builder.appendLong(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  public static class Factory implements EvalOperator.ExpressionEvaluator.Factory {
+    private final EvalOperator.ExpressionEvaluator.Factory field;
+
+    public Factory(EvalOperator.ExpressionEvaluator.Factory field) {
+      this.field = field;
+    }
+
+    @Override
+    public MvMedianAbsoluteDeviationLongEvaluator get(DriverContext context) {
+      return new MvMedianAbsoluteDeviationLongEvaluator(field.get(context), context);
+    }
+
+    @Override
+    public String toString() {
+      return "MvMedianAbsoluteDeviation[field=" + field + "]";
+    }
+  }
+}
diff --git a/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationUnsignedLongEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationUnsignedLongEvaluator.java
new file mode 100644
index 000000000000..ef8781e1dc04
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationUnsignedLongEvaluator.java
@@ -0,0 +1,203 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License
+// 2.0; you may not use this file except in compliance with the Elastic License
+// 2.0.
+package org.elasticsearch.xpack.esql.expression.function.scalar.multivalue;
+
+import java.lang.Override;
+import java.lang.String;
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.LongBlock;
+import org.elasticsearch.compute.data.LongVector;
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+
+/**
+ * {@link EvalOperator.ExpressionEvaluator} implementation for {@link MvMedianAbsoluteDeviation}.
+ * This class is generated. Do not edit it.
+ */
+public final class MvMedianAbsoluteDeviationUnsignedLongEvaluator extends AbstractMultivalueFunction.AbstractEvaluator {
+  public MvMedianAbsoluteDeviationUnsignedLongEvaluator(EvalOperator.ExpressionEvaluator field,
+      DriverContext driverContext) {
+    super(driverContext, field);
+  }
+
+  @Override
+  public String name() {
+    return "MvMedianAbsoluteDeviation";
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field.
+   */
+  @Override
+  public Block evalNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNullable(fieldVal);
+    }
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        if (valueCount == 1) {
+          long value = v.getLong(first);
+          long result = MvMedianAbsoluteDeviation.singleUnsignedLong(value);
+          builder.appendLong(result);
+          continue;
+        }
+        int end = first + valueCount;
+        for (int i = first; i < end; i++) {
+          long value = v.getLong(i);
+          MvMedianAbsoluteDeviation.processUnsignedLong(work, value);
+        }
+        long result = MvMedianAbsoluteDeviation.finishUnsignedLong(work);
+        builder.appendLong(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field.
+   */
+  @Override
+  public Block evalNotNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNotNullable(fieldVal);
+    }
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongVector.FixedBuilder builder = driverContext.blockFactory().newLongVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        if (valueCount == 1) {
+          long value = v.getLong(first);
+          long result = MvMedianAbsoluteDeviation.singleUnsignedLong(value);
+          builder.appendLong(result);
+          continue;
+        }
+        int end = first + valueCount;
+        for (int i = first; i < end; i++) {
+          long value = v.getLong(i);
+          MvMedianAbsoluteDeviation.processUnsignedLong(work, value);
+        }
+        long result = MvMedianAbsoluteDeviation.finishUnsignedLong(work);
+        builder.appendLong(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing only single valued fields.
+   */
+  @Override
+  public Block evalSingleValuedNullable(Block fieldVal) {
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        assert valueCount == 1;
+        int first = v.getFirstValueIndex(p);
+        long value = v.getLong(first);
+        long result = MvMedianAbsoluteDeviation.singleUnsignedLong(value);
+        builder.appendLong(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing only single valued fields.
+   */
+  @Override
+  public Block evalSingleValuedNotNullable(Block fieldVal) {
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongVector.FixedBuilder builder = driverContext.blockFactory().newLongVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        assert valueCount == 1;
+        int first = v.getFirstValueIndex(p);
+        long value = v.getLong(first);
+        long result = MvMedianAbsoluteDeviation.singleUnsignedLong(value);
+        builder.appendLong(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNullable(Block fieldVal) {
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongBlock.Builder builder = driverContext.blockFactory().newLongBlockBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        long result = MvMedianAbsoluteDeviation.ascendingUnsignedLong(work, v, first, valueCount);
+        builder.appendLong(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNotNullable(Block fieldVal) {
+    LongBlock v = (LongBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (LongVector.FixedBuilder builder = driverContext.blockFactory().newLongVectorFixedBuilder(positionCount)) {
+      MvMedianAbsoluteDeviation.Longs work = new MvMedianAbsoluteDeviation.Longs();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        long result = MvMedianAbsoluteDeviation.ascendingUnsignedLong(work, v, first, valueCount);
+        builder.appendLong(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
+  public static class Factory implements EvalOperator.ExpressionEvaluator.Factory {
+    private final EvalOperator.ExpressionEvaluator.Factory field;
+
+    public Factory(EvalOperator.ExpressionEvaluator.Factory field) {
+      this.field = field;
+    }
+
+    @Override
+    public MvMedianAbsoluteDeviationUnsignedLongEvaluator get(DriverContext context) {
+      return new MvMedianAbsoluteDeviationUnsignedLongEvaluator(field.get(context), context);
+    }
+
+    @Override
+    public String toString() {
+      return "MvMedianAbsoluteDeviation[field=" + field + "]";
+    }
+  }
+}
diff --git a/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianDoubleEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianDoubleEvaluator.java
index c3ea505a29e8..e3b539d8210a 100644
--- a/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianDoubleEvaluator.java
+++ b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianDoubleEvaluator.java
@@ -32,6 +32,9 @@ public String name() {
    */
   @Override
   public Block evalNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNullable(fieldVal);
+    }
     DoubleBlock v = (DoubleBlock) fieldVal;
     int positionCount = v.getPositionCount();
     try (DoubleBlock.Builder builder = driverContext.blockFactory().newDoubleBlockBuilder(positionCount)) {
@@ -60,6 +63,9 @@ public Block evalNullable(Block fieldVal) {
    */
   @Override
   public Block evalNotNullable(Block fieldVal) {
+    if (fieldVal.mvSortedAscending()) {
+      return evalAscendingNotNullable(fieldVal);
+    }
     DoubleBlock v = (DoubleBlock) fieldVal;
     int positionCount = v.getPositionCount();
     try (DoubleVector.FixedBuilder builder = driverContext.blockFactory().newDoubleVectorFixedBuilder(positionCount)) {
@@ -79,6 +85,46 @@ public Block evalNotNullable(Block fieldVal) {
     }
   }
 
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNullable(Block fieldVal) {
+    DoubleBlock v = (DoubleBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (DoubleBlock.Builder builder = driverContext.blockFactory().newDoubleBlockBuilder(positionCount)) {
+      MvMedian.Doubles work = new MvMedian.Doubles();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        if (valueCount == 0) {
+          builder.appendNull();
+          continue;
+        }
+        int first = v.getFirstValueIndex(p);
+        double result = MvMedian.ascending(v, first, valueCount);
+        builder.appendDouble(result);
+      }
+      return builder.build();
+    }
+  }
+
+  /**
+   * Evaluate blocks containing at least one multivalued field and all multivalued fields are in ascending order.
+   */
+  private Block evalAscendingNotNullable(Block fieldVal) {
+    DoubleBlock v = (DoubleBlock) fieldVal;
+    int positionCount = v.getPositionCount();
+    try (DoubleVector.FixedBuilder builder = driverContext.blockFactory().newDoubleVectorFixedBuilder(positionCount)) {
+      MvMedian.Doubles work = new MvMedian.Doubles();
+      for (int p = 0; p < positionCount; p++) {
+        int valueCount = v.getValueCount(p);
+        int first = v.getFirstValueIndex(p);
+        double result = MvMedian.ascending(v, first, valueCount);
+        builder.appendDouble(result);
+      }
+      return builder.build().asBlock();
+    }
+  }
+
   public static class Factory implements EvalOperator.ExpressionEvaluator.Factory {
     private final EvalOperator.ExpressionEvaluator.Factory field;
 
diff --git a/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceEvaluator.java b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceEvaluator.java
new file mode 100644
index 000000000000..0252bd85f6ff
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/generated/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceEvaluator.java
@@ -0,0 +1,128 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License
+// 2.0; you may not use this file except in compliance with the Elastic License
+// 2.0.
+package org.elasticsearch.xpack.esql.expression.function.scalar.string;
+
+import java.lang.IllegalArgumentException;
+import java.lang.Override;
+import java.lang.String;
+import java.util.function.Function;
+import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BytesRefBlock;
+import org.elasticsearch.compute.data.IntBlock;
+import org.elasticsearch.compute.data.IntVector;
+import org.elasticsearch.compute.data.Page;
+import org.elasticsearch.compute.operator.BreakingBytesRefBuilder;
+import org.elasticsearch.compute.operator.DriverContext;
+import org.elasticsearch.compute.operator.EvalOperator;
+import org.elasticsearch.core.Releasables;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.expression.function.Warnings;
+
+/**
+ * {@link EvalOperator.ExpressionEvaluator} implementation for {@link Space}.
+ * This class is generated. Do not edit it.
+ */
+public final class SpaceEvaluator implements EvalOperator.ExpressionEvaluator {
+  private final Warnings warnings;
+
+  private final BreakingBytesRefBuilder scratch;
+
+  private final EvalOperator.ExpressionEvaluator number;
+
+  private final DriverContext driverContext;
+
+  public SpaceEvaluator(Source source, BreakingBytesRefBuilder scratch,
+      EvalOperator.ExpressionEvaluator number, DriverContext driverContext) {
+    this.scratch = scratch;
+    this.number = number;
+    this.driverContext = driverContext;
+    this.warnings = Warnings.createWarnings(driverContext.warningsMode(), source);
+  }
+
+  @Override
+  public Block eval(Page page) {
+    try (IntBlock numberBlock = (IntBlock) number.eval(page)) {
+      IntVector numberVector = numberBlock.asVector();
+      if (numberVector == null) {
+        return eval(page.getPositionCount(), numberBlock);
+      }
+      return eval(page.getPositionCount(), numberVector);
+    }
+  }
+
+  public BytesRefBlock eval(int positionCount, IntBlock numberBlock) {
+    try(BytesRefBlock.Builder result = driverContext.blockFactory().newBytesRefBlockBuilder(positionCount)) {
+      position: for (int p = 0; p < positionCount; p++) {
+        if (numberBlock.isNull(p)) {
+          result.appendNull();
+          continue position;
+        }
+        if (numberBlock.getValueCount(p) != 1) {
+          if (numberBlock.getValueCount(p) > 1) {
+            warnings.registerException(new IllegalArgumentException("single-value function encountered multi-value"));
+          }
+          result.appendNull();
+          continue position;
+        }
+        try {
+          result.appendBytesRef(Space.process(this.scratch, numberBlock.getInt(numberBlock.getFirstValueIndex(p))));
+        } catch (IllegalArgumentException e) {
+          warnings.registerException(e);
+          result.appendNull();
+        }
+      }
+      return result.build();
+    }
+  }
+
+  public BytesRefBlock eval(int positionCount, IntVector numberVector) {
+    try(BytesRefBlock.Builder result = driverContext.blockFactory().newBytesRefBlockBuilder(positionCount)) {
+      position: for (int p = 0; p < positionCount; p++) {
+        try {
+          result.appendBytesRef(Space.process(this.scratch, numberVector.getInt(p)));
+        } catch (IllegalArgumentException e) {
+          warnings.registerException(e);
+          result.appendNull();
+        }
+      }
+      return result.build();
+    }
+  }
+
+  @Override
+  public String toString() {
+    return "SpaceEvaluator[" + "number=" + number + "]";
+  }
+
+  @Override
+  public void close() {
+    Releasables.closeExpectNoException(scratch, number);
+  }
+
+  static class Factory implements EvalOperator.ExpressionEvaluator.Factory {
+    private final Source source;
+
+    private final Function<DriverContext, BreakingBytesRefBuilder> scratch;
+
+    private final EvalOperator.ExpressionEvaluator.Factory number;
+
+    public Factory(Source source, Function<DriverContext, BreakingBytesRefBuilder> scratch,
+        EvalOperator.ExpressionEvaluator.Factory number) {
+      this.source = source;
+      this.scratch = scratch;
+      this.number = number;
+    }
+
+    @Override
+    public SpaceEvaluator get(DriverContext context) {
+      return new SpaceEvaluator(source, scratch.apply(context), number.get(context), context);
+    }
+
+    @Override
+    public String toString() {
+      return "SpaceEvaluator[" + "number=" + number + "]";
+    }
+  }
+}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
index 120323ebeb7a..475e63733022 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
@@ -37,6 +37,11 @@ public enum Cap {
          */
         FN_MV_APPEND,
 
+        /**
+         * Support for {@code MV_MEDIAN_ABSOLUTE_DEVIATION} function.
+         */
+        FN_MV_MEDIAN_ABSOLUTE_DEVIATION,
+
         /**
          * Support for {@code MV_PERCENTILE} function.
          */
@@ -92,6 +97,11 @@ public enum Cap {
          */
         AGG_TOP_IP_SUPPORT,
 
+        /**
+         * {@code CASE} properly handling multivalue conditions.
+         */
+        CASE_MV,
+
         /**
          * Optimization for ST_CENTROID changed some results in cartesian data. #108713
          */
@@ -188,6 +198,11 @@ public enum Cap {
          */
         UNION_TYPES_MISSING_FIELD,
 
+        /**
+         * Fix for widening of short numeric types in union-types. Done in #112610
+         */
+        UNION_TYPES_NUMERIC_WIDENING,
+
         /**
          * Fix a parsing issue where numbers below Long.MIN_VALUE threw an exception instead of parsing as doubles.
          * see <a href="https://github.com/elastic/elasticsearch/issues/104323"> Parsing large numbers is inconsistent #104323 </a>
@@ -274,7 +289,17 @@ public enum Cap {
         /**
          * Allow mixed numeric types in coalesce
          */
-        MIXED_NUMERIC_TYPES_IN_COALESCE;
+        MIXED_NUMERIC_TYPES_IN_COALESCE,
+
+        /**
+         * Support for requesting the "SPACE" function.
+         */
+        SPACE,
+
+        /**
+         * Support explicit casting from string literal to DATE_PERIOD or TIME_DURATION.
+         */
+        CAST_STRING_LITERAL_TO_TEMPORAL_AMOUNT;
 
         private final boolean snapshotOnly;
         private final FeatureFlag featureFlag;
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java
index 4f9ef3df29a8..9288e1cf81a1 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java
@@ -115,7 +115,6 @@
 import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
 import static org.elasticsearch.xpack.esql.core.type.DataType.LONG;
 import static org.elasticsearch.xpack.esql.core.type.DataType.TEXT;
-import static org.elasticsearch.xpack.esql.core.type.DataType.UNSIGNED_LONG;
 import static org.elasticsearch.xpack.esql.core.type.DataType.VERSION;
 import static org.elasticsearch.xpack.esql.core.type.DataType.isTemporalAmount;
 import static org.elasticsearch.xpack.esql.stats.FeatureMetric.LIMIT;
@@ -1223,8 +1222,7 @@ private Expression resolveConvertFunction(AbstractConvertFunction convert, List<
                 HashMap<TypeResolutionKey, Expression> typeResolutions = new HashMap<>();
                 Set<DataType> supportedTypes = convert.supportedTypes();
                 imf.types().forEach(type -> {
-                    // TODO: Shouldn't we perform widening of small numerical types here?
-                    if (supportedTypes.contains(type)) {
+                    if (supportedTypes.contains(type.widenSmallNumeric())) {
                         TypeResolutionKey key = new TypeResolutionKey(fa.name(), type);
                         var concreteConvert = typeSpecificConvert(convert, fa.source(), type, imf);
                         typeResolutions.put(key, concreteConvert);
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Verifier.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Verifier.java
index f295c4b64bd8..9714d3fce6d9 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Verifier.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Verifier.java
@@ -394,7 +394,12 @@ private static void checkEvalFields(LogicalPlan p, Set<Failure> failures) {
                 DataType dataType = field.dataType();
                 if (DataType.isRepresentable(dataType) == false) {
                     failures.add(
-                        fail(field, "EVAL does not support type [{}] in expression [{}]", dataType.typeName(), field.child().sourceText())
+                        fail(
+                            field,
+                            "EVAL does not support type [{}] as the return data type of expression [{}]",
+                            dataType.typeName(),
+                            field.child().sourceText()
+                        )
                     );
                 }
                 // check no aggregate functions are used
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java
index 0d50623fe77e..49076a1d65e7 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java
@@ -41,6 +41,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToBoolean;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToCartesianPoint;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToCartesianShape;
+import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDatePeriod;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDatetime;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDegrees;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDouble;
@@ -51,6 +52,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToLong;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToRadians;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToString;
+import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToTimeDuration;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToUnsignedLong;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToVersion;
 import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateDiff;
@@ -94,6 +96,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvLast;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMax;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMedian;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMedianAbsoluteDeviation;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMin;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvPSeriesWeightedSum;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvPercentile;
@@ -119,6 +122,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Repeat;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Replace;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Right;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.Space;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Split;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.StartsWith;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Substring;
@@ -307,7 +311,8 @@ private FunctionDefinition[][] functions() {
                 def(ToLower.class, ToLower::new, "to_lower"),
                 def(ToUpper.class, ToUpper::new, "to_upper"),
                 def(Locate.class, Locate::new, "locate"),
-                def(Repeat.class, Repeat::new, "repeat") },
+                def(Repeat.class, Repeat::new, "repeat"),
+                def(Space.class, Space::new, "space") },
             // date
             new FunctionDefinition[] {
                 def(DateDiff.class, DateDiff::new, "date_diff"),
@@ -340,6 +345,7 @@ private FunctionDefinition[][] functions() {
                 def(ToBoolean.class, ToBoolean::new, "to_boolean", "to_bool"),
                 def(ToCartesianPoint.class, ToCartesianPoint::new, "to_cartesianpoint"),
                 def(ToCartesianShape.class, ToCartesianShape::new, "to_cartesianshape"),
+                def(ToDatePeriod.class, ToDatePeriod::new, "to_dateperiod"),
                 def(ToDatetime.class, ToDatetime::new, "to_datetime", "to_dt"),
                 def(ToDegrees.class, ToDegrees::new, "to_degrees"),
                 def(ToDouble.class, ToDouble::new, "to_double", "to_dbl"),
@@ -350,6 +356,7 @@ private FunctionDefinition[][] functions() {
                 def(ToLong.class, ToLong::new, "to_long"),
                 def(ToRadians.class, ToRadians::new, "to_radians"),
                 def(ToString.class, ToString::new, "to_string", "to_str"),
+                def(ToTimeDuration.class, ToTimeDuration::new, "to_timeduration"),
                 def(ToUnsignedLong.class, ToUnsignedLong::new, "to_unsigned_long", "to_ulong", "to_ul"),
                 def(ToVersion.class, ToVersion::new, "to_version", "to_ver"), },
             // multivalue functions
@@ -363,6 +370,7 @@ private FunctionDefinition[][] functions() {
                 def(MvLast.class, MvLast::new, "mv_last"),
                 def(MvMax.class, MvMax::new, "mv_max"),
                 def(MvMedian.class, MvMedian::new, "mv_median"),
+                def(MvMedianAbsoluteDeviation.class, MvMedianAbsoluteDeviation::new, "mv_median_absolute_deviation"),
                 def(MvMin.class, MvMin::new, "mv_min"),
                 def(MvPercentile.class, MvPercentile::new, "mv_percentile"),
                 def(MvPSeriesWeightedSum.class, MvPSeriesWeightedSum::new, "mv_pseries_weighted_sum"),
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/Warnings.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/Warnings.java
index 630cf62d0030..87809ba53687 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/Warnings.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/Warnings.java
@@ -32,30 +32,53 @@ public void registerException(Exception exception) {
     };
 
     /**
-     * Create a new warnings object based on the given mode
+     * Create a new warnings object based on the given mode which warns that
+     * it treats the result as {@code null}.
      * @param warningsMode The warnings collection strategy to use
-     * @param source used to indicate where in the query the warning occured
+     * @param source used to indicate where in the query the warning occurred
      * @return A warnings collector object
      */
     public static Warnings createWarnings(DriverContext.WarningsMode warningsMode, Source source) {
-        switch (warningsMode) {
-            case COLLECT -> {
-                return new Warnings(source);
-            }
-            case IGNORE -> {
-                return NOOP_WARNINGS;
-            }
-        }
-        throw new IllegalStateException("Unreachable");
+        return createWarnings(warningsMode, source, "treating result as null");
+    }
+
+    /**
+     * Create a new warnings object based on the given mode which warns that
+     * it treats the result as {@code false}.
+     * @param warningsMode The warnings collection strategy to use
+     * @param source used to indicate where in the query the warning occurred
+     * @return A warnings collector object
+     */
+    public static Warnings createWarningsTreatedAsFalse(DriverContext.WarningsMode warningsMode, Source source) {
+        return createWarnings(warningsMode, source, "treating result as false");
+    }
+
+    /**
+     * Create a new warnings object based on the given mode
+     * @param warningsMode The warnings collection strategy to use
+     * @param source used to indicate where in the query the warning occurred
+     * @param first warning message attached to the first result
+     * @return A warnings collector object
+     */
+    public static Warnings createWarnings(DriverContext.WarningsMode warningsMode, Source source, String first) {
+        return switch (warningsMode) {
+            case COLLECT -> new Warnings(source, first);
+            case IGNORE -> NOOP_WARNINGS;
+        };
     }
 
     public Warnings(Source source) {
+        this(source, "treating result as null");
+    }
+
+    public Warnings(Source source, String first) {
         location = format("Line {}:{}: ", source.source().getLineNumber(), source.source().getColumnNumber());
-        first = format(
+        this.first = format(
             null,
-            "{}evaluation of [{}] failed, treating result as null. Only first {} failures recorded.",
+            "{}evaluation of [{}] failed, {}. Only first {} failures recorded.",
             location,
             source.text(),
+            first,
             MAX_ADDED_WARNINGS
         );
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/MedianAbsoluteDeviation.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/MedianAbsoluteDeviation.java
index 46661e96b1d4..23a6b23a35cd 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/MedianAbsoluteDeviation.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/MedianAbsoluteDeviation.java
@@ -16,14 +16,17 @@
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.expression.SurrogateExpression;
 import org.elasticsearch.xpack.esql.expression.function.Example;
 import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
 import org.elasticsearch.xpack.esql.expression.function.Param;
+import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDouble;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMedianAbsoluteDeviation;
 
 import java.io.IOException;
 import java.util.List;
 
-public class MedianAbsoluteDeviation extends NumericAggregate {
+public class MedianAbsoluteDeviation extends NumericAggregate implements SurrogateExpression {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
         Expression.class,
         "MedianAbsoluteDeviation",
@@ -50,13 +53,13 @@ public class MedianAbsoluteDeviation extends NumericAggregate {
             ====""",
         isAggregation = true,
         examples = {
-            @Example(file = "stats_percentile", tag = "median-absolute-deviation"),
+            @Example(file = "median_absolute_deviation", tag = "median-absolute-deviation"),
             @Example(
                 description = "The expression can use inline functions. For example, to calculate the the "
                     + "median absolute deviation of the maximum values of a multivalued column, first "
                     + "use `MV_MAX` to get the maximum value per row, and use the result with the "
                     + "`MEDIAN_ABSOLUTE_DEVIATION` function",
-                file = "stats_percentile",
+                file = "median_absolute_deviation",
                 tag = "docsStatsMADNestedExpression"
             ), }
     )
@@ -97,4 +100,16 @@ protected AggregatorFunctionSupplier intSupplier(List<Integer> inputChannels) {
     protected AggregatorFunctionSupplier doubleSupplier(List<Integer> inputChannels) {
         return new MedianAbsoluteDeviationDoubleAggregatorFunctionSupplier(inputChannels);
     }
+
+    @Override
+    public Expression surrogate() {
+        var s = source();
+        var field = field();
+
+        if (field.foldable()) {
+            return new MvMedianAbsoluteDeviation(s, new ToDouble(s, field));
+        }
+
+        return null;
+    }
 }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SpatialAggregateFunction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SpatialAggregateFunction.java
index d54d20eb4115..5cb7edf2581d 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SpatialAggregateFunction.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/SpatialAggregateFunction.java
@@ -29,6 +29,7 @@ protected SpatialAggregateFunction(Source source, Expression field, boolean useD
 
     protected SpatialAggregateFunction(StreamInput in, boolean useDocValues) throws IOException {
         super(in);
+        // The useDocValues field is only used on data nodes local planning, and therefor never serialized
         this.useDocValues = useDocValues;
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/UnaryScalarFunction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/UnaryScalarFunction.java
index 980d3ab0e755..bdbc9b649c10 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/UnaryScalarFunction.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/UnaryScalarFunction.java
@@ -58,6 +58,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Length;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.RTrim;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.Space;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Trim;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.WildcardLike;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Neg;
@@ -96,6 +97,7 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
         entries.add(Signum.ENTRY);
         entries.add(Sin.ENTRY);
         entries.add(Sinh.ENTRY);
+        entries.add(Space.ENTRY);
         entries.add(Sqrt.ENTRY);
         entries.add(StX.ENTRY);
         entries.add(StY.ENTRY);
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/Case.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/Case.java
index 3239afabf6a2..979f681a7fbd 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/Case.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/Case.java
@@ -11,6 +11,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BlockFactory;
 import org.elasticsearch.compute.data.BooleanBlock;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.Page;
@@ -29,6 +30,7 @@
 import org.elasticsearch.xpack.esql.expression.function.Example;
 import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
 import org.elasticsearch.xpack.esql.expression.function.Param;
+import org.elasticsearch.xpack.esql.expression.function.Warnings;
 import org.elasticsearch.xpack.esql.expression.function.scalar.EsqlScalarFunction;
 import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
 import org.elasticsearch.xpack.esql.planner.PlannerUtils;
@@ -46,7 +48,11 @@
 public final class Case extends EsqlScalarFunction {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(Expression.class, "Case", Case::new);
 
-    record Condition(Expression condition, Expression value) {}
+    record Condition(Expression condition, Expression value) {
+        ConditionEvaluatorSupplier toEvaluator(Function<Expression, ExpressionEvaluator.Factory> toEvaluator) {
+            return new ConditionEvaluatorSupplier(condition.source(), toEvaluator.apply(condition), toEvaluator.apply(value));
+        }
+    }
 
     private final List<Condition> conditions;
     private final Expression elseValue;
@@ -56,9 +62,12 @@ record Condition(Expression condition, Expression value) {}
         returnType = {
             "boolean",
             "cartesian_point",
+            "cartesian_shape",
             "date",
+            "date_nanos",
             "double",
             "geo_point",
+            "geo_shape",
             "integer",
             "ip",
             "keyword",
@@ -94,9 +103,12 @@ public Case(
             type = {
                 "boolean",
                 "cartesian_point",
+                "cartesian_shape",
                 "date",
+                "date_nanos",
                 "double",
                 "geo_point",
+                "geo_shape",
                 "integer",
                 "ip",
                 "keyword",
@@ -215,25 +227,26 @@ public boolean foldable() {
             if (condition.condition.foldable() == false) {
                 return false;
             }
-            Boolean b = (Boolean) condition.condition.fold();
-            if (b != null && b) {
+            if (Boolean.TRUE.equals(condition.condition.fold())) {
+                /*
+                 * `fold` can make four things here:
+                 * 1. `TRUE`
+                 * 2. `FALSE`
+                 * 3. null
+                 * 4. A list with more than one `TRUE` or `FALSE` in it.
+                 *
+                 * In the first case, we're foldable if the condition is foldable.
+                 * The multivalued field will make a warning, but eventually
+                 * become null. And null will become false. So cases 2-4 are
+                 * the same. In those cases we are foldable only if the *rest*
+                 * of the condition is foldable.
+                 */
                 return condition.value.foldable();
             }
         }
         return elseValue.foldable();
     }
 
-    @Override
-    public Object fold() {
-        for (Condition condition : conditions) {
-            Boolean b = (Boolean) condition.condition.fold();
-            if (b != null && b) {
-                return condition.value.fold();
-            }
-        }
-        return elseValue.fold();
-    }
-
     /**
      * Fold the arms of {@code CASE} statements.
      * <ol>
@@ -261,8 +274,20 @@ public Expression partiallyFold() {
                 continue;
             }
             modified = true;
-            Boolean b = (Boolean) condition.condition.fold();
-            if (b != null && b) {
+            if (Boolean.TRUE.equals(condition.condition.fold())) {
+                /*
+                 * `fold` can make four things here:
+                 * 1. `TRUE`
+                 * 2. `FALSE`
+                 * 3. null
+                 * 4. A list with more than one `TRUE` or `FALSE` in it.
+                 *
+                 * In the first case, we fold to the value of the condition.
+                 * The multivalued field will make a warning, but eventually
+                 * become null. And null will become false. So cases 2-4 are
+                 * the same. In those cases we fold the entire condition
+                 * away, returning just what ever's remaining in the CASE.
+                 */
                 newChildren.add(condition.value);
                 return finishPartialFold(newChildren);
             }
@@ -277,24 +302,23 @@ public Expression partiallyFold() {
     }
 
     private Expression finishPartialFold(List<Expression> newChildren) {
-        if (newChildren.size() == 1) {
-            return newChildren.get(0);
-        }
-        return replaceChildren(newChildren);
+        return switch (newChildren.size()) {
+            case 0 -> new Literal(source(), null, dataType());
+            case 1 -> newChildren.get(0);
+            default -> replaceChildren(newChildren);
+        };
     }
 
     @Override
     public ExpressionEvaluator.Factory toEvaluator(Function<Expression, ExpressionEvaluator.Factory> toEvaluator) {
         ElementType resultType = PlannerUtils.toElementType(dataType());
-        List<ConditionEvaluatorSupplier> conditionsFactories = conditions.stream()
-            .map(c -> new ConditionEvaluatorSupplier(toEvaluator.apply(c.condition), toEvaluator.apply(c.value)))
-            .toList();
+        List<ConditionEvaluatorSupplier> conditionsFactories = conditions.stream().map(c -> c.toEvaluator(toEvaluator)).toList();
         ExpressionEvaluator.Factory elseValueFactory = toEvaluator.apply(elseValue);
         return new ExpressionEvaluator.Factory() {
             @Override
             public ExpressionEvaluator get(DriverContext context) {
                 return new CaseEvaluator(
-                    context,
+                    context.blockFactory(),
                     resultType,
                     conditionsFactories.stream().map(x -> x.apply(context)).toList(),
                     elseValueFactory.get(context)
@@ -303,40 +327,58 @@ public ExpressionEvaluator get(DriverContext context) {
 
             @Override
             public String toString() {
-                return "CaseEvaluator[resultType="
-                    + resultType
-                    + ", conditions="
-                    + conditionsFactories
-                    + ", elseVal="
-                    + elseValueFactory
-                    + ']';
+                return "CaseEvaluator[conditions=" + conditionsFactories + ", elseVal=" + elseValueFactory + ']';
             }
         };
     }
 
-    record ConditionEvaluatorSupplier(ExpressionEvaluator.Factory condition, ExpressionEvaluator.Factory value)
+    record ConditionEvaluatorSupplier(Source conditionSource, ExpressionEvaluator.Factory condition, ExpressionEvaluator.Factory value)
         implements
             Function<DriverContext, ConditionEvaluator> {
         @Override
         public ConditionEvaluator apply(DriverContext driverContext) {
-            return new ConditionEvaluator(condition.get(driverContext), value.get(driverContext));
+            return new ConditionEvaluator(
+                /*
+                 * We treat failures as null just like any other failure.
+                 * It's just that we then *immediately* convert it to
+                 * true or false using the tri-valued boolean logic stuff.
+                 * And that makes it into false. This is, *exactly* what
+                 * happens in PostgreSQL and MySQL and SQLite:
+                 * > SELECT CASE WHEN null THEN 1 ELSE 2 END;
+                 * 2
+                 * Rather than go into depth about this in the warning message,
+                 * we just say "false".
+                 */
+                Warnings.createWarningsTreatedAsFalse(driverContext.warningsMode(), conditionSource),
+                condition.get(driverContext),
+                value.get(driverContext)
+            );
         }
 
         @Override
         public String toString() {
-            return "ConditionEvaluator[" + "condition=" + condition + ", value=" + value + ']';
+            return "ConditionEvaluator[condition=" + condition + ", value=" + value + ']';
         }
     }
 
-    record ConditionEvaluator(EvalOperator.ExpressionEvaluator condition, EvalOperator.ExpressionEvaluator value) implements Releasable {
+    record ConditionEvaluator(
+        Warnings conditionWarnings,
+        EvalOperator.ExpressionEvaluator condition,
+        EvalOperator.ExpressionEvaluator value
+    ) implements Releasable {
         @Override
         public void close() {
             Releasables.closeExpectNoException(condition, value);
         }
+
+        @Override
+        public String toString() {
+            return "ConditionEvaluator[condition=" + condition + ", value=" + value + ']';
+        }
     }
 
     private record CaseEvaluator(
-        DriverContext driverContext,
+        BlockFactory blockFactory,
         ElementType resultType,
         List<ConditionEvaluator> conditions,
         EvalOperator.ExpressionEvaluator elseVal
@@ -353,10 +395,11 @@ public Block eval(Page page) {
              * a time - but it's not at all fast.
              */
             int positionCount = page.getPositionCount();
-            try (Block.Builder result = resultType.newBlockBuilder(positionCount, driverContext.blockFactory())) {
+            try (Block.Builder result = resultType.newBlockBuilder(positionCount, blockFactory)) {
                 position: for (int p = 0; p < positionCount; p++) {
                     int[] positions = new int[] { p };
                     Page limited = new Page(
+                        1,
                         IntStream.range(0, page.getBlockCount()).mapToObj(b -> page.getBlock(b).filter(positions)).toArray(Block[]::new)
                     );
                     try (Releasable ignored = limited::releaseBlocks) {
@@ -365,6 +408,12 @@ public Block eval(Page page) {
                                 if (b.isNull(0)) {
                                     continue;
                                 }
+                                if (b.getValueCount(0) > 1) {
+                                    condition.conditionWarnings.registerException(
+                                        new IllegalArgumentException("CASE expects a single-valued boolean")
+                                    );
+                                    continue;
+                                }
                                 if (false == b.getBoolean(b.getFirstValueIndex(0))) {
                                     continue;
                                 }
@@ -390,7 +439,7 @@ public void close() {
 
         @Override
         public String toString() {
-            return "CaseEvaluator[resultType=" + resultType + ", conditions=" + conditions + ", elseVal=" + elseVal + ']';
+            return "CaseEvaluator[conditions=" + conditions + ", elseVal=" + elseVal + ']';
         }
     }
 }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/AbstractConvertFunction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/AbstractConvertFunction.java
index cf97558cd267..f3ce6b1465d6 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/AbstractConvertFunction.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/AbstractConvertFunction.java
@@ -63,7 +63,7 @@ protected AbstractConvertFunction(StreamInput in) throws IOException {
      * Build the evaluator given the evaluator a multivalued field.
      */
     protected final ExpressionEvaluator.Factory evaluator(ExpressionEvaluator.Factory fieldEval) {
-        DataType sourceType = field().dataType();
+        DataType sourceType = field().dataType().widenSmallNumeric();
         var factory = factories().get(sourceType);
         if (factory == null) {
             throw EsqlIllegalArgumentException.illegalDataType(sourceType);
@@ -72,7 +72,7 @@ protected final ExpressionEvaluator.Factory evaluator(ExpressionEvaluator.Factor
     }
 
     @Override
-    protected final TypeResolution resolveType() {
+    protected TypeResolution resolveType() {
         if (childrenResolved() == false) {
             return new TypeResolution("Unresolved children");
         }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/FoldablesConvertFunction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/FoldablesConvertFunction.java
new file mode 100644
index 000000000000..6e2b5bb63532
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/FoldablesConvertFunction.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.convert;
+
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.xpack.esql.capabilities.Validatable;
+import org.elasticsearch.xpack.esql.common.Failures;
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+
+import java.util.Locale;
+import java.util.Map;
+
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
+import static org.elasticsearch.xpack.esql.core.type.DataType.isString;
+import static org.elasticsearch.xpack.esql.expression.Validations.isFoldable;
+import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.foldToTemporalAmount;
+
+/**
+ * Base class for functions that converts a constant into an interval type - DATE_PERIOD or TIME_DURATION.
+ * The functions will be folded at the end of LogicalPlanOptimizer by the coordinator, it does not reach data node.
+ */
+public abstract class FoldablesConvertFunction extends AbstractConvertFunction implements Validatable {
+
+    protected FoldablesConvertFunction(Source source, Expression field) {
+        super(source, field);
+    }
+
+    @Override
+    public final void writeTo(StreamOutput out) {
+        throw new UnsupportedOperationException("not serialized");
+    }
+
+    @Override
+    public final String getWriteableName() {
+        throw new UnsupportedOperationException("not serialized");
+    }
+
+    @Override
+    protected final TypeResolution resolveType() {
+        if (childrenResolved() == false) {
+            return new TypeResolution("Unresolved children");
+        }
+        return isType(
+            field(),
+            dt -> isString(dt) || dt == dataType(),
+            sourceText(),
+            null,
+            false,
+            dataType().typeName().toLowerCase(Locale.ROOT) + " or string"
+        );
+    }
+
+    @Override
+    protected final Map<DataType, BuildFactory> factories() {
+        // TODO if a union type field is provided as an input, the correct error message is not shown, #112668 is a follow up
+        return Map.of();
+    }
+
+    @Override
+    public final Object fold() {
+        return foldToTemporalAmount(field(), sourceText(), dataType());
+    }
+
+    @Override
+    public final void validate(Failures failures) {
+        failures.add(isFoldable(field(), sourceText(), null));
+    }
+}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatePeriod.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatePeriod.java
new file mode 100644
index 000000000000..86b46c792c85
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatePeriod.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.convert;
+
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.expression.function.Example;
+import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
+import org.elasticsearch.xpack.esql.expression.function.Param;
+
+import java.util.List;
+
+import static org.elasticsearch.xpack.esql.core.type.DataType.DATE_PERIOD;
+
+public class ToDatePeriod extends FoldablesConvertFunction {
+
+    @FunctionInfo(
+        returnType = "date_period",
+        description = "Converts an input value into a `date_period` value.",
+        examples = @Example(file = "convert", tag = "castToDatePeriod")
+    )
+    public ToDatePeriod(
+        Source source,
+        @Param(
+            name = "field",
+            type = { "date_period", "keyword", "text" },
+            description = "Input value. The input is a valid constant date period expression."
+        ) Expression v
+    ) {
+        super(source, v);
+    }
+
+    @Override
+    public DataType dataType() {
+        return DATE_PERIOD;
+    }
+
+    @Override
+    public Expression replaceChildren(List<Expression> newChildren) {
+        return new ToDatePeriod(source(), newChildren.get(0));
+    }
+
+    @Override
+    protected NodeInfo<? extends Expression> info() {
+        return NodeInfo.create(this, ToDatePeriod::new, field());
+    }
+}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToTimeDuration.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToTimeDuration.java
new file mode 100644
index 000000000000..95425deccdda
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToTimeDuration.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.convert;
+
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.expression.function.Example;
+import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
+import org.elasticsearch.xpack.esql.expression.function.Param;
+
+import java.util.List;
+
+import static org.elasticsearch.xpack.esql.core.type.DataType.TIME_DURATION;
+
+public class ToTimeDuration extends FoldablesConvertFunction {
+
+    @FunctionInfo(
+        returnType = "time_duration",
+        description = "Converts an input value into a `time_duration` value.",
+        examples = @Example(file = "convert", tag = "castToTimeDuration")
+    )
+    public ToTimeDuration(
+        Source source,
+        @Param(
+            name = "field",
+            type = { "time_duration", "keyword", "text" },
+            description = "Input value. The input is a valid constant time duration expression."
+        ) Expression v
+    ) {
+        super(source, v);
+    }
+
+    @Override
+    public DataType dataType() {
+        return TIME_DURATION;
+    }
+
+    @Override
+    public Expression replaceChildren(List<Expression> newChildren) {
+        return new ToTimeDuration(source(), newChildren.get(0));
+    }
+
+    @Override
+    protected NodeInfo<? extends Expression> info() {
+        return NodeInfo.create(this, ToTimeDuration::new, field());
+    }
+}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Cosh.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Cosh.java
index 0cfbc195186f..721d9e9438a8 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Cosh.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Cosh.java
@@ -29,15 +29,16 @@ public class Cosh extends AbstractTrigonometricFunction {
 
     @FunctionInfo(
         returnType = "double",
-        description = "Returns the {wikipedia}/Hyperbolic_functions[hyperbolic cosine] of an angle.",
+        description = "Returns the {wikipedia}/Hyperbolic_functions[hyperbolic cosine] of a number.",
         examples = @Example(file = "floats", tag = "cosh")
     )
     public Cosh(
         Source source,
         @Param(
-            name = "angle",
+            name = "number",
             type = { "double", "integer", "long", "unsigned_long" },
-            description = "An angle, in radians. If `null`, the function returns `null`."
+            description = "Numeric expression. If `null`, the function returns `null`."
+
         ) Expression angle
     ) {
         super(source, angle);
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Sin.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Sin.java
index 526b17fb3eb2..b793d1972e00 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Sin.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Sin.java
@@ -29,7 +29,7 @@ public class Sin extends AbstractTrigonometricFunction {
 
     @FunctionInfo(
         returnType = "double",
-        description = "Returns ths {wikipedia}/Sine_and_cosine[Sine] trigonometric function of an angle.",
+        description = "Returns the {wikipedia}/Sine_and_cosine[sine] of an angle.",
         examples = @Example(file = "floats", tag = "sin")
     )
     public Sin(
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Sinh.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Sinh.java
index f89e626955d7..74c9bfe4826b 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Sinh.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Sinh.java
@@ -29,15 +29,15 @@ public class Sinh extends AbstractTrigonometricFunction {
 
     @FunctionInfo(
         returnType = "double",
-        description = "Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of an angle.",
+        description = "Returns the {wikipedia}/Hyperbolic_functions[hyperbolic sine] of a number.",
         examples = @Example(file = "floats", tag = "sinh")
     )
     public Sinh(
         Source source,
         @Param(
-            name = "angle",
+            name = "number",
             type = { "double", "integer", "long", "unsigned_long" },
-            description = "An angle, in radians. If `null`, the function returns `null`."
+            description = "Numeric expression. If `null`, the function returns `null`."
         ) Expression angle
     ) {
         super(source, angle);
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Tan.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Tan.java
index 85cdba0db468..44e61849c449 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Tan.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Tan.java
@@ -29,7 +29,7 @@ public class Tan extends AbstractTrigonometricFunction {
 
     @FunctionInfo(
         returnType = "double",
-        description = "Returns the {wikipedia}/Sine_and_cosine[Tangent] trigonometric function of an angle.",
+        description = "Returns the {wikipedia}/Sine_and_cosine[tangent] of an angle.",
         examples = @Example(file = "floats", tag = "tan")
     )
     public Tan(
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Tanh.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Tanh.java
index 0cd4051968c7..bc203acc33a5 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Tanh.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/math/Tanh.java
@@ -29,15 +29,15 @@ public class Tanh extends AbstractTrigonometricFunction {
 
     @FunctionInfo(
         returnType = "double",
-        description = "Returns the {wikipedia}/Hyperbolic_functions[Tangent] hyperbolic function of an angle.",
+        description = "Returns the {wikipedia}/Hyperbolic_functions[hyperbolic tangent] of a number.",
         examples = @Example(file = "floats", tag = "tanh")
     )
     public Tanh(
         Source source,
         @Param(
-            name = "angle",
+            name = "number",
             type = { "double", "integer", "long", "unsigned_long" },
-            description = "An angle, in radians. If `null`, the function returns `null`."
+            description = "Numeric expression. If `null`, the function returns `null`."
         ) Expression angle
     ) {
         super(source, angle);
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/AbstractMultivalueFunction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/AbstractMultivalueFunction.java
index cb0f9fdd8d5d..998a1815cbad 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/AbstractMultivalueFunction.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/AbstractMultivalueFunction.java
@@ -43,6 +43,7 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
             MvLast.ENTRY,
             MvMax.ENTRY,
             MvMedian.ENTRY,
+            MvMedianAbsoluteDeviation.ENTRY,
             MvMin.ENTRY,
             MvPercentile.ENTRY,
             MvPSeriesWeightedSum.ENTRY,
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedian.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedian.java
index e9e689911780..42510a5685de 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedian.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedian.java
@@ -36,7 +36,7 @@
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.unsignedLongToBigInteger;
 
 /**
- * Reduce a multivalued field to a single valued field containing the average value.
+ * Reduce a multivalued field to a single valued field containing the median of the values.
  */
 public class MvMedian extends AbstractMultivalueFunction {
     public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(Expression.class, "MvMedian", MvMedian::new);
@@ -106,7 +106,7 @@ static class Doubles {
         public int count;
     }
 
-    @MvEvaluator(extraName = "Double", finish = "finish")
+    @MvEvaluator(extraName = "Double", finish = "finish", ascending = "ascending")
     static void process(Doubles doubles, double v) {
         if (doubles.values.length < doubles.count + 1) {
             doubles.values = ArrayUtil.grow(doubles.values, doubles.count + 1);
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviation.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviation.java
new file mode 100644
index 000000000000..9bdfd1a2ccaf
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviation.java
@@ -0,0 +1,402 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.multivalue;
+
+import org.apache.lucene.util.ArrayUtil;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.compute.ann.MvEvaluator;
+import org.elasticsearch.compute.data.DoubleBlock;
+import org.elasticsearch.compute.data.IntBlock;
+import org.elasticsearch.compute.data.LongBlock;
+import org.elasticsearch.compute.operator.EvalOperator.ExpressionEvaluator;
+import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.core.util.NumericUtils;
+import org.elasticsearch.xpack.esql.expression.function.Example;
+import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
+import org.elasticsearch.xpack.esql.expression.function.Param;
+import org.elasticsearch.xpack.esql.planner.PlannerUtils;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
+import static org.elasticsearch.xpack.esql.core.type.DataType.isRepresentable;
+import static org.elasticsearch.xpack.esql.core.util.NumericUtils.unsignedLongSubtractExact;
+
+/**
+ * Reduce a multivalued field to a single valued field containing the median absolute deviation of the values.
+ */
+public class MvMedianAbsoluteDeviation extends AbstractMultivalueFunction {
+    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
+        Expression.class,
+        "MvMedianAbsoluteDeviation",
+        MvMedianAbsoluteDeviation::new
+    );
+
+    @FunctionInfo(
+        returnType = { "double", "integer", "long", "unsigned_long" },
+        description = "Converts a multivalued field into a single valued field containing the median absolute deviation."
+            + "\n\n"
+            + "It is calculated as the median of each data point's deviation from the median of "
+            + "the entire sample. That is, for a random variable `X`, the median absolute "
+            + "deviation is `median(|median(X) - X|)`.",
+        note = "If the field has an even number of values, "
+            + "the medians will be calculated as the average of the middle two values. "
+            + "If the value is not a floating point number, the averages are rounded towards 0.",
+        examples = @Example(file = "mv_median_absolute_deviation", tag = "example")
+    )
+    public MvMedianAbsoluteDeviation(
+        Source source,
+        @Param(
+            name = "number",
+            type = { "double", "integer", "long", "unsigned_long" },
+            description = "Multivalue expression."
+        ) Expression field
+    ) {
+        super(source, field);
+    }
+
+    private MvMedianAbsoluteDeviation(StreamInput in) throws IOException {
+        super(in);
+    }
+
+    @Override
+    public String getWriteableName() {
+        return ENTRY.name;
+    }
+
+    @Override
+    protected TypeResolution resolveFieldType() {
+        return isType(field(), t -> t.isNumeric() && isRepresentable(t), sourceText(), null, "numeric");
+    }
+
+    @Override
+    protected ExpressionEvaluator.Factory evaluator(ExpressionEvaluator.Factory fieldEval) {
+        return switch (PlannerUtils.toElementType(field().dataType())) {
+            case DOUBLE -> new MvMedianAbsoluteDeviationDoubleEvaluator.Factory(fieldEval);
+            case INT -> new MvMedianAbsoluteDeviationIntEvaluator.Factory(fieldEval);
+            case LONG -> field().dataType() == DataType.UNSIGNED_LONG
+                ? new MvMedianAbsoluteDeviationUnsignedLongEvaluator.Factory(fieldEval)
+                : new MvMedianAbsoluteDeviationLongEvaluator.Factory(fieldEval);
+            default -> throw EsqlIllegalArgumentException.illegalDataType(field.dataType());
+        };
+    }
+
+    @Override
+    public Expression replaceChildren(List<Expression> newChildren) {
+        return new MvMedianAbsoluteDeviation(source(), newChildren.get(0));
+    }
+
+    @Override
+    protected NodeInfo<? extends Expression> info() {
+        return NodeInfo.create(this, MvMedianAbsoluteDeviation::new, field());
+    }
+
+    static class Longs {
+        public long[] values = new long[2];
+        public int count;
+    }
+
+    /**
+     * Evaluator for integers.
+     * <p>
+     *     To avoid integer overflows, we're using the {@link Longs} class to store the values.
+     * </p>
+     */
+    @MvEvaluator(extraName = "Int", finish = "finishInts", ascending = "ascending", single = "single")
+    static void process(Longs longs, int v) {
+        if (longs.values.length < longs.count + 1) {
+            longs.values = ArrayUtil.grow(longs.values, longs.count + 1);
+        }
+        longs.values[longs.count++] = v;
+    }
+
+    static int finishInts(Longs longs) {
+        try {
+            long median = longMedianOf(longs);
+            for (int i = 0; i < longs.count; i++) {
+                long value = longs.values[i];
+                // We know they were ints, so we can calculate differences within a long
+                longs.values[i] = value > median ? value - median : median - value;
+            }
+            return Math.toIntExact(longMedianOf(longs));
+        } finally {
+            longs.count = 0;
+        }
+    }
+
+    /**
+     * Similar to the code in `finish`, for when the values are in ascending order. The major differences are:
+     * - As values are sorted, we don't need to sort them for the first median calculation.
+     * - We take the values directly from the block instead of from the helper object.
+     */
+    static int ascending(Longs longs, IntBlock values, int firstValue, int count) {
+        try {
+            if (longs.values.length < count) {
+                longs.values = ArrayUtil.grow(longs.values, count);
+            }
+            longs.count = count;
+            int middle = firstValue + count / 2;
+            long median = count % 2 == 1 ? values.getInt(middle) : avgWithoutOverflow(values.getInt(middle - 1), values.getInt(middle));
+            for (int i = 0; i < count; i++) {
+                long value = values.getInt(firstValue + i);
+                longs.values[i] = value > median ? value - median : median - value;
+            }
+            return Math.toIntExact(longMedianOf(longs));
+        } finally {
+            longs.count = 0;
+        }
+    }
+
+    static int single(int value) {
+        return 0;
+    }
+
+    @MvEvaluator(extraName = "Long", finish = "finish", ascending = "ascending", single = "single")
+    static void process(Longs longs, long v) {
+        if (longs.values.length < longs.count + 1) {
+            longs.values = ArrayUtil.grow(longs.values, longs.count + 1);
+        }
+        longs.values[longs.count++] = v;
+    }
+
+    static long finish(Longs longs) {
+        try {
+            long median = longMedianOf(longs);
+            for (int i = 0; i < longs.count; i++) {
+                long value = longs.values[i];
+                // From here, this array contains unsigned longs
+                longs.values[i] = unsignedDifference(value, median);
+            }
+            return NumericUtils.unsignedLongAsLongExact(unsignedLongMedianOf(longs));
+        } finally {
+            longs.count = 0;
+        }
+    }
+
+    /**
+     * Similar to the code in `finish`, for when the values are in ascending order. The major differences are:
+     * - As values are sorted, we don't need to sort them for the first median calculation.
+     * - We take the values directly from the block instead of from the helper object.
+     */
+    static long ascending(Longs longs, LongBlock values, int firstValue, int count) {
+        try {
+            if (longs.values.length < count) {
+                longs.values = ArrayUtil.grow(longs.values, count);
+            }
+            longs.count = count;
+            int middle = firstValue + count / 2;
+            long median = count % 2 == 1 ? values.getLong(middle) : avgWithoutOverflow(values.getLong(middle - 1), values.getLong(middle));
+            for (int i = 0; i < count; i++) {
+                long value = values.getLong(firstValue + i);
+                // From here, this array contains unsigned longs
+                longs.values[i] = unsignedDifference(value, median);
+            }
+            return NumericUtils.unsignedLongAsLongExact(unsignedLongMedianOf(longs));
+        } finally {
+            longs.count = 0;
+        }
+    }
+
+    static long single(long value) {
+        return 0L;
+    }
+
+    static long longMedianOf(Longs longs) {
+        // TODO quickselect
+        Arrays.sort(longs.values, 0, longs.count);
+        int middle = longs.count / 2;
+        return longs.count % 2 == 1 ? longs.values[middle] : avgWithoutOverflow(longs.values[middle - 1], longs.values[middle]);
+    }
+
+    static class Doubles {
+        public double[] values = new double[2];
+        public int count;
+    }
+
+    @MvEvaluator(extraName = "Double", finish = "finish", ascending = "ascending", single = "single")
+    static void process(Doubles doubles, double v) {
+        if (doubles.values.length < doubles.count + 1) {
+            doubles.values = ArrayUtil.grow(doubles.values, doubles.count + 1);
+        }
+        doubles.values[doubles.count++] = v;
+    }
+
+    static double finish(Doubles doubles) {
+        try {
+            double median = doubleMedianOf(doubles);
+            for (int i = 0; i < doubles.count; i++) {
+                double value = doubles.values[i];
+                // Double differences between median and the values may potentially result in +/-Infinity.
+                // As we use that value just to sort, the MAD should remain finite.
+                doubles.values[i] = value > median ? value - median : median - value;
+            }
+            return doubleMedianOf(doubles);
+        } finally {
+            doubles.count = 0;
+        }
+    }
+
+    /**
+     * Similar to the code in `finish`, for when the values are in ascending order. The major differences are:
+     * - As values are sorted, we don't need to sort them for the first median calculation.
+     * - We take the values directly from the block instead of from the helper object.
+     */
+    static double ascending(Doubles doubles, DoubleBlock values, int firstValue, int count) {
+        try {
+            if (doubles.values.length < count) {
+                doubles.values = ArrayUtil.grow(doubles.values, count);
+            }
+            doubles.count = count;
+            int middle = firstValue + count / 2;
+            double median = count % 2 == 1 ? values.getDouble(middle) : (values.getDouble(middle - 1) / 2 + values.getDouble(middle) / 2);
+            for (int i = 0; i < count; i++) {
+                double value = values.getDouble(firstValue + i);
+                // Double differences between median and the values may potentially result in +/-Infinity.
+                // As we use that value just to sort, the MAD should remain finite.
+                doubles.values[i] = value > median ? value - median : median - value;
+            }
+            return doubleMedianOf(doubles);
+        } finally {
+            doubles.count = 0;
+        }
+    }
+
+    static double single(double value) {
+        return 0.;
+    }
+
+    static double doubleMedianOf(Doubles doubles) {
+        // TODO quickselect
+        Arrays.sort(doubles.values, 0, doubles.count);
+        int middle = doubles.count / 2;
+        double median = doubles.count % 2 == 1 ? doubles.values[middle] : (doubles.values[middle - 1] / 2 + doubles.values[middle] / 2);
+        return NumericUtils.asFiniteNumber(median);
+    }
+
+    @MvEvaluator(
+        extraName = "UnsignedLong",
+        finish = "finishUnsignedLong",
+        ascending = "ascendingUnsignedLong",
+        single = "singleUnsignedLong"
+    )
+    static void processUnsignedLong(Longs longs, long v) {
+        process(longs, v);
+    }
+
+    static long finishUnsignedLong(Longs longs) {
+        try {
+            long median = unsignedLongMedianOf(longs);
+            for (int i = 0; i < longs.count; i++) {
+                long value = longs.values[i];
+                longs.values[i] = value > median ? unsignedLongSubtractExact(value, median) : unsignedLongSubtractExact(median, value);
+            }
+            return unsignedLongMedianOf(longs);
+        } finally {
+            longs.count = 0;
+        }
+    }
+
+    /**
+     * Similar to the code in `finish`, for when the values are in ascending order. The major differences are:
+     * - As values are sorted, we don't need to sort them for the first median calculation.
+     * - We take the values directly from the block instead of from the helper object.
+     */
+    static long ascendingUnsignedLong(Longs longs, LongBlock values, int firstValue, int count) {
+        try {
+            if (longs.values.length < count) {
+                longs.values = ArrayUtil.grow(longs.values, count);
+            }
+            longs.count = count;
+            int middle = firstValue + count / 2;
+            long median;
+            if (count % 2 == 1) {
+                median = values.getLong(middle);
+            } else {
+                median = unsignedLongAvgWithoutOverflow(values.getLong(middle - 1), values.getLong(middle));
+            }
+            for (int i = 0; i < count; i++) {
+                long value = values.getLong(firstValue + i);
+                longs.values[i] = value > median ? unsignedLongSubtractExact(value, median) : unsignedLongSubtractExact(median, value);
+            }
+            return unsignedLongMedianOf(longs);
+        } finally {
+            longs.count = 0;
+        }
+    }
+
+    static long singleUnsignedLong(long value) {
+        return NumericUtils.ZERO_AS_UNSIGNED_LONG;
+    }
+
+    static long unsignedLongMedianOf(Longs longs) {
+        // TODO quickselect
+        Arrays.sort(longs.values, 0, longs.count);
+        int middle = longs.count / 2;
+        if (longs.count % 2 == 1) {
+            return longs.values[middle];
+        }
+        return unsignedLongAvgWithoutOverflow(longs.values[middle - 1], longs.values[middle]);
+    }
+
+    // Utility methods
+
+    /**
+     * Average two {@code int}s together without overflow.
+     */
+    static int avgWithoutOverflow(int a, int b) {
+        var value = (a & b) + ((a ^ b) >> 1);
+        // This method rounds negative values down instead of towards zero, like (a + b) / 2 would.
+        // Here we rectify up if the average is negative and the two values have different parities.
+        return value < 0 && ((a & 1) ^ (b & 1)) == 1 ? value + 1 : value;
+    }
+
+    /**
+     * Average two {@code long}s without any overflow.
+     */
+    static long avgWithoutOverflow(long a, long b) {
+        var value = (a & b) + ((a ^ b) >> 1);
+        // This method rounds negative values down instead of towards zero, like (a + b) / 2 would.
+        // Here we rectify up if the average is negative and the two values have different parities.
+        return value < 0 && ((a & 1) ^ (b & 1)) == 1 ? value + 1 : value;
+    }
+
+    /**
+     * Average two {@code unsigned long}s without any overflow.
+     */
+    static long unsignedLongAvgWithoutOverflow(long a, long b) {
+        return (a >> 1) + (b >> 1) + (a & b & 1);
+    }
+
+    /**
+     * Returns the difference between two signed long values as an unsigned long.
+     */
+    static long unsignedDifference(long a, long b) {
+        if (a >= b) {
+            if (a < 0 || b >= 0) {
+                return NumericUtils.asLongUnsigned(a - b);
+            }
+
+            return NumericUtils.unsignedLongSubtractExact(a, b);
+        }
+
+        // Same operations, but inverted
+
+        if (b < 0 || a >= 0) {
+            return NumericUtils.asLongUnsigned(b - a);
+        }
+
+        return NumericUtils.unsignedLongSubtractExact(b, a);
+    }
+}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/package-info.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/package-info.java
index b4781c7e41f9..f8b05aea324d 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/package-info.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/package-info.java
@@ -120,15 +120,17 @@
  *         Rerun the {@code CsvTests}. They should find your function and maybe even pass. Add a
  *         few more tests in the csv-spec tests. They run quickly so it isn't a big deal having
  *         half a dozen of them per function. In fact, it's useful to add more complex combinations
- *         of things here, just to catch any accidental strange interactions. For example, it is
- *         probably a good idea to have your function passes as a parameter to another function
+ *         of things here, just to catch any accidental strange interactions. For example, have
+ *         your function take its input from an index like {@code FROM employees | EVAL foo=MY_FUNCTION(emp_no)}.
+ *         It's probably a good idea to have your function passed as a parameter to another function
  *         like {@code EVAL foo=MOST(0, MY_FUNCTION(emp_no))}. And likely useful to try the reverse
  *         like {@code EVAL foo=MY_FUNCTION(MOST(languages + 10000, emp_no)}.
  *     </li>
  *     <li>
  *         Now it's time to make a unit test! The infrastructure for these is under some flux at
- *         the moment, but it's good to extend from {@code AbstractScalarFunctionTestCase}. All of
+ *         the moment, but it's good to extend {@code AbstractScalarFunctionTestCase}. All of
  *         these tests are parameterized and expect to spend some time finding good parameters.
+ *         Also add serialization tests that extend {@code AbstractExpressionSerializationTests<>}.
  *     </li>
  *     <li>
  *         Once you are happy with the tests run the auto formatter:
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunction.java
index 84d776888c7a..72dd052fc763 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunction.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/spatial/BinarySpatialFunction.java
@@ -61,6 +61,7 @@ protected BinarySpatialFunction(
     }
 
     protected BinarySpatialFunction(StreamInput in, boolean leftDocValues, boolean rightDocValues, boolean pointsOnly) throws IOException {
+        // The doc-values fields are only used on data nodes local planning, and therefor never serialized
         this(
             Source.EMPTY,
             in.readNamedWriteable(Expression.class),
@@ -75,6 +76,8 @@ protected BinarySpatialFunction(StreamInput in, boolean leftDocValues, boolean r
     public void writeTo(StreamOutput out) throws IOException {
         out.writeNamedWriteable(left());
         out.writeNamedWriteable(right());
+        // The doc-values fields are only used on data nodes local planning, and therefor never serialized
+        // The CRS type is re-resolved from the combination of left and right fields, and also not necessary to serialize
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/Space.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/Space.java
new file mode 100644
index 000000000000..e6225a008fce
--- /dev/null
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/Space.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.string;
+
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.compute.ann.Evaluator;
+import org.elasticsearch.compute.ann.Fixed;
+import org.elasticsearch.compute.operator.BreakingBytesRefBuilder;
+import org.elasticsearch.compute.operator.EvalOperator.ExpressionEvaluator;
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.expression.Literal;
+import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.expression.function.Example;
+import org.elasticsearch.xpack.esql.expression.function.FunctionInfo;
+import org.elasticsearch.xpack.esql.expression.function.Param;
+import org.elasticsearch.xpack.esql.expression.function.scalar.UnaryScalarFunction;
+import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+import static org.elasticsearch.common.unit.ByteSizeUnit.MB;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.DEFAULT;
+import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isType;
+import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
+
+public class Space extends UnaryScalarFunction {
+    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(Expression.class, "Space", Space::new);
+
+    private static final long MAX_LENGTH = MB.toBytes(1);
+
+    @FunctionInfo(
+        returnType = "keyword",
+        description = "Returns a string made of `number` spaces.",
+        examples = @Example(file = "string", tag = "space")
+    )
+    public Space(
+        Source source,
+        @Param(name = "number", type = { "integer" }, description = "Number of spaces in result.") Expression number
+    ) {
+        super(source, number);
+    }
+
+    private Space(StreamInput in) throws IOException {
+        this(Source.readFrom((PlanStreamInput) in), in.readNamedWriteable(Expression.class));
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        source().writeTo(out);
+        out.writeNamedWriteable(field);
+    }
+
+    @Override
+    public String getWriteableName() {
+        return ENTRY.name;
+    }
+
+    @Override
+    public DataType dataType() {
+        return KEYWORD;
+    }
+
+    @Override
+    protected TypeResolution resolveType() {
+        if (childrenResolved() == false) {
+            return new TypeResolution("Unresolved children");
+        }
+
+        return isType(field, dt -> dt == DataType.INTEGER, sourceText(), DEFAULT, "integer");
+    }
+
+    @Evaluator(warnExceptions = { IllegalArgumentException.class })
+    static BytesRef process(@Fixed(includeInToString = false, build = true) BreakingBytesRefBuilder scratch, int number) {
+        checkNumber(number);
+        scratch.grow(number);
+        scratch.setLength(number);
+        Arrays.fill(scratch.bytes(), 0, number, (byte) ' ');
+        return scratch.bytesRefView();
+    }
+
+    static void checkNumber(int number) {
+        if (number < 0) {
+            throw new IllegalArgumentException("Number parameter cannot be negative, found [" + number + "]");
+        }
+        if (number > MAX_LENGTH) {
+            throw new IllegalArgumentException("Creating strings longer than [" + MAX_LENGTH + "] bytes is not supported");
+        }
+    }
+
+    @Override
+    public Expression replaceChildren(List<Expression> newChildren) {
+        return new Space(source(), newChildren.get(0));
+    }
+
+    @Override
+    protected NodeInfo<? extends Expression> info() {
+        return NodeInfo.create(this, Space::new, field);
+    }
+
+    @Override
+    public ExpressionEvaluator.Factory toEvaluator(Function<Expression, ExpressionEvaluator.Factory> toEvaluator) {
+        if (field.foldable()) {
+            Object folded = field.fold();
+            if (folded instanceof Integer num) {
+                checkNumber(num);
+                return toEvaluator.apply(new Literal(source(), " ".repeat(num), KEYWORD));
+            }
+        }
+
+        ExpressionEvaluator.Factory numberExpr = toEvaluator.apply(field);
+        return new SpaceEvaluator.Factory(source(), context -> new BreakingBytesRefBuilder(context.breaker(), "space"), numberExpr);
+    }
+
+}
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanNamedTypes.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanNamedTypes.java
index 51d7f56f6bab..8b3e667452a0 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanNamedTypes.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/PlanNamedTypes.java
@@ -9,19 +9,12 @@
 
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.NamedWriteable;
-import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.util.iterable.Iterables;
-import org.elasticsearch.index.IndexMode;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.transport.RemoteClusterAware;
 import org.elasticsearch.xpack.esql.core.expression.Alias;
 import org.elasticsearch.xpack.esql.core.expression.Attribute;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.NamedExpression;
 import org.elasticsearch.xpack.esql.core.tree.Source;
-import org.elasticsearch.xpack.esql.index.EsIndex;
-import org.elasticsearch.xpack.esql.plan.logical.Enrich;
 import org.elasticsearch.xpack.esql.plan.logical.Grok;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.esql.plan.physical.AggregateExec;
@@ -50,8 +43,6 @@
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import static org.elasticsearch.xpack.esql.io.stream.PlanNameRegistry.Entry.of;
 
@@ -92,11 +83,11 @@ public static List<PlanNameRegistry.Entry> namedTypeEntries() {
             of(PhysicalPlan.class, EsQueryExec.ENTRY),
             of(PhysicalPlan.class, EsSourceExec.ENTRY),
             of(PhysicalPlan.class, EvalExec.ENTRY),
-            of(PhysicalPlan.class, EnrichExec.class, PlanNamedTypes::writeEnrichExec, PlanNamedTypes::readEnrichExec),
+            of(PhysicalPlan.class, EnrichExec.ENTRY),
             of(PhysicalPlan.class, ExchangeExec.ENTRY),
             of(PhysicalPlan.class, ExchangeSinkExec.ENTRY),
             of(PhysicalPlan.class, ExchangeSourceExec.ENTRY),
-            of(PhysicalPlan.class, FieldExtractExec.class, PlanNamedTypes::writeFieldExtractExec, PlanNamedTypes::readFieldExtractExec),
+            of(PhysicalPlan.class, FieldExtractExec.ENTRY),
             of(PhysicalPlan.class, FilterExec.class, PlanNamedTypes::writeFilterExec, PlanNamedTypes::readFilterExec),
             of(PhysicalPlan.class, FragmentExec.class, PlanNamedTypes::writeFragmentExec, PlanNamedTypes::readFragmentExec),
             of(PhysicalPlan.class, GrokExec.class, PlanNamedTypes::writeGrokExec, PlanNamedTypes::readGrokExec),
@@ -114,72 +105,6 @@ public static List<PlanNameRegistry.Entry> namedTypeEntries() {
     }
 
     // -- physical plan nodes
-    static EnrichExec readEnrichExec(PlanStreamInput in) throws IOException {
-        final Source source = Source.readFrom(in);
-        final PhysicalPlan child = in.readPhysicalPlanNode();
-        final NamedExpression matchField = in.readNamedWriteable(NamedExpression.class);
-        final String policyName = in.readString();
-        final String matchType = (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) ? in.readString() : "match";
-        final String policyMatchField = in.readString();
-        final Map<String, String> concreteIndices;
-        final Enrich.Mode mode;
-        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
-            mode = in.readEnum(Enrich.Mode.class);
-            concreteIndices = in.readMap(StreamInput::readString, StreamInput::readString);
-        } else {
-            mode = Enrich.Mode.ANY;
-            EsIndex esIndex = new EsIndex(in);
-            if (esIndex.concreteIndices().size() != 1) {
-                throw new IllegalStateException("expected a single concrete enrich index; got " + esIndex.concreteIndices());
-            }
-            concreteIndices = Map.of(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY, Iterables.get(esIndex.concreteIndices(), 0));
-        }
-        return new EnrichExec(
-            source,
-            child,
-            mode,
-            matchType,
-            matchField,
-            policyName,
-            policyMatchField,
-            concreteIndices,
-            in.readNamedWriteableCollectionAsList(NamedExpression.class)
-        );
-    }
-
-    static void writeEnrichExec(PlanStreamOutput out, EnrichExec enrich) throws IOException {
-        Source.EMPTY.writeTo(out);
-        out.writePhysicalPlanNode(enrich.child());
-        out.writeNamedWriteable(enrich.matchField());
-        out.writeString(enrich.policyName());
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {
-            out.writeString(enrich.matchType());
-        }
-        out.writeString(enrich.policyMatchField());
-        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
-            out.writeEnum(enrich.mode());
-            out.writeMap(enrich.concreteIndices(), StreamOutput::writeString, StreamOutput::writeString);
-        } else {
-            if (enrich.concreteIndices().keySet().equals(Set.of(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY))) {
-                String concreteIndex = enrich.concreteIndices().get(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY);
-                new EsIndex(concreteIndex, Map.of(), Map.of(concreteIndex, IndexMode.STANDARD)).writeTo(out);
-            } else {
-                throw new IllegalStateException("expected a single concrete enrich index; got " + enrich.concreteIndices());
-            }
-        }
-        out.writeNamedWriteableCollection(enrich.enrichFields());
-    }
-
-    static FieldExtractExec readFieldExtractExec(PlanStreamInput in) throws IOException {
-        return new FieldExtractExec(Source.readFrom(in), in.readPhysicalPlanNode(), in.readNamedWriteableCollectionAsList(Attribute.class));
-    }
-
-    static void writeFieldExtractExec(PlanStreamOutput out, FieldExtractExec fieldExtractExec) throws IOException {
-        Source.EMPTY.writeTo(out);
-        out.writePhysicalPlanNode(fieldExtractExec.child());
-        out.writeNamedWriteableCollection(fieldExtractExec.attributesToExtract());
-    }
-
     static FilterExec readFilterExec(PlanStreamInput in) throws IOException {
         return new FilterExec(Source.readFrom(in), in.readPhysicalPlanNode(), in.readNamedWriteable(Expression.class));
     }
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/SpatialDocValuesExtraction.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/SpatialDocValuesExtraction.java
index 0bad99375d31..42dbc5f1a6fd 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/SpatialDocValuesExtraction.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/SpatialDocValuesExtraction.java
@@ -101,8 +101,8 @@ && allowedForDocValues(fieldAttribute, agg, foundAttributes)) {
                         docValuesAttributes.add(found);
                     }
                 }
-                if (docValuesAttributes.size() > 0) {
-                    exec = new FieldExtractExec(exec.source(), exec.child(), attributesToExtract, docValuesAttributes);
+                if (docValuesAttributes.isEmpty() == false) {
+                    exec = fieldExtractExec.withDocValuesAttributes(docValuesAttributes);
                 }
             }
             return exec;
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ExpressionBuilder.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ExpressionBuilder.java
index 2621c7680559..cae0f3e084d5 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ExpressionBuilder.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/ExpressionBuilder.java
@@ -83,7 +83,7 @@
 import static org.elasticsearch.xpack.esql.parser.ParserUtils.typedParsing;
 import static org.elasticsearch.xpack.esql.parser.ParserUtils.visitList;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.bigIntegerToUnsignedLong;
-import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.parseTemporalAmout;
+import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.parseTemporalAmount;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.stringToIntegral;
 
 public abstract class ExpressionBuilder extends IdentifierBuilder {
@@ -458,7 +458,7 @@ public Object visitQualifiedIntegerLiteral(EsqlBaseParser.QualifiedIntegerLitera
         String qualifier = ctx.UNQUOTED_IDENTIFIER().getText().toLowerCase(Locale.ROOT);
 
         try {
-            TemporalAmount quantity = parseTemporalAmout(value, qualifier, source);
+            TemporalAmount quantity = parseTemporalAmount(value, qualifier, source);
             return new Literal(source, quantity, quantity instanceof Duration ? TIME_DURATION : DATE_PERIOD);
         } catch (InvalidArgumentException | ArithmeticException e) {
             // the range varies by unit: Duration#ofMinutes(), #ofHours() will Math#multiplyExact() to reduce the unit to seconds;
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExec.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExec.java
index fc710d92b4f0..40ff7318b889 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExec.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExec.java
@@ -6,20 +6,37 @@
  */
 package org.elasticsearch.xpack.esql.plan.physical;
 
+import org.elasticsearch.TransportVersions;
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.util.iterable.Iterables;
+import org.elasticsearch.index.IndexMode;
+import org.elasticsearch.transport.RemoteClusterAware;
 import org.elasticsearch.xpack.esql.core.expression.Attribute;
 import org.elasticsearch.xpack.esql.core.expression.AttributeSet;
 import org.elasticsearch.xpack.esql.core.expression.NamedExpression;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.index.EsIndex;
+import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
+import org.elasticsearch.xpack.esql.io.stream.PlanStreamOutput;
 import org.elasticsearch.xpack.esql.plan.logical.Enrich;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import static org.elasticsearch.xpack.esql.expression.NamedExpressions.mergeOutputAttributes;
 
 public class EnrichExec extends UnaryExec implements EstimatesRowSize {
+    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
+        PhysicalPlan.class,
+        "EnrichExec",
+        EnrichExec::readFrom
+    );
 
     private final Enrich.Mode mode;
     private final String matchType;
@@ -30,9 +47,6 @@ public class EnrichExec extends UnaryExec implements EstimatesRowSize {
     private final List<NamedExpression> enrichFields;
 
     /**
-     *
-     * @param source
-     * @param child
      * @param matchField the match field in the source data
      * @param policyName the enrich policy name
      * @param policyMatchField the match field name in the policy
@@ -60,6 +74,68 @@ public EnrichExec(
         this.enrichFields = enrichFields;
     }
 
+    private static EnrichExec readFrom(StreamInput in) throws IOException {
+        final Source source = Source.readFrom((PlanStreamInput) in);
+        final PhysicalPlan child = ((PlanStreamInput) in).readPhysicalPlanNode();
+        final NamedExpression matchField = in.readNamedWriteable(NamedExpression.class);
+        final String policyName = in.readString();
+        final String matchType = (in.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) ? in.readString() : "match";
+        final String policyMatchField = in.readString();
+        final Map<String, String> concreteIndices;
+        final Enrich.Mode mode;
+        if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
+            mode = in.readEnum(Enrich.Mode.class);
+            concreteIndices = in.readMap(StreamInput::readString, StreamInput::readString);
+        } else {
+            mode = Enrich.Mode.ANY;
+            EsIndex esIndex = new EsIndex(in);
+            if (esIndex.concreteIndices().size() != 1) {
+                throw new IllegalStateException("expected a single concrete enrich index; got " + esIndex.concreteIndices());
+            }
+            concreteIndices = Map.of(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY, Iterables.get(esIndex.concreteIndices(), 0));
+        }
+        return new EnrichExec(
+            source,
+            child,
+            mode,
+            matchType,
+            matchField,
+            policyName,
+            policyMatchField,
+            concreteIndices,
+            in.readNamedWriteableCollectionAsList(NamedExpression.class)
+        );
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        Source.EMPTY.writeTo(out);
+        ((PlanStreamOutput) out).writePhysicalPlanNode(child());
+        out.writeNamedWriteable(matchField());
+        out.writeString(policyName());
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_14_0)) {
+            out.writeString(matchType());
+        }
+        out.writeString(policyMatchField());
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_13_0)) {
+            out.writeEnum(mode());
+            out.writeMap(concreteIndices(), StreamOutput::writeString, StreamOutput::writeString);
+        } else {
+            if (concreteIndices().keySet().equals(Set.of(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY))) {
+                String concreteIndex = concreteIndices().get(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY);
+                new EsIndex(concreteIndex, Map.of(), Map.of(concreteIndex, IndexMode.STANDARD)).writeTo(out);
+            } else {
+                throw new IllegalStateException("expected a single concrete enrich index; got " + concreteIndices());
+            }
+        }
+        out.writeNamedWriteableCollection(enrichFields());
+    }
+
+    @Override
+    public String getWriteableName() {
+        return ENTRY.name;
+    }
+
     @Override
     protected AttributeSet computeReferences() {
         return matchField.references();
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/FieldExtractExec.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/FieldExtractExec.java
index d2df97734f19..7b51450d9f5e 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/FieldExtractExec.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/FieldExtractExec.java
@@ -7,39 +7,78 @@
 
 package org.elasticsearch.xpack.esql.plan.physical;
 
+import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.xpack.esql.core.expression.Attribute;
 import org.elasticsearch.xpack.esql.core.expression.AttributeSet;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.NodeUtils;
 import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.io.stream.PlanStreamInput;
+import org.elasticsearch.xpack.esql.io.stream.PlanStreamOutput;
 
+import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
-import static java.util.Collections.emptySet;
-
 public class FieldExtractExec extends UnaryExec implements EstimatesRowSize {
+    public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(
+        PhysicalPlan.class,
+        "FieldExtractExec",
+        FieldExtractExec::new
+    );
+
     private final List<Attribute> attributesToExtract;
     private final Attribute sourceAttribute;
-    // attributes to extract as doc values
+    /**
+     * Attributes that many be extracted as doc values even if that makes them
+     * less accurate. This is mostly used for geo fields which lose a lot of
+     * precision in their doc values, but in some cases doc values provides
+     * <strong>enough</strong> precision to do the job.
+     * <p>
+     *     This is never serialized between nodes and only used locally.
+     * </p>
+     */
     private final Set<Attribute> docValuesAttributes;
 
     private List<Attribute> lazyOutput;
 
     public FieldExtractExec(Source source, PhysicalPlan child, List<Attribute> attributesToExtract) {
-        this(source, child, attributesToExtract, emptySet());
+        this(source, child, attributesToExtract, Set.of());
     }
 
-    public FieldExtractExec(Source source, PhysicalPlan child, List<Attribute> attributesToExtract, Set<Attribute> docValuesAttributes) {
+    private FieldExtractExec(Source source, PhysicalPlan child, List<Attribute> attributesToExtract, Set<Attribute> docValuesAttributes) {
         super(source, child);
         this.attributesToExtract = attributesToExtract;
         this.sourceAttribute = extractSourceAttributesFrom(child);
         this.docValuesAttributes = docValuesAttributes;
     }
 
+    private FieldExtractExec(StreamInput in) throws IOException {
+        this(
+            Source.readFrom((PlanStreamInput) in),
+            ((PlanStreamInput) in).readPhysicalPlanNode(),
+            in.readNamedWriteableCollectionAsList(Attribute.class)
+        );
+        // docValueAttributes are only used on the data node and never serialized.
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        Source.EMPTY.writeTo(out);
+        ((PlanStreamOutput) out).writePhysicalPlanNode(child());
+        out.writeNamedWriteableCollection(attributesToExtract());
+        // docValueAttributes are only used on the data node and never serialized.
+    }
+
+    @Override
+    public String getWriteableName() {
+        return ENTRY.name;
+    }
+
     public static Attribute extractSourceAttributesFrom(PhysicalPlan plan) {
         for (Attribute attribute : plan.outputSet()) {
             if (EsQueryExec.isSourceAttribute(attribute)) {
@@ -61,7 +100,7 @@ protected AttributeSet computeReferences() {
 
     @Override
     protected NodeInfo<FieldExtractExec> info() {
-        return NodeInfo.create(this, FieldExtractExec::new, child(), attributesToExtract, docValuesAttributes);
+        return NodeInfo.create(this, FieldExtractExec::new, child(), attributesToExtract);
     }
 
     @Override
@@ -69,6 +108,10 @@ public UnaryExec replaceChild(PhysicalPlan newChild) {
         return new FieldExtractExec(source(), newChild, attributesToExtract, docValuesAttributes);
     }
 
+    public FieldExtractExec withDocValuesAttributes(Set<Attribute> docValuesAttributes) {
+        return new FieldExtractExec(source(), child(), attributesToExtract, docValuesAttributes);
+    }
+
     public List<Attribute> attributesToExtract() {
         return attributesToExtract;
     }
@@ -77,7 +120,7 @@ public Attribute sourceAttribute() {
         return sourceAttribute;
     }
 
-    public Collection<Attribute> docValuesAttributes() {
+    public Set<Attribute> docValuesAttributes() {
         return docValuesAttributes;
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/PhysicalPlan.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/PhysicalPlan.java
index 6fcdf573564f..c47b9dd363f3 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/PhysicalPlan.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/PhysicalPlan.java
@@ -26,12 +26,14 @@ public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
         return List.of(
             AggregateExec.ENTRY,
             DissectExec.ENTRY,
+            EnrichExec.ENTRY,
             EsQueryExec.ENTRY,
             EsSourceExec.ENTRY,
             EvalExec.ENTRY,
             ExchangeExec.ENTRY,
             ExchangeSinkExec.ENTRY,
-            ExchangeSourceExec.ENTRY
+            ExchangeSourceExec.ENTRY,
+            FieldExtractExec.ENTRY
         );
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java
index b090708a64ad..0c530bd0eb27 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java
@@ -10,12 +10,14 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.logging.LoggerMessageFormat;
 import org.elasticsearch.common.lucene.BytesRefs;
 import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.xpack.esql.core.InvalidArgumentException;
 import org.elasticsearch.xpack.esql.core.QlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.expression.Expressions;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.Converter;
 import org.elasticsearch.xpack.esql.core.type.DataType;
@@ -26,6 +28,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToBoolean;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToCartesianPoint;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToCartesianShape;
+import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDatePeriod;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDatetime;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDouble;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToGeoPoint;
@@ -34,6 +37,7 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToInteger;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToLong;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToString;
+import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToTimeDuration;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToUnsignedLong;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToVersion;
 import org.elasticsearch.xpack.esql.parser.ParsingException;
@@ -48,6 +52,7 @@
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.BiFunction;
@@ -110,9 +115,83 @@ public class EsqlDataTypeConverter {
         entry(KEYWORD, ToString::new),
         entry(TEXT, ToString::new),
         entry(UNSIGNED_LONG, ToUnsignedLong::new),
-        entry(VERSION, ToVersion::new)
+        entry(VERSION, ToVersion::new),
+        entry(DATE_PERIOD, ToDatePeriod::new),
+        entry(TIME_DURATION, ToTimeDuration::new)
     );
 
+    public enum INTERVALS {
+        // TIME_DURATION,
+        MILLISECOND,
+        MILLISECONDS,
+        MS,
+        SECOND,
+        SECONDS,
+        SEC,
+        S,
+        MINUTE,
+        MINUTES,
+        MIN,
+        HOUR,
+        HOURS,
+        H,
+        // DATE_PERIOD
+        DAY,
+        DAYS,
+        D,
+        WEEK,
+        WEEKS,
+        W,
+        MONTH,
+        MONTHS,
+        MO,
+        QUARTER,
+        QUARTERS,
+        Q,
+        YEAR,
+        YEARS,
+        YR,
+        Y;
+    }
+
+    public static List<INTERVALS> TIME_DURATIONS = List.of(
+        INTERVALS.MILLISECOND,
+        INTERVALS.MILLISECONDS,
+        INTERVALS.MS,
+        INTERVALS.SECOND,
+        INTERVALS.SECONDS,
+        INTERVALS.SEC,
+        INTERVALS.S,
+        INTERVALS.MINUTE,
+        INTERVALS.MINUTES,
+        INTERVALS.MIN,
+        INTERVALS.HOUR,
+        INTERVALS.HOURS,
+        INTERVALS.H
+    );
+
+    public static List<INTERVALS> DATE_PERIODS = List.of(
+        INTERVALS.DAY,
+        INTERVALS.DAYS,
+        INTERVALS.D,
+        INTERVALS.WEEK,
+        INTERVALS.WEEKS,
+        INTERVALS.W,
+        INTERVALS.MONTH,
+        INTERVALS.MONTHS,
+        INTERVALS.MO,
+        INTERVALS.QUARTER,
+        INTERVALS.QUARTERS,
+        INTERVALS.Q,
+        INTERVALS.YEAR,
+        INTERVALS.YEARS,
+        INTERVALS.YR,
+        INTERVALS.Y
+    );
+
+    public static final String INVALID_INTERVAL_ERROR =
+        "Invalid interval value in [{}], expected integer followed by one of {} but got [{}]";
+
     public static Converter converterFor(DataType from, DataType to) {
         // TODO move EXPRESSION_TO_LONG here if there is no regression
         if (isString(from)) {
@@ -154,6 +233,38 @@ public static Converter converterFor(DataType from, DataType to) {
         return null;
     }
 
+    public static TemporalAmount foldToTemporalAmount(Expression field, String sourceText, DataType expectedType) {
+        if (field.foldable()) {
+            Object v = field.fold();
+            if (v instanceof BytesRef b) {
+                try {
+                    return EsqlDataTypeConverter.parseTemporalAmount(b.utf8ToString(), expectedType);
+                } catch (ParsingException e) {
+                    throw new IllegalArgumentException(
+                        LoggerMessageFormat.format(
+                            null,
+                            INVALID_INTERVAL_ERROR,
+                            sourceText,
+                            expectedType == DATE_PERIOD ? DATE_PERIODS : TIME_DURATIONS,
+                            b.utf8ToString()
+                        )
+                    );
+                }
+            } else if (v instanceof TemporalAmount t) {
+                return t;
+            }
+        }
+
+        throw new IllegalArgumentException(
+            LoggerMessageFormat.format(
+                null,
+                "argument of [{}] must be a constant, received [{}]",
+                field.sourceText(),
+                Expressions.name(field)
+            )
+        );
+    }
+
     public static TemporalAmount parseTemporalAmount(Object val, DataType expectedType) {
         String errorMessage = "Cannot parse [{}] to {}";
         String str = String.valueOf(val);
@@ -181,7 +292,7 @@ public static TemporalAmount parseTemporalAmount(Object val, DataType expectedTy
 
         if ((value.isEmpty() || qualifier.isEmpty()) == false) {
             try {
-                TemporalAmount result = parseTemporalAmout(Integer.parseInt(value.toString()), qualifier.toString(), Source.EMPTY);
+                TemporalAmount result = parseTemporalAmount(Integer.parseInt(value.toString()), qualifier.toString(), Source.EMPTY);
                 if (DataType.DATE_PERIOD == expectedType && result instanceof Period
                     || DataType.TIME_DURATION == expectedType && result instanceof Duration) {
                     return result;
@@ -196,7 +307,6 @@ public static TemporalAmount parseTemporalAmount(Object val, DataType expectedTy
                 // wrong pattern
             }
         }
-
         throw new ParsingException(Source.EMPTY, errorMessage, val, expectedType);
     }
 
@@ -284,22 +394,24 @@ public static DataType commonType(DataType left, DataType right) {
     }
 
     // generally supporting abbreviations from https://en.wikipedia.org/wiki/Unit_of_time
-    public static TemporalAmount parseTemporalAmout(Number value, String qualifier, Source source) throws InvalidArgumentException,
+    public static TemporalAmount parseTemporalAmount(Number value, String qualifier, Source source) throws InvalidArgumentException,
         ArithmeticException, ParsingException {
-        return switch (qualifier) {
-            case "millisecond", "milliseconds", "ms" -> Duration.ofMillis(safeToLong(value));
-            case "second", "seconds", "sec", "s" -> Duration.ofSeconds(safeToLong(value));
-            case "minute", "minutes", "min" -> Duration.ofMinutes(safeToLong(value));
-            case "hour", "hours", "h" -> Duration.ofHours(safeToLong(value));
-
-            case "day", "days", "d" -> Period.ofDays(safeToInt(safeToLong(value)));
-            case "week", "weeks", "w" -> Period.ofWeeks(safeToInt(safeToLong(value)));
-            case "month", "months", "mo" -> Period.ofMonths(safeToInt(safeToLong(value)));
-            case "quarter", "quarters", "q" -> Period.ofMonths(safeToInt(Math.multiplyExact(3L, safeToLong(value))));
-            case "year", "years", "yr", "y" -> Period.ofYears(safeToInt(safeToLong(value)));
-
-            default -> throw new ParsingException(source, "Unexpected time interval qualifier: '{}'", qualifier);
-        };
+        try {
+            return switch (INTERVALS.valueOf(qualifier.toUpperCase(Locale.ROOT))) {
+                case MILLISECOND, MILLISECONDS, MS -> Duration.ofMillis(safeToLong(value));
+                case SECOND, SECONDS, SEC, S -> Duration.ofSeconds(safeToLong(value));
+                case MINUTE, MINUTES, MIN -> Duration.ofMinutes(safeToLong(value));
+                case HOUR, HOURS, H -> Duration.ofHours(safeToLong(value));
+
+                case DAY, DAYS, D -> Period.ofDays(safeToInt(safeToLong(value)));
+                case WEEK, WEEKS, W -> Period.ofWeeks(safeToInt(safeToLong(value)));
+                case MONTH, MONTHS, MO -> Period.ofMonths(safeToInt(safeToLong(value)));
+                case QUARTER, QUARTERS, Q -> Period.ofMonths(safeToInt(Math.multiplyExact(3L, safeToLong(value))));
+                case YEAR, YEARS, YR, Y -> Period.ofYears(safeToInt(safeToLong(value)));
+            };
+        } catch (IllegalArgumentException e) {
+            throw new ParsingException(source, "Unexpected time interval qualifier: '{}'", qualifier);
+        }
     }
 
     /**
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
index a7d8c98a606b..faf9d04532f1 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
@@ -54,6 +54,8 @@
 import org.elasticsearch.xpack.esql.analysis.EnrichResolution;
 import org.elasticsearch.xpack.esql.analysis.PreAnalyzer;
 import org.elasticsearch.xpack.esql.core.expression.Attribute;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.core.type.EsField;
 import org.elasticsearch.xpack.esql.enrich.EnrichLookupService;
 import org.elasticsearch.xpack.esql.enrich.ResolvedEnrichPolicy;
 import org.elasticsearch.xpack.esql.expression.function.EsqlFunctionRegistry;
@@ -308,8 +310,18 @@ protected void assertResults(ExpectedResults expected, ActualResults actual, boo
         // CsvTestUtils.logData(actual.values(), LOGGER);
     }
 
-    private static IndexResolution loadIndexResolution(String mappingName, String indexName) {
+    private static IndexResolution loadIndexResolution(String mappingName, String indexName, Map<String, String> typeMapping) {
         var mapping = new TreeMap<>(loadMapping(mappingName));
+        if ((typeMapping == null || typeMapping.isEmpty()) == false) {
+            for (var entry : typeMapping.entrySet()) {
+                if (mapping.containsKey(entry.getKey())) {
+                    DataType dataType = DataType.fromTypeName(entry.getValue());
+                    EsField field = mapping.get(entry.getKey());
+                    EsField editedField = new EsField(field.getName(), dataType, field.getProperties(), field.isAggregatable());
+                    mapping.put(entry.getKey(), editedField);
+                }
+            }
+        }
         return IndexResolution.valid(new EsIndex(indexName, mapping, Map.of(indexName, IndexMode.STANDARD)));
     }
 
@@ -320,7 +332,7 @@ private static EnrichResolution loadEnrichPolicies() {
             CsvTestsDataLoader.TestsDataset sourceIndex = CSV_DATASET_MAP.get(policy.getIndices().get(0));
             // this could practically work, but it's wrong:
             // EnrichPolicyResolution should contain the policy (system) index, not the source index
-            EsIndex esIndex = loadIndexResolution(sourceIndex.mappingFileName(), sourceIndex.indexName()).get();
+            EsIndex esIndex = loadIndexResolution(sourceIndex.mappingFileName(), sourceIndex.indexName(), null).get();
             var concreteIndices = Map.of(RemoteClusterService.LOCAL_CLUSTER_GROUP_KEY, Iterables.get(esIndex.concreteIndices(), 0));
             enrichResolution.addResolvedPolicy(
                 policyConfig.policyName(),
@@ -349,7 +361,7 @@ private static EnrichPolicy loadEnrichPolicyMapping(String policyFileName) {
     }
 
     private LogicalPlan analyzedPlan(LogicalPlan parsed, CsvTestsDataLoader.TestsDataset dataset) {
-        var indexResolution = loadIndexResolution(dataset.mappingFileName(), dataset.indexName());
+        var indexResolution = loadIndexResolution(dataset.mappingFileName(), dataset.indexName(), dataset.typeMapping());
         var enrichPolicies = loadEnrichPolicies();
         var analyzer = new Analyzer(new AnalyzerContext(configuration, functionRegistry, indexResolution, enrichPolicies), TEST_VERIFIER);
         LogicalPlan plan = analyzer.analyze(parsed);
@@ -392,7 +404,7 @@ private static CsvTestsDataLoader.TestsDataset testsDataset(LogicalPlan parsed)
     }
 
     private static TestPhysicalOperationProviders testOperationProviders(CsvTestsDataLoader.TestsDataset dataset) throws Exception {
-        var testData = loadPageFromCsv(CsvTests.class.getResource("/" + dataset.dataFileName()));
+        var testData = loadPageFromCsv(CsvTests.class.getResource("/" + dataset.dataFileName()), dataset.typeMapping());
         return new TestPhysicalOperationProviders(testData.v1(), testData.v2());
     }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java
index b50b801785a9..4cf6ae2c3986 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java
@@ -44,6 +44,9 @@ public class VerifierTests extends ESTestCase {
     private final Analyzer defaultAnalyzer = AnalyzerTestUtils.expandedDefaultAnalyzer();
     private final Analyzer tsdb = AnalyzerTestUtils.analyzer(AnalyzerTestUtils.tsdbIndexResolution());
 
+    private final List<String> TIME_DURATIONS = List.of("millisecond", "second", "minute", "hour");
+    private final List<String> DATE_PERIODS = List.of("day", "week", "month", "year");
+
     public void testIncompatibleTypesInMathOperation() {
         assertEquals(
             "1:40: second argument of [a + c] must be [datetime or numeric], found value [c] type [keyword]",
@@ -677,42 +680,171 @@ public void testWrongInputParam() {
     }
 
     public void testPeriodAndDurationInRowAssignment() {
-        for (var unit : List.of("millisecond", "second", "minute", "hour", "day", "week", "month", "year")) {
+        for (var unit : TIME_DURATIONS) {
             assertEquals("1:5: cannot use [1 " + unit + "] directly in a row assignment", error("row a = 1 " + unit));
+            assertEquals(
+                "1:5: cannot use [1 " + unit + "::time_duration] directly in a row assignment",
+                error("row a = 1 " + unit + "::time_duration")
+            );
+            assertEquals(
+                "1:5: cannot use [\"1 " + unit + "\"::time_duration] directly in a row assignment",
+                error("row a = \"1 " + unit + "\"::time_duration")
+            );
+            assertEquals(
+                "1:5: cannot use [to_timeduration(1 " + unit + ")] directly in a row assignment",
+                error("row a = to_timeduration(1 " + unit + ")")
+            );
+            assertEquals(
+                "1:5: cannot use [to_timeduration(\"1 " + unit + "\")] directly in a row assignment",
+                error("row a = to_timeduration(\"1 " + unit + "\")")
+            );
+        }
+        for (var unit : DATE_PERIODS) {
+            assertEquals("1:5: cannot use [1 " + unit + "] directly in a row assignment", error("row a = 1 " + unit));
+            assertEquals(
+                "1:5: cannot use [1 " + unit + "::date_period] directly in a row assignment",
+                error("row a = 1 " + unit + "::date_period")
+            );
+            assertEquals(
+                "1:5: cannot use [\"1 " + unit + "\"::date_period] directly in a row assignment",
+                error("row a = \"1 " + unit + "\"::date_period")
+            );
+            assertEquals(
+                "1:5: cannot use [to_dateperiod(1 " + unit + ")] directly in a row assignment",
+                error("row a = to_dateperiod(1 " + unit + ")")
+            );
+            assertEquals(
+                "1:5: cannot use [to_dateperiod(\"1 " + unit + "\")] directly in a row assignment",
+                error("row a = to_dateperiod(\"1 " + unit + "\")")
+            );
         }
     }
 
     public void testSubtractDateTimeFromTemporal() {
-        for (var unit : List.of("millisecond", "second", "minute", "hour")) {
+        for (var unit : TIME_DURATIONS) {
             assertEquals(
-                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] from a [TIME_DURATION] amount [1 "
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [TIME_DURATION] amount [1 "
                     + unit
                     + "]",
                 error("row 1 " + unit + " - now() ")
             );
+            assertEquals(
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [TIME_DURATION] amount [1 "
+                    + unit
+                    + "::time_duration]",
+                error("row 1 " + unit + "::time_duration" + " - now() ")
+            );
+            assertEquals(
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [TIME_DURATION] amount [\"1 "
+                    + unit
+                    + "\"::time_duration]",
+                error("row \"1 " + unit + "\"::time_duration" + " - now() ")
+            );
+            assertEquals(
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [TIME_DURATION] amount [to_timeduration(1 "
+                    + unit
+                    + ")]",
+                error("row to_timeduration(1 " + unit + ") - now() ")
+            );
+            assertEquals(
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [TIME_DURATION] amount [to_timeduration(\"1 "
+                    + unit
+                    + "\")]",
+                error("row to_timeduration(\"1 " + unit + "\") - now() ")
+            );
         }
-        for (var unit : List.of("day", "week", "month", "year")) {
+        for (var unit : DATE_PERIODS) {
             assertEquals(
-                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] from a [DATE_PERIOD] amount [1 "
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [DATE_PERIOD] amount [1 "
                     + unit
                     + "]",
                 error("row 1 " + unit + " - now() ")
             );
+            assertEquals(
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [DATE_PERIOD] amount [1 "
+                    + unit
+                    + "::date_period]",
+                error("row 1 " + unit + "::date_period" + " - now() ")
+            );
+            assertEquals(
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [DATE_PERIOD] amount [\"1 "
+                    + unit
+                    + "\"::date_period]",
+                error("row \"1 " + unit + "\"::date_period" + " - now() ")
+            );
+            assertEquals(
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [DATE_PERIOD] amount [to_dateperiod(1 "
+                    + unit
+                    + ")]",
+                error("row to_dateperiod(1 " + unit + ") - now() ")
+            );
+            assertEquals(
+                "1:5: [-] arguments are in unsupported order: cannot subtract a [DATETIME] value [now()] "
+                    + "from a [DATE_PERIOD] amount [to_dateperiod(\"1 "
+                    + unit
+                    + "\")]",
+                error("row to_dateperiod(\"1 " + unit + "\") - now() ")
+            );
         }
     }
 
     public void testPeriodAndDurationInEval() {
-        for (var unit : List.of("millisecond", "second", "minute", "hour")) {
+        for (var unit : TIME_DURATIONS) {
             assertEquals(
-                "1:18: EVAL does not support type [time_duration] in expression [1 " + unit + "]",
+                "1:18: EVAL does not support type [time_duration] as the return data type of expression [1 " + unit + "]",
                 error("row x = 1 | eval y = 1 " + unit)
             );
+            assertEquals(
+                "1:18: EVAL does not support type [time_duration] as the return data type of expression [1 " + unit + "::time_duration]",
+                error("row x = 1 | eval y = 1 " + unit + "::time_duration")
+            );
+            assertEquals(
+                "1:18: EVAL does not support type [time_duration] as the return data type of expression [\"1 "
+                    + unit
+                    + "\"::time_duration]",
+                error("row x = 1 | eval y = \"1 " + unit + "\"::time_duration")
+            );
+            assertEquals(
+                "1:18: EVAL does not support type [time_duration] as the return data type of expression [to_timeduration(1 " + unit + ")]",
+                error("row x = 1 | eval y = to_timeduration(1 " + unit + ")")
+            );
+            assertEquals(
+                "1:18: EVAL does not support type [time_duration] as the return data type of expression [to_timeduration(\"1 "
+                    + unit
+                    + "\")]",
+                error("row x = 1 | eval y = to_timeduration(\"1 " + unit + "\")")
+            );
         }
-        for (var unit : List.of("day", "week", "month", "year")) {
+        for (var unit : DATE_PERIODS) {
             assertEquals(
-                "1:18: EVAL does not support type [date_period] in expression [1 " + unit + "]",
+                "1:18: EVAL does not support type [date_period] as the return data type of expression [1 " + unit + "]",
                 error("row x = 1 | eval y = 1 " + unit)
             );
+            assertEquals(
+                "1:18: EVAL does not support type [date_period] as the return data type of expression [1 " + unit + "::date_period]",
+                error("row x = 1 | eval y = 1 " + unit + "::date_period")
+            );
+            assertEquals(
+                "1:18: EVAL does not support type [date_period] as the return data type of expression [\"1 " + unit + "\"::date_period]",
+                error("row x = 1 | eval y = \"1 " + unit + "\"::date_period")
+            );
+            assertEquals(
+                "1:18: EVAL does not support type [date_period] as the return data type of expression [to_dateperiod(1 " + unit + ")]",
+                error("row x = 1 | eval y = to_dateperiod(1 " + unit + ")")
+            );
+            assertEquals(
+                "1:18: EVAL does not support type [date_period] as the return data type of expression [to_dateperiod(\"1 " + unit + "\")]",
+                error("row x = 1 | eval y = to_dateperiod(\"1 " + unit + "\")")
+            );
         }
     }
 
@@ -722,6 +854,14 @@ public void testFilterNonBoolField() {
 
     public void testFilterDateConstant() {
         assertEquals("1:19: Condition expression needs to be boolean, found [DATE_PERIOD]", error("from test | where 1 year"));
+        assertEquals(
+            "1:19: Condition expression needs to be boolean, found [DATE_PERIOD]",
+            error("from test | where \"1 year\"::date_period")
+        );
+        assertEquals(
+            "1:19: Condition expression needs to be boolean, found [DATE_PERIOD]",
+            error("from test | where to_dateperiod(\"1 year\")")
+        );
     }
 
     public void testNestedAggField() {
@@ -1055,10 +1195,91 @@ public void testCoalesceWithMixedNumericTypes() {
         );
     }
 
-    public void test() {
+    public void testToDatePeriodTimeDurationInInvalidPosition() {
+        // arithmetic operations in eval
         assertEquals(
-            "1:23: second argument of [coalesce(network.bytes_in, 0)] must be [counter_long], found value [0] type [integer]",
-            error("FROM tests | eval x = coalesce(network.bytes_in, 0)", tsdb)
+            "1:39: EVAL does not support type [date_period] as the return data type of expression [3 months + 5 days]",
+            error("row x = \"2024-01-01\"::datetime | eval y = 3 months + 5 days")
+        );
+
+        assertEquals(
+            "1:39: EVAL does not support type [date_period] as the return data type of expression "
+                + "[\"3 months\"::date_period + \"5 days\"::date_period]",
+            error("row x = \"2024-01-01\"::datetime | eval y = \"3 months\"::date_period + \"5 days\"::date_period")
+        );
+
+        assertEquals(
+            "1:39: EVAL does not support type [time_duration] as the return data type of expression [3 hours + 5 minutes]",
+            error("row x = \"2024-01-01\"::datetime | eval y = 3 hours + 5 minutes")
+        );
+
+        assertEquals(
+            "1:39: EVAL does not support type [time_duration] as the return data type of expression "
+                + "[\"3 hours\"::time_duration + \"5 minutes\"::time_duration]",
+            error("row x = \"2024-01-01\"::datetime | eval y = \"3 hours\"::time_duration + \"5 minutes\"::time_duration")
+        );
+
+        // where
+        assertEquals(
+            "1:26: first argument of [\"3 days\"::date_period == to_dateperiod(\"3 days\")] must be "
+                + "[boolean, cartesian_point, cartesian_shape, date_nanos, datetime, double, geo_point, geo_shape, integer, ip, keyword, "
+                + "long, text, unsigned_long or version], found value [\"3 days\"::date_period] type [date_period]",
+            error("row x = \"3 days\" | where \"3 days\"::date_period == to_dateperiod(\"3 days\")")
+        );
+
+        assertEquals(
+            "1:26: first argument of [\"3 hours\"::time_duration <= to_timeduration(\"3 hours\")] must be "
+                + "[date_nanos, datetime, double, integer, ip, keyword, long, text, unsigned_long or version], "
+                + "found value [\"3 hours\"::time_duration] type [time_duration]",
+            error("row x = \"3 days\" | where \"3 hours\"::time_duration <= to_timeduration(\"3 hours\")")
+        );
+
+        assertEquals(
+            "1:19: second argument of [first_name <= to_timeduration(\"3 hours\")] must be "
+                + "[date_nanos, datetime, double, integer, ip, keyword, long, text, unsigned_long or version], "
+                + "found value [to_timeduration(\"3 hours\")] type [time_duration]",
+            error("from test | where first_name <= to_timeduration(\"3 hours\")")
+        );
+
+        assertEquals(
+            "1:19: 1st argument of [first_name IN ( to_timeduration(\"3 hours\"), \"3 days\"::date_period)] must be [keyword], "
+                + "found value [to_timeduration(\"3 hours\")] type [time_duration]",
+            error("from test | where first_name IN ( to_timeduration(\"3 hours\"), \"3 days\"::date_period)")
+        );
+    }
+
+    public void testToDatePeriodToTimeDurationWithInvalidType() {
+        assertEquals(
+            "1:36: argument of [1.5::date_period] must be [date_period or string], found value [1.5] type [double]",
+            error("from types | EVAL x = birth_date + 1.5::date_period")
+        );
+        assertEquals(
+            "1:37: argument of [to_timeduration(1)] must be [time_duration or string], found value [1] type [integer]",
+            error("from types  | EVAL x = birth_date - to_timeduration(1)")
+        );
+        assertEquals(
+            "1:45: argument of [x::date_period] must be [date_period or string], found value [x] type [double]",
+            error("from types | EVAL x = 1.5, y = birth_date + x::date_period")
+        );
+        assertEquals(
+            "1:44: argument of [to_timeduration(x)] must be [time_duration or string], found value [x] type [integer]",
+            error("from types  | EVAL x = 1, y = birth_date - to_timeduration(x)")
+        );
+        assertEquals(
+            "1:64: argument of [x::date_period] must be [date_period or string], found value [x] type [datetime]",
+            error("from types | EVAL x = \"2024-09-08\"::datetime, y = birth_date + x::date_period")
+        );
+        assertEquals(
+            "1:65: argument of [to_timeduration(x)] must be [time_duration or string], found value [x] type [datetime]",
+            error("from types  | EVAL x = \"2024-09-08\"::datetime, y = birth_date - to_timeduration(x)")
+        );
+        assertEquals(
+            "1:58: argument of [x::date_period] must be [date_period or string], found value [x] type [ip]",
+            error("from types | EVAL x = \"2024-09-08\"::ip, y = birth_date + x::date_period")
+        );
+        assertEquals(
+            "1:59: argument of [to_timeduration(x)] must be [time_duration or string], found value [x] type [ip]",
+            error("from types  | EVAL x = \"2024-09-08\"::ip, y = birth_date - to_timeduration(x)")
         );
     }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractAggregationTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractAggregationTestCase.java
index 4e26baddd013..1c917a961a34 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractAggregationTestCase.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractAggregationTestCase.java
@@ -11,8 +11,10 @@
 import org.elasticsearch.compute.aggregation.AggregatorFunctionSupplier;
 import org.elasticsearch.compute.aggregation.AggregatorMode;
 import org.elasticsearch.compute.aggregation.GroupingAggregator;
+import org.elasticsearch.compute.aggregation.GroupingAggregatorFunction;
 import org.elasticsearch.compute.aggregation.SeenGroupIds;
 import org.elasticsearch.compute.data.Block;
+import org.elasticsearch.compute.data.BooleanVector;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.IntBlock;
 import org.elasticsearch.compute.data.IntVector;
@@ -105,8 +107,10 @@ protected static List<TestCaseSupplier> withNoRowsExpectingNull(List<TestCaseSup
                         testCase.expectedType(),
                         nullValue(),
                         null,
+                        null,
                         testCase.getExpectedTypeError(),
                         null,
+                        null,
                         null
                     );
                 }));
@@ -147,8 +151,10 @@ private void aggregateSingleMode(Expression expression) {
         Object result;
         try (var aggregator = aggregator(expression, initialInputChannels(), AggregatorMode.SINGLE)) {
             for (Page inputPage : rows(testCase.getMultiRowFields())) {
-                try {
-                    aggregator.processPage(inputPage);
+                try (
+                    BooleanVector noMasking = driverContext().blockFactory().newConstantBooleanVector(true, inputPage.getPositionCount())
+                ) {
+                    aggregator.processPage(inputPage, noMasking);
                 } finally {
                     inputPage.releaseBlocks();
                 }
@@ -214,8 +220,10 @@ private void aggregateWithIntermediates(Expression expression) {
             intermediateBlocks = new Block[intermediateBlockOffset + intermediateStates + intermediateBlockExtraSize];
 
             for (Page inputPage : rows(testCase.getMultiRowFields())) {
-                try {
-                    aggregator.processPage(inputPage);
+                try (
+                    BooleanVector noMasking = driverContext().blockFactory().newConstantBooleanVector(true, inputPage.getPositionCount())
+                ) {
+                    aggregator.processPage(inputPage, noMasking);
                 } finally {
                     inputPage.releaseBlocks();
                 }
@@ -244,9 +252,9 @@ private void aggregateWithIntermediates(Expression expression) {
             )
         ) {
             Page inputPage = new Page(intermediateBlocks);
-            try {
+            try (BooleanVector noMasking = driverContext().blockFactory().newConstantBooleanVector(true, inputPage.getPositionCount())) {
                 if (inputPage.getPositionCount() > 0) {
-                    aggregator.processPage(inputPage);
+                    aggregator.processPage(inputPage, noMasking);
                 }
             } finally {
                 inputPage.releaseBlocks();
@@ -453,22 +461,26 @@ private void processPageGrouping(GroupingAggregator aggregator, Page inputPage,
         for (int currentGroupOffset = 0; currentGroupOffset < groupCount;) {
             int groupSliceRemainingSize = Math.min(groupSliceSize, groupCount - currentGroupOffset);
             var seenGroupIds = new SeenGroupIds.Range(0, allValuesNull ? 0 : currentGroupOffset + groupSliceRemainingSize);
-            var addInput = aggregator.prepareProcessPage(seenGroupIds, inputPage);
-
-            var positionCount = inputPage.getPositionCount();
-            var dataSliceSize = 1;
-            // Divide data in chunks
-            for (int currentDataOffset = 0; currentDataOffset < positionCount;) {
-                int dataSliceRemainingSize = Math.min(dataSliceSize, positionCount - currentDataOffset);
-                try (
-                    var groups = makeGroupsVector(currentGroupOffset, currentGroupOffset + groupSliceRemainingSize, dataSliceRemainingSize)
-                ) {
-                    addInput.add(currentDataOffset, groups);
-                }
+            try (GroupingAggregatorFunction.AddInput addInput = aggregator.prepareProcessPage(seenGroupIds, inputPage)) {
+                var positionCount = inputPage.getPositionCount();
+                var dataSliceSize = 1;
+                // Divide data in chunks
+                for (int currentDataOffset = 0; currentDataOffset < positionCount;) {
+                    int dataSliceRemainingSize = Math.min(dataSliceSize, positionCount - currentDataOffset);
+                    try (
+                        var groups = makeGroupsVector(
+                            currentGroupOffset,
+                            currentGroupOffset + groupSliceRemainingSize,
+                            dataSliceRemainingSize
+                        )
+                    ) {
+                        addInput.add(currentDataOffset, groups);
+                    }
 
-                currentDataOffset += dataSliceSize;
-                if (positionCount > currentDataOffset) {
-                    dataSliceSize = randomIntBetween(1, Math.min(100, positionCount - currentDataOffset));
+                    currentDataOffset += dataSliceSize;
+                    if (positionCount > currentDataOffset) {
+                        dataSliceSize = randomIntBetween(1, Math.min(100, positionCount - currentDataOffset));
+                    }
                 }
             }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java
index 7bdeb2dad9e4..0ebca9671466 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java
@@ -217,8 +217,10 @@ protected static List<TestCaseSupplier> anyNullIsNull(
                         expectedType.expectedType(finalNullPosition, nulledData.type(), oc),
                         nullValue(),
                         null,
+                        null,
                         oc.getExpectedTypeError(),
                         null,
+                        null,
                         null
                     );
                 }));
@@ -246,8 +248,10 @@ protected static List<TestCaseSupplier> anyNullIsNull(
                                 expectedType.expectedType(finalNullPosition, DataType.NULL, oc),
                                 nullValue(),
                                 null,
+                                null,
                                 oc.getExpectedTypeError(),
                                 null,
+                                null,
                                 null
                             );
                         }));
@@ -642,9 +646,11 @@ protected static List<TestCaseSupplier> randomizeBytesRefsOffset(List<TestCaseSu
                 testCase.expectedType(),
                 testCase.getMatcher(),
                 testCase.getExpectedWarnings(),
+                testCase.getExpectedBuildEvaluatorWarnings(),
                 testCase.getExpectedTypeError(),
                 testCase.foldingExceptionClass(),
-                testCase.foldingExceptionMessage()
+                testCase.foldingExceptionMessage(),
+                testCase.extra()
             );
         })).toList();
     }
@@ -692,8 +698,6 @@ public static void testFunctionInfo() {
             log.info("Skipping function info checks because the function isn't registered");
             return;
         }
-        // TODO fix case tests to include all supported types
-        assumeFalse("CASE test incomplete", definition.name().equals("case"));
         log.info("Running function info checks");
         EsqlFunctionRegistry.FunctionDescription description = EsqlFunctionRegistry.description(definition);
         List<EsqlFunctionRegistry.ArgSignature> args = description.args();
@@ -707,7 +711,7 @@ public static void testFunctionInfo() {
         );
 
         List<Set<String>> typesFromSignature = new ArrayList<>();
-        Set<String> returnFromSignature = new HashSet<>();
+        Set<String> returnFromSignature = new TreeSet<>();
         for (int i = 0; i < args.size(); i++) {
             typesFromSignature.add(new HashSet<>());
         }
@@ -828,6 +832,28 @@ public static void renderDocs() throws IOException {
         FunctionDefinition definition = definition(name);
         if (definition != null) {
             EsqlFunctionRegistry.FunctionDescription description = EsqlFunctionRegistry.description(definition);
+            if (name.equals("case")) {
+                /*
+                 * Hack the description, so we render a proper one for case.
+                 */
+                // TODO build the description properly *somehow*
+                EsqlFunctionRegistry.ArgSignature trueValue = description.args().get(1);
+                EsqlFunctionRegistry.ArgSignature falseValue = new EsqlFunctionRegistry.ArgSignature(
+                    "elseValue",
+                    trueValue.type(),
+                    "The value that's returned when no condition evaluates to `true`.",
+                    true,
+                    EsqlFunctionRegistry.getTargetType(trueValue.type())
+                );
+                description = new EsqlFunctionRegistry.FunctionDescription(
+                    description.name(),
+                    List.of(description.args().get(0), trueValue, falseValue),
+                    description.returnType(),
+                    description.description(),
+                    description.variadic(),
+                    description.isAggregation()
+                );
+            }
             renderTypes(description.argNames());
             renderParametersList(description.argNames(), description.argDescriptions());
             FunctionInfo info = EsqlFunctionRegistry.functionInfo(definition);
@@ -836,22 +862,7 @@ public static void renderDocs() throws IOException {
             boolean hasAppendix = renderAppendix(info.appendix());
             renderFullLayout(name, info.preview(), hasExamples, hasAppendix);
             renderKibanaInlineDocs(name, info);
-            List<EsqlFunctionRegistry.ArgSignature> args = description.args();
-            if (name.equals("case")) {
-                EsqlFunctionRegistry.ArgSignature falseValue = args.get(1);
-                args = List.of(
-                    args.get(0),
-                    falseValue,
-                    new EsqlFunctionRegistry.ArgSignature(
-                        "falseValue",
-                        falseValue.type(),
-                        falseValue.description(),
-                        true,
-                        EsqlFunctionRegistry.getTargetType(falseValue.type())
-                    )
-                );
-            }
-            renderKibanaFunctionDefinition(name, info, args, description.variadic());
+            renderKibanaFunctionDefinition(name, info, description.args(), description.variadic());
             return;
         }
         LogManager.getLogger(getTestClass()).info("Skipping rendering types because the function '" + name + "' isn't registered");
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractScalarFunctionTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractScalarFunctionTestCase.java
index fed81d4260bc..85db73901352 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractScalarFunctionTestCase.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractScalarFunctionTestCase.java
@@ -38,7 +38,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static org.elasticsearch.compute.data.BlockUtils.toJavaObject;
 import static org.hamcrest.Matchers.either;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
@@ -120,6 +119,9 @@ public final void testEvaluate() {
 
         Object result;
         try (ExpressionEvaluator evaluator = evaluator(expression).get(driverContext())) {
+            if (testCase.getExpectedBuildEvaluatorWarnings() != null) {
+                assertWarnings(testCase.getExpectedBuildEvaluatorWarnings());
+            }
             try (Block block = evaluator.eval(row(testCase.getDataValues()))) {
                 assertThat(block.getPositionCount(), is(1));
                 result = toJavaObjectUnsignedLongAware(block, 0);
@@ -177,6 +179,10 @@ public final void testEvaluateBlockWithNulls() {
      */
     public final void testCrankyEvaluateBlockWithoutNulls() {
         assumeTrue("sometimes the cranky breaker silences warnings, just skip these cases", testCase.getExpectedWarnings() == null);
+        assumeTrue(
+            "sometimes the cranky breaker silences warnings, just skip these cases",
+            testCase.getExpectedBuildEvaluatorWarnings() == null
+        );
         try {
             testEvaluateBlock(driverContext().blockFactory(), crankyContext(), false);
         } catch (CircuitBreakingException ex) {
@@ -190,6 +196,10 @@ public final void testCrankyEvaluateBlockWithoutNulls() {
      */
     public final void testCrankyEvaluateBlockWithNulls() {
         assumeTrue("sometimes the cranky breaker silences warnings, just skip these cases", testCase.getExpectedWarnings() == null);
+        assumeTrue(
+            "sometimes the cranky breaker silences warnings, just skip these cases",
+            testCase.getExpectedBuildEvaluatorWarnings() == null
+        );
         try {
             testEvaluateBlock(driverContext().blockFactory(), crankyContext(), true);
         } catch (CircuitBreakingException ex) {
@@ -242,10 +252,13 @@ private void testEvaluateBlock(BlockFactory inputBlockFactory, DriverContext con
                 ExpressionEvaluator eval = evaluator(expression).get(context);
                 Block block = eval.eval(new Page(positions, manyPositionsBlocks))
             ) {
+                if (testCase.getExpectedBuildEvaluatorWarnings() != null) {
+                    assertWarnings(testCase.getExpectedBuildEvaluatorWarnings());
+                }
                 assertThat(block.getPositionCount(), is(positions));
                 for (int p = 0; p < positions; p++) {
                     if (nullPositions.contains(p)) {
-                        assertThat(toJavaObject(block, p), allNullsMatcher());
+                        assertThat(toJavaObjectUnsignedLongAware(block, p), allNullsMatcher());
                         continue;
                     }
                     assertThat(toJavaObjectUnsignedLongAware(block, p), testCase.getMatcher());
@@ -275,6 +288,9 @@ public final void testEvaluateInManyThreads() throws ExecutionException, Interru
         int count = 10_000;
         int threads = 5;
         var evalSupplier = evaluator(expression);
+        if (testCase.getExpectedBuildEvaluatorWarnings() != null) {
+            assertWarnings(testCase.getExpectedBuildEvaluatorWarnings());
+        }
         ExecutorService exec = Executors.newFixedThreadPool(threads);
         try {
             List<Future<?>> futures = new ArrayList<>();
@@ -310,6 +326,9 @@ public final void testEvaluatorToString() {
         assumeTrue("Can't build evaluator", testCase.canBuildEvaluator());
         var factory = evaluator(expression);
         try (ExpressionEvaluator ev = factory.get(driverContext())) {
+            if (testCase.getExpectedBuildEvaluatorWarnings() != null) {
+                assertWarnings(testCase.getExpectedBuildEvaluatorWarnings());
+            }
             assertThat(ev.toString(), testCase.evaluatorToString());
         }
     }
@@ -322,6 +341,9 @@ public final void testFactoryToString() {
         }
         assumeTrue("Can't build evaluator", testCase.canBuildEvaluator());
         var factory = evaluator(buildFieldExpression(testCase));
+        if (testCase.getExpectedBuildEvaluatorWarnings() != null) {
+            assertWarnings(testCase.getExpectedBuildEvaluatorWarnings());
+        }
         assertThat(factory.toString(), testCase.evaluatorToString());
     }
 
@@ -342,6 +364,9 @@ public final void testFold() {
                 result = NumericUtils.unsignedLongAsBigInteger((Long) result);
             }
             assertThat(result, testCase.getMatcher());
+            if (testCase.getExpectedBuildEvaluatorWarnings() != null) {
+                assertWarnings(testCase.getExpectedBuildEvaluatorWarnings());
+            }
             if (testCase.getExpectedWarnings() != null) {
                 assertWarnings(testCase.getExpectedWarnings());
             }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/RailRoadDiagram.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/RailRoadDiagram.java
index 4e00fa9f41fb..df0737feadd8 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/RailRoadDiagram.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/RailRoadDiagram.java
@@ -49,18 +49,28 @@ static String functionSignature(FunctionDefinition definition) throws IOExceptio
         List<Expression> expressions = new ArrayList<>();
         expressions.add(new SpecialSequence(definition.name().toUpperCase(Locale.ROOT)));
         expressions.add(new Syntax("("));
-        boolean first = true;
-        List<String> args = EsqlFunctionRegistry.description(definition).argNames();
-        for (String arg : args) {
-            if (arg.endsWith("...")) {
-                expressions.add(new Repetition(new Sequence(new Syntax(","), new Literal(arg.substring(0, arg.length() - 3))), 0, null));
-            } else {
-                if (first) {
-                    first = false;
+
+        if (definition.name().equals("case")) {
+            // CASE is so weird let's just hack this together manually
+            Sequence seq = new Sequence(new Literal("condition"), new Syntax(","), new Literal("trueValue"));
+            expressions.add(new Repetition(seq, 1, null));
+            expressions.add(new Repetition(new Literal("elseValue"), 0, 1));
+        } else {
+            boolean first = true;
+            List<String> args = EsqlFunctionRegistry.description(definition).argNames();
+            for (String arg : args) {
+                if (arg.endsWith("...")) {
+                    expressions.add(
+                        new Repetition(new Sequence(new Syntax(","), new Literal(arg.substring(0, arg.length() - 3))), 0, null)
+                    );
                 } else {
-                    expressions.add(new Syntax(","));
+                    if (first) {
+                        first = false;
+                    } else {
+                        expressions.add(new Syntax(","));
+                    }
+                    expressions.add(new Literal(arg));
                 }
-                expressions.add(new Literal(arg));
             }
         }
         expressions.add(new Syntax(")"));
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java
index a1caa784c978..e44ea907518b 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java
@@ -67,6 +67,21 @@ public static String nameFromTypes(List<DataType> types) {
         return types.stream().map(t -> "<" + t.typeName() + ">").collect(Collectors.joining(", "));
     }
 
+    /**
+     * Build a name for the test case based on objects likely to describe it.
+     */
+    public static String nameFrom(List<Object> paramDescriptors) {
+        return paramDescriptors.stream().map(p -> {
+            if (p == null) {
+                return "null";
+            }
+            if (p instanceof DataType t) {
+                return "<" + t.typeName() + ">";
+            }
+            return p.toString();
+        }).collect(Collectors.joining(", "));
+    }
+
     public static List<TestCaseSupplier> stringCases(
         BinaryOperator<Object> expected,
         BiFunction<DataType, DataType, String> evaluatorToString,
@@ -1305,7 +1320,7 @@ public static String castToDoubleEvaluator(String original, DataType current) {
         throw new UnsupportedOperationException();
     }
 
-    public static class TestCase {
+    public static final class TestCase {
         /**
          * The {@link Source} this test case should be run with
          */
@@ -1333,22 +1348,34 @@ public static class TestCase {
          */
         private final String[] expectedWarnings;
 
+        /**
+         * Warnings that are added by calling {@link AbstractFunctionTestCase#evaluator}
+         * or {@link Expression#fold()} on the expression built by this.
+         */
+        private final String[] expectedBuildEvaluatorWarnings;
+
         private final String expectedTypeError;
         private final boolean canBuildEvaluator;
 
         private final Class<? extends Throwable> foldingExceptionClass;
         private final String foldingExceptionMessage;
 
+        /**
+         * Extra data embedded in the test case. Test subclasses can cast
+         * as needed and extra <strong>whatever</strong> helps them.
+         */
+        private final Object extra;
+
         public TestCase(List<TypedData> data, String evaluatorToString, DataType expectedType, Matcher<?> matcher) {
             this(data, equalTo(evaluatorToString), expectedType, matcher);
         }
 
         public TestCase(List<TypedData> data, Matcher<String> evaluatorToString, DataType expectedType, Matcher<?> matcher) {
-            this(data, evaluatorToString, expectedType, matcher, null, null, null, null);
+            this(data, evaluatorToString, expectedType, matcher, null, null, null, null, null, null);
         }
 
         public static TestCase typeError(List<TypedData> data, String expectedTypeError) {
-            return new TestCase(data, null, null, null, null, expectedTypeError, null, null);
+            return new TestCase(data, null, null, null, null, null, expectedTypeError, null, null, null);
         }
 
         TestCase(
@@ -1357,9 +1384,11 @@ public static TestCase typeError(List<TypedData> data, String expectedTypeError)
             DataType expectedType,
             Matcher<?> matcher,
             String[] expectedWarnings,
+            String[] expectedBuildEvaluatorWarnings,
             String expectedTypeError,
             Class<? extends Throwable> foldingExceptionClass,
-            String foldingExceptionMessage
+            String foldingExceptionMessage,
+            Object extra
         ) {
             this.source = Source.EMPTY;
             this.data = data;
@@ -1369,10 +1398,12 @@ public static TestCase typeError(List<TypedData> data, String expectedTypeError)
             Matcher<Object> downcast = (Matcher<Object>) matcher;
             this.matcher = downcast;
             this.expectedWarnings = expectedWarnings;
+            this.expectedBuildEvaluatorWarnings = expectedBuildEvaluatorWarnings;
             this.expectedTypeError = expectedTypeError;
             this.canBuildEvaluator = data.stream().allMatch(d -> d.forceLiteral || DataType.isRepresentable(d.type));
             this.foldingExceptionClass = foldingExceptionClass;
             this.foldingExceptionMessage = foldingExceptionMessage;
+            this.extra = extra;
         }
 
         public Source getSource() {
@@ -1419,6 +1450,14 @@ public String[] getExpectedWarnings() {
             return expectedWarnings;
         }
 
+        /**
+         * Warnings that are added by calling {@link AbstractFunctionTestCase#evaluator}
+         * or {@link Expression#fold()} on the expression built by this.
+         */
+        public String[] getExpectedBuildEvaluatorWarnings() {
+            return expectedBuildEvaluatorWarnings;
+        }
+
         public Class<? extends Throwable> foldingExceptionClass() {
             return foldingExceptionClass;
         }
@@ -1431,28 +1470,88 @@ public String getExpectedTypeError() {
             return expectedTypeError;
         }
 
+        /**
+         * Extra data embedded in the test case. Test subclasses can cast
+         * as needed and extra <strong>whatever</strong> helps them.
+         */
+        public Object extra() {
+            return extra;
+        }
+
+        /**
+         * Build a new {@link TestCase} with new {@link #extra()}.
+         */
+        public TestCase withExtra(Object extra) {
+            return new TestCase(
+                data,
+                evaluatorToString,
+                expectedType,
+                matcher,
+                expectedWarnings,
+                expectedBuildEvaluatorWarnings,
+                expectedTypeError,
+                foldingExceptionClass,
+                foldingExceptionMessage,
+                extra
+            );
+        }
+
         public TestCase withWarning(String warning) {
-            String[] newWarnings;
-            if (expectedWarnings != null) {
-                newWarnings = Arrays.copyOf(expectedWarnings, expectedWarnings.length + 1);
-                newWarnings[expectedWarnings.length] = warning;
-            } else {
-                newWarnings = new String[] { warning };
-            }
             return new TestCase(
                 data,
                 evaluatorToString,
                 expectedType,
                 matcher,
-                newWarnings,
+                addWarning(expectedWarnings, warning),
+                expectedBuildEvaluatorWarnings,
+                expectedTypeError,
+                foldingExceptionClass,
+                foldingExceptionMessage,
+                extra
+            );
+        }
+
+        /**
+         * Warnings that are added by calling {@link AbstractFunctionTestCase#evaluator}
+         * or {@link Expression#fold()} on the expression built by this.
+         */
+        public TestCase withBuildEvaluatorWarning(String warning) {
+            return new TestCase(
+                data,
+                evaluatorToString,
+                expectedType,
+                matcher,
+                expectedWarnings,
+                addWarning(expectedBuildEvaluatorWarnings, warning),
                 expectedTypeError,
                 foldingExceptionClass,
-                foldingExceptionMessage
+                foldingExceptionMessage,
+                extra
             );
         }
 
+        private String[] addWarning(String[] warnings, String warning) {
+            if (warnings == null) {
+                return new String[] { warning };
+            }
+            String[] newWarnings = Arrays.copyOf(warnings, warnings.length + 1);
+            newWarnings[warnings.length] = warning;
+            return newWarnings;
+        }
+
         public TestCase withFoldingException(Class<? extends Throwable> clazz, String message) {
-            return new TestCase(data, evaluatorToString, expectedType, matcher, expectedWarnings, expectedTypeError, clazz, message);
+            return new TestCase(
+                data,
+                evaluatorToString,
+                expectedType,
+                matcher,
+                expectedWarnings,
+                expectedBuildEvaluatorWarnings,
+                expectedTypeError,
+                clazz,
+                message,
+                extra
+            );
         }
 
         public DataType expectedType() {
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseExtraTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseExtraTests.java
index f2c4625f5a3c..de84086e3cb4 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseExtraTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseExtraTests.java
@@ -72,6 +72,19 @@ public void testPartialFoldDropsFirstFalse() {
         );
     }
 
+    public void testPartialFoldMv() {
+        Case c = new Case(
+            Source.synthetic("case"),
+            new Literal(Source.EMPTY, List.of(true, true), DataType.BOOLEAN),
+            List.of(field("first", DataType.LONG), field("last_cond", DataType.BOOLEAN), field("last", DataType.LONG))
+        );
+        assertThat(c.foldable(), equalTo(false));
+        assertThat(
+            c.partiallyFold(),
+            equalTo(new Case(Source.synthetic("case"), field("last_cond", DataType.BOOLEAN), List.of(field("last", DataType.LONG))))
+        );
+    }
+
     public void testPartialFoldNoop() {
         Case c = new Case(
             Source.synthetic("case"),
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java
index 97515db85e8c..7b26ac8c099d 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/conditional/CaseTests.java
@@ -10,22 +10,48 @@
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
-import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.expression.TypeResolutions;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.core.util.NumericUtils;
 import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase;
 import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
+import org.hamcrest.Matcher;
 
-import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.randomLiteral;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.hamcrest.Matchers.startsWith;
 
 public class CaseTests extends AbstractScalarFunctionTestCase {
+    private static final List<DataType> TYPES = List.of(
+        DataType.KEYWORD,
+        DataType.TEXT,
+        DataType.BOOLEAN,
+        DataType.DATETIME,
+        DataType.DATE_NANOS,
+        DataType.DOUBLE,
+        DataType.INTEGER,
+        DataType.LONG,
+        DataType.UNSIGNED_LONG,
+        DataType.IP,
+        DataType.VERSION,
+        DataType.CARTESIAN_POINT,
+        DataType.GEO_POINT,
+        DataType.CARTESIAN_SHAPE,
+        DataType.GEO_SHAPE,
+        DataType.NULL
+    );
 
     public CaseTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
         this.testCase = testCaseSupplier.get();
@@ -36,168 +62,755 @@ public CaseTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseS
      */
     @ParametersFactory
     public static Iterable<Object[]> parameters() {
-        // TODO this needs lots of stuff flipped to parameters
-        return parameterSuppliersFromTypedData(
-            List.of(new TestCaseSupplier("keyword", List.of(DataType.BOOLEAN, DataType.KEYWORD, DataType.KEYWORD), () -> {
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(true, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(new BytesRef("a"), DataType.KEYWORD, "a"),
-                    new TestCaseSupplier.TypedData(new BytesRef("b"), DataType.KEYWORD, "b")
-                );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=BYTES_REF, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=Attribute[channel=2]]",
-                    DataType.KEYWORD,
-                    equalTo(new BytesRef("a"))
-                );
-            }), new TestCaseSupplier("text", List.of(DataType.BOOLEAN, DataType.TEXT), () -> {
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(false, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(new BytesRef("a"), DataType.TEXT, "trueValue")
-                );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=BYTES_REF, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.TEXT,
-                    nullValue()
-                );
-            }), new TestCaseSupplier("boolean", List.of(DataType.BOOLEAN, DataType.BOOLEAN), () -> {
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(false, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(false, DataType.BOOLEAN, "trueValue")
-                );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=BOOLEAN, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.BOOLEAN,
-                    nullValue()
-                );
-            }), new TestCaseSupplier("date", List.of(DataType.BOOLEAN, DataType.DATETIME), () -> {
-                long value = randomNonNegativeLong();
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(true, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.DATETIME, "trueValue")
-                );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=LONG, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.DATETIME,
-                    equalTo(value)
-                );
-            }), new TestCaseSupplier("double", List.of(DataType.BOOLEAN, DataType.DOUBLE), () -> {
-                double value = randomDouble();
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(true, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.DOUBLE, "trueValue")
-                );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=DOUBLE, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.DOUBLE,
-                    equalTo(value)
-                );
-            }), new TestCaseSupplier("integer", List.of(DataType.BOOLEAN, DataType.INTEGER), () -> {
-                int value = randomInt();
+        List<TestCaseSupplier> suppliers = new ArrayList<>();
+        for (DataType type : TYPES) {
+            twoAndThreeArgs(suppliers, true, true, type, List.of());
+            twoAndThreeArgs(suppliers, false, false, type, List.of());
+            twoAndThreeArgs(suppliers, null, false, type, List.of());
+            twoAndThreeArgs(
+                suppliers,
+                randomMultivaluedCondition(),
+                false,
+                type,
+                List.of(
+                    "Line -1:-1: evaluation of [cond] failed, treating result as false. Only first 20 failures recorded.",
+                    "Line -1:-1: java.lang.IllegalArgumentException: CASE expects a single-valued boolean"
+                )
+            );
+        }
+        suppliers = errorsForCasesWithoutExamples(
+            suppliers,
+            (includeOrdinal, validPerPosition, types) -> typeErrorMessage(includeOrdinal, types)
+        );
+
+        for (DataType type : TYPES) {
+            fourAndFiveArgs(suppliers, true, randomSingleValuedCondition(), 0, type, List.of());
+            fourAndFiveArgs(suppliers, false, true, 1, type, List.of());
+            fourAndFiveArgs(suppliers, false, false, 2, type, List.of());
+            fourAndFiveArgs(suppliers, null, true, 1, type, List.of());
+            fourAndFiveArgs(suppliers, null, false, 2, type, List.of());
+            fourAndFiveArgs(
+                suppliers,
+                randomMultivaluedCondition(),
+                true,
+                1,
+                type,
+                List.of(
+                    "Line -1:-1: evaluation of [cond1] failed, treating result as false. Only first 20 failures recorded.",
+                    "Line -1:-1: java.lang.IllegalArgumentException: CASE expects a single-valued boolean"
+                )
+            );
+            fourAndFiveArgs(
+                suppliers,
+                false,
+                randomMultivaluedCondition(),
+                2,
+                type,
+                List.of(
+                    "Line -1:-1: evaluation of [cond2] failed, treating result as false. Only first 20 failures recorded.",
+                    "Line -1:-1: java.lang.IllegalArgumentException: CASE expects a single-valued boolean"
+                )
+            );
+        }
+        return
+
+        parameterSuppliersFromTypedData(suppliers);
+    }
+
+    private static void twoAndThreeArgs(
+        List<TestCaseSupplier> suppliers,
+        Object cond,
+        boolean lhsOrRhs,
+        DataType type,
+        List<String> warnings
+    ) {
+        suppliers.add(new TestCaseSupplier(TestCaseSupplier.nameFrom(Arrays.asList(cond, type)), List.of(DataType.BOOLEAN, type), () -> {
+            Object lhs = randomLiteral(type).value();
+            List<TestCaseSupplier.TypedData> typedData = List.of(cond(cond, "cond"), new TestCaseSupplier.TypedData(lhs, type, "lhs"));
+            return testCase(type, typedData, lhsOrRhs ? lhs : null, toStringMatcher(1, true), false, null, addWarnings(warnings));
+        }));
+        suppliers.add(
+            new TestCaseSupplier(TestCaseSupplier.nameFrom(Arrays.asList(cond, type, type)), List.of(DataType.BOOLEAN, type, type), () -> {
+                Object lhs = randomLiteral(type).value();
+                Object rhs = randomLiteral(type).value();
                 List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(false, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.INTEGER, "trueValue")
-                );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=INT, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.INTEGER,
-                    nullValue()
+                    cond(cond, "cond"),
+                    new TestCaseSupplier.TypedData(lhs, type, "lhs"),
+                    new TestCaseSupplier.TypedData(rhs, type, "rhs")
                 );
-            }), new TestCaseSupplier("long", List.of(DataType.BOOLEAN, DataType.LONG), () -> {
-                long value = randomLong();
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(false, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.LONG, "trueValue")
+                return testCase(type, typedData, lhsOrRhs ? lhs : rhs, toStringMatcher(1, false), false, null, addWarnings(warnings));
+            })
+        );
+        if (lhsOrRhs) {
+            suppliers.add(
+                new TestCaseSupplier(
+                    "foldable " + TestCaseSupplier.nameFrom(Arrays.asList(cond, type, type)),
+                    List.of(DataType.BOOLEAN, type, type),
+                    () -> {
+                        Object lhs = randomLiteral(type).value();
+                        Object rhs = randomLiteral(type).value();
+                        List<TestCaseSupplier.TypedData> typedData = List.of(
+                            cond(cond, "cond").forceLiteral(),
+                            new TestCaseSupplier.TypedData(lhs, type, "lhs").forceLiteral(),
+                            new TestCaseSupplier.TypedData(rhs, type, "rhs")
+                        );
+                        return testCase(
+                            type,
+                            typedData,
+                            lhs,
+                            startsWith("LiteralsEvaluator[lit="),
+                            true,
+                            null,
+                            addBuildEvaluatorWarnings(warnings)
+                        );
+                    }
+                )
+            );
+            suppliers.add(
+                new TestCaseSupplier(
+                    "partial foldable " + TestCaseSupplier.nameFrom(Arrays.asList(cond, type)),
+                    List.of(DataType.BOOLEAN, type),
+                    () -> {
+                        Object lhs = randomLiteral(type).value();
+                        List<TestCaseSupplier.TypedData> typedData = List.of(
+                            cond(cond, "cond").forceLiteral(),
+                            new TestCaseSupplier.TypedData(lhs, type, "lhs")
+                        );
+                        return testCase(
+                            type,
+                            typedData,
+                            lhs,
+                            startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition=LiteralsEvaluator"),
+                            false,
+                            List.of(typedData.get(1)),
+                            addBuildEvaluatorWarnings(warnings)
+                        );
+                    }
+                )
+            );
+        } else {
+            suppliers.add(
+                new TestCaseSupplier(
+                    "foldable " + TestCaseSupplier.nameFrom(Arrays.asList(cond, type)),
+                    List.of(DataType.BOOLEAN, type),
+                    () -> {
+                        Object lhs = randomLiteral(type).value();
+                        List<TestCaseSupplier.TypedData> typedData = List.of(
+                            cond(cond, "cond").forceLiteral(),
+                            new TestCaseSupplier.TypedData(lhs, type, "lhs")
+                        );
+                        return testCase(
+                            type,
+                            typedData,
+                            null,
+                            startsWith("LiteralsEvaluator[lit="),
+                            true,
+                            List.of(new TestCaseSupplier.TypedData(null, type, "null").forceLiteral()),
+                            addBuildEvaluatorWarnings(warnings)
+                        );
+                    }
+                )
+            );
+        }
+
+        suppliers.add(
+            new TestCaseSupplier(
+                "partial foldable " + TestCaseSupplier.nameFrom(Arrays.asList(cond, type, type)),
+                List.of(DataType.BOOLEAN, type, type),
+                () -> {
+                    Object lhs = randomLiteral(type).value();
+                    Object rhs = randomLiteral(type).value();
+                    List<TestCaseSupplier.TypedData> typedData = List.of(
+                        cond(cond, "cond").forceLiteral(),
+                        new TestCaseSupplier.TypedData(lhs, type, "lhs"),
+                        new TestCaseSupplier.TypedData(rhs, type, "rhs")
+                    );
+                    return testCase(
+                        type,
+                        typedData,
+                        lhsOrRhs ? lhs : rhs,
+                        startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition=LiteralsEvaluator"),
+                        false,
+                        List.of(typedData.get(lhsOrRhs ? 1 : 2)),
+                        addWarnings(warnings)
+                    );
+                }
+            )
+        );
+
+        // Fill in some cases with null conditions or null values
+        if (cond == null) {
+            suppliers.add(
+                new TestCaseSupplier(TestCaseSupplier.nameFrom(Arrays.asList(DataType.NULL, type)), List.of(DataType.NULL, type), () -> {
+                    Object lhs = randomLiteral(type).value();
+                    List<TestCaseSupplier.TypedData> typedData = List.of(
+                        new TestCaseSupplier.TypedData(null, DataType.NULL, "cond"),
+                        new TestCaseSupplier.TypedData(lhs, type, "lhs")
+                    );
+                    return testCase(
+                        type,
+                        typedData,
+                        lhsOrRhs ? lhs : null,
+                        startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition="),
+                        false,
+                        null,
+                        addWarnings(warnings)
+                    );
+                })
+            );
+            suppliers.add(
+                new TestCaseSupplier(
+                    TestCaseSupplier.nameFrom(Arrays.asList(DataType.NULL, type, type)),
+                    List.of(DataType.NULL, type, type),
+                    () -> {
+                        Object lhs = randomLiteral(type).value();
+                        Object rhs = randomLiteral(type).value();
+                        List<TestCaseSupplier.TypedData> typedData = List.of(
+                            new TestCaseSupplier.TypedData(null, DataType.NULL, "cond"),
+                            new TestCaseSupplier.TypedData(lhs, type, "lhs"),
+                            new TestCaseSupplier.TypedData(rhs, type, "rhs")
+                        );
+                        return testCase(
+                            type,
+                            typedData,
+                            lhsOrRhs ? lhs : rhs,
+                            startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition="),
+                            false,
+                            null,
+                            addWarnings(warnings)
+                        );
+                    }
+                )
+            );
+        }
+        suppliers.add(
+            new TestCaseSupplier(
+                TestCaseSupplier.nameFrom(Arrays.asList(DataType.BOOLEAN, DataType.NULL, type)),
+                List.of(DataType.BOOLEAN, DataType.NULL, type),
+                () -> {
+                    Object rhs = randomLiteral(type).value();
+                    List<TestCaseSupplier.TypedData> typedData = List.of(
+                        cond(cond, "cond"),
+                        new TestCaseSupplier.TypedData(null, DataType.NULL, "lhs"),
+                        new TestCaseSupplier.TypedData(rhs, type, "rhs")
+                    );
+                    return testCase(
+                        type,
+                        typedData,
+                        lhsOrRhs ? null : rhs,
+                        startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition="),
+                        false,
+                        null,
+                        addWarnings(warnings)
+                    );
+                }
+            )
+        );
+        suppliers.add(
+            new TestCaseSupplier(
+                TestCaseSupplier.nameFrom(Arrays.asList(DataType.BOOLEAN, type, DataType.NULL)),
+                List.of(DataType.BOOLEAN, type, DataType.NULL),
+                () -> {
+                    Object lhs = randomLiteral(type).value();
+                    List<TestCaseSupplier.TypedData> typedData = List.of(
+                        cond(cond, "cond"),
+                        new TestCaseSupplier.TypedData(lhs, type, "lhs"),
+                        new TestCaseSupplier.TypedData(null, DataType.NULL, "rhs")
+                    );
+                    return testCase(
+                        type,
+                        typedData,
+                        lhsOrRhs ? lhs : null,
+                        startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition="),
+                        false,
+                        null,
+                        addWarnings(warnings)
+                    );
+                }
+            )
+        );
+    }
+
+    private static void fourAndFiveArgs(
+        List<TestCaseSupplier> suppliers,
+        Object cond1,
+        Object cond2,
+        int result,
+        DataType type,
+        List<String> warnings
+    ) {
+        suppliers.add(
+            new TestCaseSupplier(
+                TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type)),
+                List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type),
+                () -> {
+                    Object r1 = randomLiteral(type).value();
+                    Object r2 = randomLiteral(type).value();
+                    List<TestCaseSupplier.TypedData> typedData = List.of(
+                        cond(cond1, "cond1"),
+                        new TestCaseSupplier.TypedData(r1, type, "r1"),
+                        cond(cond2, "cond2"),
+                        new TestCaseSupplier.TypedData(r2, type, "r2")
+                    );
+                    return testCase(type, typedData, switch (result) {
+                        case 0 -> r1;
+                        case 1 -> r2;
+                        case 2 -> null;
+                        default -> throw new AssertionError("unsupported result " + result);
+                    }, toStringMatcher(2, true), false, null, addWarnings(warnings));
+                }
+            )
+        );
+        suppliers.add(
+            new TestCaseSupplier(
+                TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type, type)),
+                List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type, type),
+                () -> {
+                    Object r1 = randomLiteral(type).value();
+                    Object r2 = randomLiteral(type).value();
+                    Object r3 = randomLiteral(type).value();
+                    List<TestCaseSupplier.TypedData> typedData = List.of(
+                        cond(cond1, "cond1"),
+                        new TestCaseSupplier.TypedData(r1, type, "r1"),
+                        cond(cond2, "cond2"),
+                        new TestCaseSupplier.TypedData(r2, type, "r2"),
+                        new TestCaseSupplier.TypedData(r3, type, "r3")
+                    );
+                    return testCase(type, typedData, switch (result) {
+                        case 0 -> r1;
+                        case 1 -> r2;
+                        case 2 -> r3;
+                        default -> throw new AssertionError("unsupported result " + result);
+                    }, toStringMatcher(2, false), false, null, addWarnings(warnings));
+                }
+            )
+        );
+        // Add some foldable and partially foldable cases. This isn't every combination of fold-ability, but it's many.
+        switch (result) {
+            case 0 -> {
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "foldable " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            Object r3 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1").forceLiteral(),
+                                cond(cond2, "cond2"),
+                                new TestCaseSupplier.TypedData(r2, type, "r2"),
+                                new TestCaseSupplier.TypedData(r3, type, "r3")
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r1,
+                                startsWith("LiteralsEvaluator[lit="),
+                                true,
+                                null,
+                                addBuildEvaluatorWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=LONG, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.LONG,
-                    nullValue()
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "partial foldable " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            Object r3 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1"),
+                                cond(cond2, "cond2"),
+                                new TestCaseSupplier.TypedData(r2, type, "r2"),
+                                new TestCaseSupplier.TypedData(r3, type, "r3")
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r1,
+                                startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition=LiteralsEvaluator[lit="),
+                                false,
+                                List.of(typedData.get(1)),
+                                addBuildEvaluatorWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-            }), new TestCaseSupplier("unsigned_long", List.of(DataType.BOOLEAN, DataType.UNSIGNED_LONG), () -> {
-                BigInteger value = randomUnsignedLongBetween(BigInteger.ZERO, UNSIGNED_LONG_MAX);
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(true, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.UNSIGNED_LONG, "trueValue")
+            }
+            case 1 -> {
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "foldable " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            Object r3 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1").forceLiteral(),
+                                cond(cond2, "cond2").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r2, type, "r2").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r3, type, "r3")
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r2,
+                                startsWith("LiteralsEvaluator[lit="),
+                                true,
+                                null,
+                                addBuildEvaluatorWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=LONG, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.UNSIGNED_LONG,
-                    equalTo(value)
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "partial foldable 1 " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            Object r3 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1").forceLiteral(),
+                                cond(cond2, "cond2").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r2, type, "r2"),
+                                new TestCaseSupplier.TypedData(r3, type, "r3")
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r2,
+                                startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition=LiteralsEvaluator[lit="),
+                                false,
+                                List.of(typedData.get(3)),
+                                addWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-            }), new TestCaseSupplier("ip", List.of(DataType.BOOLEAN, DataType.IP), () -> {
-                BytesRef value = (BytesRef) randomLiteral(DataType.IP).value();
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(true, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.IP, "trueValue")
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "partial foldable 2 " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1").forceLiteral(),
+                                cond(cond2, "cond2").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r2, type, "r2")
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r2,
+                                startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition=LiteralsEvaluator[lit="),
+                                false,
+                                List.of(typedData.get(3)),
+                                addWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=BYTES_REF, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.IP,
-                    equalTo(value)
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "partial foldable 3 " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1").forceLiteral(),
+                                cond(cond2, "cond2"),
+                                new TestCaseSupplier.TypedData(r2, type, "r2")
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r2,
+                                startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition=LiteralsEvaluator[lit="),
+                                false,
+                                typedData.subList(2, 4),
+                                addWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-            }), new TestCaseSupplier("version", List.of(DataType.BOOLEAN, DataType.VERSION), () -> {
-                BytesRef value = (BytesRef) randomLiteral(DataType.VERSION).value();
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(false, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.VERSION, "trueValue")
+            }
+            case 2 -> {
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "foldable " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            Object r3 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1"),
+                                cond(cond2, "cond2").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r2, type, "r2"),
+                                new TestCaseSupplier.TypedData(r3, type, "r3").forceLiteral()
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r3,
+                                startsWith("LiteralsEvaluator[lit="),
+                                true,
+                                null,
+                                addBuildEvaluatorWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=BYTES_REF, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.VERSION,
-                    nullValue()
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "partial foldable 1 " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            Object r3 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1"),
+                                cond(cond2, "cond2").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r2, type, "r2"),
+                                new TestCaseSupplier.TypedData(r3, type, "r3")
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r3,
+                                startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition=LiteralsEvaluator[lit="),
+                                false,
+                                List.of(typedData.get(4)),
+                                addWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-            }), new TestCaseSupplier("cartesian_point", List.of(DataType.BOOLEAN, DataType.CARTESIAN_POINT), () -> {
-                BytesRef value = (BytesRef) randomLiteral(DataType.CARTESIAN_POINT).value();
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(false, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.CARTESIAN_POINT, "trueValue")
+                suppliers.add(
+                    new TestCaseSupplier(
+                        "partial foldable 2 " + TestCaseSupplier.nameFrom(Arrays.asList(cond1, type, cond2, type, type)),
+                        List.of(DataType.BOOLEAN, type, DataType.BOOLEAN, type, type),
+                        () -> {
+                            Object r1 = randomLiteral(type).value();
+                            Object r2 = randomLiteral(type).value();
+                            Object r3 = randomLiteral(type).value();
+                            List<TestCaseSupplier.TypedData> typedData = List.of(
+                                cond(cond1, "cond1").forceLiteral(),
+                                new TestCaseSupplier.TypedData(r1, type, "r1"),
+                                cond(cond2, "cond2"),
+                                new TestCaseSupplier.TypedData(r2, type, "r2"),
+                                new TestCaseSupplier.TypedData(r3, type, "r3")
+                            );
+                            return testCase(
+                                type,
+                                typedData,
+                                r3,
+                                startsWith("CaseEvaluator[conditions=[ConditionEvaluator[condition=LiteralsEvaluator[lit="),
+                                false,
+                                typedData.subList(2, 5),
+                                addWarnings(warnings)
+                            );
+                        }
+                    )
                 );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=BYTES_REF, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.CARTESIAN_POINT,
-                    nullValue()
-                );
-            }), new TestCaseSupplier("geo_point", List.of(DataType.BOOLEAN, DataType.GEO_POINT), () -> {
-                BytesRef value = (BytesRef) randomLiteral(DataType.GEO_POINT).value();
-                List<TestCaseSupplier.TypedData> typedData = List.of(
-                    new TestCaseSupplier.TypedData(true, DataType.BOOLEAN, "cond"),
-                    new TestCaseSupplier.TypedData(value, DataType.GEO_POINT, "trueValue")
-                );
-                return new TestCaseSupplier.TestCase(
-                    typedData,
-                    "CaseEvaluator[resultType=BYTES_REF, conditions=[ConditionEvaluator[condition=Attribute[channel=0], "
-                        + "value=Attribute[channel=1]]], elseVal=LiteralsEvaluator[lit=null]]",
-                    DataType.GEO_POINT,
-                    equalTo(value)
-                );
-            }))
+            }
+            default -> throw new IllegalArgumentException("unsupported " + result);
+        }
+    }
+
+    private static Matcher<String> toStringMatcher(int conditions, boolean trailingNull) {
+        StringBuilder result = new StringBuilder("CaseEvaluator[conditions=[");
+        int channel = 0;
+        for (int i = 0; i < conditions; i++) {
+            if (i != 0) {
+                result.append(", ");
+            }
+            result.append("ConditionEvaluator[condition=Attribute[channel=").append(channel++);
+            result.append("], value=Attribute[channel=").append(channel++).append("]]");
+        }
+        if (trailingNull) {
+            result.append("], elseVal=LiteralsEvaluator[lit=null]]");
+        } else {
+            result.append("], elseVal=Attribute[channel=").append(channel).append("]]");
+        }
+        return equalTo(result.toString());
+    }
+
+    private static TestCaseSupplier.TypedData cond(Object cond, String name) {
+        return new TestCaseSupplier.TypedData(cond instanceof Supplier<?> s ? s.get() : cond, DataType.BOOLEAN, name);
+    }
+
+    private static TestCaseSupplier.TestCase testCase(
+        DataType type,
+        List<TestCaseSupplier.TypedData> typedData,
+        Object result,
+        Matcher<String> evaluatorToString,
+        boolean foldable,
+        @Nullable List<TestCaseSupplier.TypedData> partialFold,
+        Function<TestCaseSupplier.TestCase, TestCaseSupplier.TestCase> decorate
+    ) {
+        if (type == DataType.UNSIGNED_LONG && result != null) {
+            result = NumericUtils.unsignedLongAsBigInteger((Long) result);
+        }
+        return decorate.apply(
+            new TestCaseSupplier.TestCase(typedData, evaluatorToString, type, equalTo(result)).withExtra(new Extra(foldable, partialFold))
         );
     }
 
     @Override
-    protected Expression build(Source source, List<Expression> args) {
+    protected Case build(Source source, List<Expression> args) {
         return new Case(Source.EMPTY, args.get(0), args.subList(1, args.size()));
     }
+
+    private static Supplier<Boolean> randomSingleValuedCondition() {
+        return new Supplier<>() {
+            @Override
+            public Boolean get() {
+                return randomBoolean();
+            }
+
+            @Override
+            public String toString() {
+                return "multivalue";
+            }
+        };
+    }
+
+    private static Supplier<List<Boolean>> randomMultivaluedCondition() {
+        return new Supplier<>() {
+            @Override
+            public List<Boolean> get() {
+                return randomList(2, 100, ESTestCase::randomBoolean);
+            }
+
+            @Override
+            public String toString() {
+                return "multivalue";
+            }
+        };
+    }
+
+    public void testFancyFolding() {
+        if (testCase.getExpectedTypeError() != null) {
+            // Nothing to do
+            return;
+        }
+        Expression e = buildFieldExpression(testCase);
+        if (extra().foldable == false) {
+            assertThat(e.foldable(), equalTo(false));
+            return;
+        }
+        assertThat(e.foldable(), equalTo(true));
+        Object result = e.fold();
+        if (testCase.getExpectedBuildEvaluatorWarnings() != null) {
+            assertWarnings(testCase.getExpectedBuildEvaluatorWarnings());
+        }
+        if (testCase.expectedType() == DataType.UNSIGNED_LONG && result != null) {
+            result = NumericUtils.unsignedLongAsBigInteger((Long) result);
+        }
+        assertThat(result, testCase.getMatcher());
+        if (testCase.getExpectedWarnings() != null) {
+            assertWarnings(testCase.getExpectedWarnings());
+        }
+    }
+
+    public void testPartialFold() {
+        if (testCase.getExpectedTypeError() != null || extra().foldable()) {
+            // Nothing to do
+            return;
+        }
+        Case c = (Case) buildFieldExpression(testCase);
+        if (extra().expectedPartialFold == null) {
+            assertThat(c.partiallyFold(), sameInstance(c));
+            return;
+        }
+        if (extra().expectedPartialFold.size() == 1) {
+            assertThat(c.partiallyFold(), equalTo(extra().expectedPartialFold.get(0).asField()));
+            return;
+        }
+        Case expected = build(
+            Source.synthetic("expected"),
+            extra().expectedPartialFold.stream().map(TestCaseSupplier.TypedData::asField).toList()
+        );
+        assertThat(c.partiallyFold(), equalTo(expected));
+    }
+
+    private static Function<TestCaseSupplier.TestCase, TestCaseSupplier.TestCase> addWarnings(List<String> warnings) {
+        return c -> {
+            TestCaseSupplier.TestCase r = c;
+            for (String warning : warnings) {
+                r = r.withWarning(warning);
+            }
+            return r;
+        };
+    }
+
+    private static Function<TestCaseSupplier.TestCase, TestCaseSupplier.TestCase> addBuildEvaluatorWarnings(List<String> warnings) {
+        return c -> {
+            TestCaseSupplier.TestCase r = c;
+            for (String warning : warnings) {
+                r = r.withBuildEvaluatorWarning(warning);
+            }
+            return r;
+        };
+    }
+
+    private record Extra(boolean foldable, List<TestCaseSupplier.TypedData> expectedPartialFold) {}
+
+    private Extra extra() {
+        return (Extra) testCase.extra();
+    }
+
+    @Override
+    protected Matcher<Object> allNullsMatcher() {
+        if (extra().foldable) {
+            return testCase.getMatcher();
+        }
+        return super.allNullsMatcher();
+    }
+
+    private static String typeErrorMessage(boolean includeOrdinal, List<DataType> types) {
+        if (types.get(0) != DataType.BOOLEAN && types.get(0) != DataType.NULL) {
+            return typeErrorMessage(includeOrdinal, types, 0, "boolean");
+        }
+        DataType mainType = types.get(1);
+        for (int i = 2; i < types.size(); i++) {
+            if (i % 2 == 0 && i != types.size() - 1) {
+                // condition
+                if (types.get(i) != DataType.BOOLEAN && types.get(i) != DataType.NULL) {
+                    return typeErrorMessage(includeOrdinal, types, i, "boolean");
+                }
+            } else {
+                // value
+                if (types.get(i) != mainType) {
+                    return typeErrorMessage(includeOrdinal, types, i, mainType.typeName());
+                }
+            }
+        }
+        throw new IllegalStateException("can't find bad arg for " + types);
+    }
+
+    private static String typeErrorMessage(boolean includeOrdinal, List<DataType> types, int badArgPosition, String expectedTypeString) {
+        String ordinal = includeOrdinal ? TypeResolutions.ParamOrdinal.fromIndex(badArgPosition).name().toLowerCase(Locale.ROOT) + " " : "";
+        String name = types.get(badArgPosition).typeName();
+        return ordinal + "argument of [] must be [" + expectedTypeString + "], found value [" + name + "] type [" + name + "]";
+    }
 }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatePeriodTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatePeriodTests.java
new file mode 100644
index 000000000000..c7e18e453df0
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatePeriodTests.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.convert;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase;
+import org.elasticsearch.xpack.esql.expression.function.FunctionName;
+import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
+import org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter;
+
+import java.time.Period;
+import java.time.temporal.TemporalAmount;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.randomLiteral;
+import static org.elasticsearch.xpack.esql.core.type.DataType.DATE_PERIOD;
+import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
+import static org.elasticsearch.xpack.esql.core.type.DataType.TEXT;
+import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.DATE_PERIODS;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.matchesPattern;
+
+@FunctionName("to_dateperiod")
+public class ToDatePeriodTests extends AbstractScalarFunctionTestCase {
+    public ToDatePeriodTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
+        this.testCase = testCaseSupplier.get();
+    }
+
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() {
+        List<TestCaseSupplier> suppliers = new ArrayList<>();
+
+        suppliers.add(new TestCaseSupplier(List.of(DATE_PERIOD), () -> {
+            Period field = (Period) randomLiteral(DATE_PERIOD).value();
+            return new TestCaseSupplier.TestCase(
+                List.of(new TestCaseSupplier.TypedData(field, DATE_PERIOD, "field").forceLiteral()),
+                matchesPattern("LiteralsEvaluator.*"),
+                DATE_PERIOD,
+                equalTo(field)
+            );
+        }));
+
+        for (EsqlDataTypeConverter.INTERVALS interval : DATE_PERIODS) {
+            for (DataType inputType : List.of(KEYWORD, TEXT)) {
+                suppliers.add(new TestCaseSupplier(List.of(inputType), () -> {
+                    BytesRef field = new BytesRef(
+                        " ".repeat(randomIntBetween(0, 10)) + (randomBoolean() ? "" : "-") + randomIntBetween(0, 36500000) + " ".repeat(
+                            randomIntBetween(1, 10)
+                        ) + interval.toString() + " ".repeat(randomIntBetween(0, 10))
+                    );
+                    TemporalAmount result = EsqlDataTypeConverter.parseTemporalAmount(field.utf8ToString(), DATE_PERIOD);
+                    return new TestCaseSupplier.TestCase(
+                        List.of(new TestCaseSupplier.TypedData(field, inputType, "field").forceLiteral()),
+                        matchesPattern("LiteralsEvaluator.*"),
+                        DATE_PERIOD,
+                        equalTo(result)
+                    );
+                }));
+            }
+        }
+        return parameterSuppliersFromTypedData(
+            errorsForCasesWithoutExamples(anyNullIsNull(true, suppliers), (v, p) -> "date_period or string")
+        );
+    }
+
+    @Override
+    protected Expression build(Source source, List<Expression> args) {
+        return new ToDatePeriod(source, args.get(0));
+    }
+
+    @Override
+    public void testSerializationOfSimple() {
+        assertTrue("Serialization test does not apply", true);
+    }
+}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToTimeDurationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToTimeDurationTests.java
new file mode 100644
index 000000000000..b3f666ec6c5c
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToTimeDurationTests.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.convert;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase;
+import org.elasticsearch.xpack.esql.expression.function.FunctionName;
+import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
+import org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter;
+
+import java.time.Duration;
+import java.time.temporal.TemporalAmount;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.randomLiteral;
+import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
+import static org.elasticsearch.xpack.esql.core.type.DataType.TEXT;
+import static org.elasticsearch.xpack.esql.core.type.DataType.TIME_DURATION;
+import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.TIME_DURATIONS;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.matchesPattern;
+
+@FunctionName("to_timeduration")
+public class ToTimeDurationTests extends AbstractScalarFunctionTestCase {
+    public ToTimeDurationTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
+        this.testCase = testCaseSupplier.get();
+    }
+
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() {
+        List<TestCaseSupplier> suppliers = new ArrayList<>();
+
+        suppliers.add(new TestCaseSupplier(List.of(TIME_DURATION), () -> {
+            Duration field = (Duration) randomLiteral(TIME_DURATION).value();
+            return new TestCaseSupplier.TestCase(
+                List.of(new TestCaseSupplier.TypedData(field, TIME_DURATION, "field").forceLiteral()),
+                matchesPattern("LiteralsEvaluator.*"),
+                TIME_DURATION,
+                equalTo(field)
+            );
+        }));
+
+        for (EsqlDataTypeConverter.INTERVALS interval : TIME_DURATIONS) {
+            for (DataType inputType : List.of(KEYWORD, TEXT)) {
+                suppliers.add(new TestCaseSupplier(List.of(inputType), () -> {
+                    BytesRef field = new BytesRef(
+                        " ".repeat(randomIntBetween(0, 10)) + (randomBoolean() ? "" : "-") + randomIntBetween(0, Integer.MAX_VALUE) + " "
+                            .repeat(randomIntBetween(1, 10)) + interval.toString() + " ".repeat(randomIntBetween(0, 10))
+                    );
+                    TemporalAmount result = EsqlDataTypeConverter.parseTemporalAmount(field.utf8ToString(), TIME_DURATION);
+                    return new TestCaseSupplier.TestCase(
+                        List.of(new TestCaseSupplier.TypedData(field, inputType, "field").forceLiteral()),
+                        matchesPattern("LiteralsEvaluator.*"),
+                        TIME_DURATION,
+                        equalTo(result)
+                    );
+                }));
+            }
+        }
+        return parameterSuppliersFromTypedData(
+            errorsForCasesWithoutExamples(anyNullIsNull(true, suppliers), (v, p) -> "time_duration or string")
+        );
+    }
+
+    @Override
+    protected Expression build(Source source, List<Expression> args) {
+        return new ToTimeDuration(source, args.get(0));
+    }
+
+    @Override
+    public void testSerializationOfSimple() {
+        assertTrue("Serialization test does not apply", true);
+    }
+}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationSerializationTests.java
new file mode 100644
index 000000000000..6a63c38c924d
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationSerializationTests.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.multivalue;
+
+import org.elasticsearch.xpack.esql.expression.AbstractExpressionSerializationTests;
+
+import java.io.IOException;
+
+public class MvMedianAbsoluteDeviationSerializationTests extends AbstractExpressionSerializationTests<MvMedianAbsoluteDeviation> {
+    @Override
+    protected MvMedianAbsoluteDeviation createTestInstance() {
+        return new MvMedianAbsoluteDeviation(randomSource(), randomChild());
+    }
+
+    @Override
+    protected MvMedianAbsoluteDeviation mutateInstance(MvMedianAbsoluteDeviation instance) throws IOException {
+        return new MvMedianAbsoluteDeviation(
+            instance.source(),
+            randomValueOtherThan(instance.field(), AbstractExpressionSerializationTests::randomChild)
+        );
+    }
+
+    @Override
+    protected boolean alwaysEmptySource() {
+        return true;
+    }
+}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationTests.java
new file mode 100644
index 000000000000..b041faf6510a
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvMedianAbsoluteDeviationTests.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.multivalue;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.core.type.DataTypeConverter;
+import org.elasticsearch.xpack.esql.core.util.NumericUtils;
+import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import static org.hamcrest.Matchers.equalTo;
+
+public class MvMedianAbsoluteDeviationTests extends AbstractMultivalueFunctionTestCase {
+    public MvMedianAbsoluteDeviationTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
+        this.testCase = testCaseSupplier.get();
+    }
+
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() {
+        List<TestCaseSupplier> cases = new ArrayList<>();
+        doubles(cases, "mv_median_absolute_deviation", "MvMedianAbsoluteDeviation", (size, valuesStream) -> {
+            var values = valuesStream.sorted().toArray();
+            int middle = size / 2;
+            if (size % 2 == 1) {
+                double median = values[middle];
+                return equalTo(Arrays.stream(values).map(d -> Math.abs(d - median)).sorted().skip(middle).findFirst().orElseThrow());
+            } else {
+                double median = (values[middle - 1] + values[middle]) / 2;
+                return equalTo(
+                    Arrays.stream(values).map(d -> Math.abs(d - median)).sorted().skip(middle - 1).limit(2).average().orElseThrow()
+                );
+            }
+        });
+        ints(cases, "mv_median_absolute_deviation", "MvMedianAbsoluteDeviation", (size, values) -> {
+            var mad = calculateMedianAbsoluteDeviation(size, values.mapToObj(BigInteger::valueOf));
+            return equalTo(mad.intValue());
+        });
+        longs(cases, "mv_median_absolute_deviation", "MvMedianAbsoluteDeviation", (size, values) -> {
+            var mad = calculateMedianAbsoluteDeviation(size, values.mapToObj(BigInteger::valueOf));
+            return equalTo(mad.longValue());
+        });
+        unsignedLongs(cases, "mv_median_absolute_deviation", "MvMedianAbsoluteDeviation", (size, values) -> {
+            var mad = calculateMedianAbsoluteDeviation(size, values);
+            return equalTo(mad);
+        });
+
+        // Simple cases
+        cases.addAll(makeCases(List.of(1, 2, 5), 1, true));
+        cases.addAll(makeCases(List.of(1, 2), 0, false));
+        cases.addAll(makeCases(List.of(-1, -2), 0, false));
+        cases.addAll(makeCases(List.of(0, 2, 5, 6), 2, false));
+
+        // Overflow cases
+        cases.addAll(
+            overflowCasesFor(
+                DataType.INTEGER,
+                Integer.MAX_VALUE,
+                Integer.MIN_VALUE,
+                Integer.MAX_VALUE,
+                Integer.MAX_VALUE / 2,
+                Integer.MAX_VALUE / 2 + 1
+            )
+        );
+        cases.addAll(
+            overflowCasesFor(DataType.LONG, Long.MAX_VALUE, Long.MIN_VALUE, Long.MAX_VALUE, Long.MAX_VALUE / 2L, Long.MAX_VALUE / 2L + 1)
+        );
+        cases.addAll(
+            overflowCasesFor(
+                DataType.DOUBLE,
+                Double.MAX_VALUE,
+                -Double.MAX_VALUE,
+                Double.MAX_VALUE,
+                Double.MAX_VALUE / 2.,
+                Double.MAX_VALUE / 2.
+            )
+        );
+        cases.addAll(
+            overflowCasesFor(
+                DataType.UNSIGNED_LONG,
+                NumericUtils.asLongUnsigned(NumericUtils.UNSIGNED_LONG_MAX),
+                NumericUtils.ZERO_AS_UNSIGNED_LONG,
+                NumericUtils.UNSIGNED_LONG_MAX.divide(BigInteger.valueOf(2)),
+                NumericUtils.UNSIGNED_LONG_MAX.divide(BigInteger.valueOf(2)),
+                BigInteger.ZERO
+            )
+        );
+
+        // Custom double overflow. Can't be checked in the generic overflow cases, as "MAX_DOUBLE + 1000 == MAX_DOUBLE"
+        cases.add(
+            new TestCaseSupplier(
+                "mv_median_absolute_deviation(<min_double, big_number, same_big_number>)",
+                List.of(DataType.DOUBLE),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(
+                        new TestCaseSupplier.TypedData(
+                            List.of(-Double.MAX_VALUE, Double.MAX_VALUE / 4, Double.MAX_VALUE / 4),
+                            DataType.DOUBLE,
+                            "field"
+                        )
+                    ),
+                    "MvMedianAbsoluteDeviation[field=Attribute[channel=0]]",
+                    DataType.DOUBLE,
+                    equalTo(0.)
+                )
+            )
+        );
+
+        return parameterSuppliersFromTypedDataWithDefaultChecks(false, cases, (v, p) -> "numeric");
+    }
+
+    /**
+     * Makes cases for the given data, for each type
+     */
+    private static List<TestCaseSupplier> makeCases(List<Number> data, Number expectedResult, boolean withDoubles) {
+        var types = new ArrayList<>(List.of(DataType.INTEGER, DataType.LONG));
+        if (withDoubles) {
+            types.add(DataType.DOUBLE);
+        }
+        if (data.stream().noneMatch(d -> d.doubleValue() < 0)) {
+            types.add(DataType.UNSIGNED_LONG);
+        }
+        return types.stream().map(type -> {
+            var convertedData = data.stream().map(d -> {
+                var convertedValue = DataTypeConverter.convert(d, type);
+                if (convertedValue instanceof BigInteger bi) {
+                    return NumericUtils.asLongUnsigned(bi);
+                }
+                return convertedValue;
+            }).toList();
+
+            return new TestCaseSupplier(
+                "<" + convertedData + "> (" + type + ")",
+                List.of(type),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(new TestCaseSupplier.TypedData(convertedData, type, "field")),
+                    "MvMedianAbsoluteDeviation[field=Attribute[channel=0]]",
+                    type,
+                    equalTo(DataTypeConverter.convert(expectedResult, type))
+                )
+            );
+        }).toList();
+    }
+
+    private static List<TestCaseSupplier> overflowCasesFor(
+        DataType type,
+        Number max,
+        Number min,
+        Number maxMinMad,
+        Number maxZeroMad,
+        Number minZeroMad
+    ) {
+        var zeroExpected = DataTypeConverter.convert(0, type);
+        var zeroValue = type == DataType.UNSIGNED_LONG ? NumericUtils.ZERO_AS_UNSIGNED_LONG : zeroExpected;
+        var oneThousandValue = type == DataType.UNSIGNED_LONG
+            ? NumericUtils.asLongUnsigned(BigInteger.valueOf(1000))
+            : DataTypeConverter.convert(1000, type);
+
+        var typeName = type.name().toLowerCase(Locale.ROOT);
+
+        return List.of(
+            new TestCaseSupplier(
+                "mv_median_absolute_deviation(<max_" + typeName + ", min_" + typeName + ">)",
+                List.of(type),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(new TestCaseSupplier.TypedData(List.of(max, min), type, "field")),
+                    "MvMedianAbsoluteDeviation[field=Attribute[channel=0]]",
+                    type,
+                    equalTo(maxMinMad)
+                )
+            ),
+            new TestCaseSupplier(
+                "mv_median_absolute_deviation(<max_" + typeName + ", 0>)",
+                List.of(type),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(new TestCaseSupplier.TypedData(List.of(max, zeroValue), type, "field")),
+                    "MvMedianAbsoluteDeviation[field=Attribute[channel=0]]",
+                    type,
+                    equalTo(maxZeroMad)
+                )
+            ),
+            new TestCaseSupplier(
+                "mv_median_absolute_deviation(<min_" + typeName + ", 0>)",
+                List.of(type),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(new TestCaseSupplier.TypedData(List.of(min, zeroValue), type, "field")),
+                    "MvMedianAbsoluteDeviation[field=Attribute[channel=0]]",
+                    type,
+                    equalTo(minZeroMad)
+                )
+            ),
+            new TestCaseSupplier(
+                "mv_median_absolute_deviation(<max_" + typeName + ", max_" + typeName + ">)",
+                List.of(type),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(new TestCaseSupplier.TypedData(List.of(max, max), type, "field")),
+                    "MvMedianAbsoluteDeviation[field=Attribute[channel=0]]",
+                    type,
+                    equalTo(zeroExpected)
+                )
+            ),
+            new TestCaseSupplier(
+                "mv_median_absolute_deviation(<min_" + typeName + ", min_" + typeName + ">)",
+                List.of(type),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(new TestCaseSupplier.TypedData(List.of(min, min), type, "field")),
+                    "MvMedianAbsoluteDeviation[field=Attribute[channel=0]]",
+                    type,
+                    equalTo(zeroExpected)
+                )
+            ),
+            new TestCaseSupplier(
+                "mv_median_absolute_deviation(<min_" + typeName + ", 1000, 1000>)",
+                List.of(type),
+                () -> new TestCaseSupplier.TestCase(
+                    List.of(new TestCaseSupplier.TypedData(List.of(min, oneThousandValue, oneThousandValue), type, "field")),
+                    "MvMedianAbsoluteDeviation[field=Attribute[channel=0]]",
+                    type,
+                    equalTo(zeroExpected)
+                )
+            )
+        );
+    }
+
+    private static BigInteger calculateMedianAbsoluteDeviation(int size, Stream<BigInteger> valuesStream) {
+        var values = valuesStream.sorted().toArray(BigInteger[]::new);
+        int middle = size / 2;
+        if (size % 2 == 1) {
+            var median = values[middle];
+            return Arrays.stream(values).map(bi -> bi.subtract(median).abs()).sorted().skip(middle).findFirst().orElseThrow();
+        } else {
+            var median = values[middle - 1].add(values[middle]).divide(BigInteger.valueOf(2));
+            return Arrays.stream(values)
+                .map(bi -> bi.subtract(median).abs())
+                .sorted()
+                .skip(middle - 1)
+                .limit(2)
+                .reduce(BigInteger.ZERO, BigInteger::add)
+                .divide(BigInteger.valueOf(2));
+        }
+    }
+
+    @Override
+    protected Expression build(Source source, Expression field) {
+        return new MvMedianAbsoluteDeviation(source, field);
+    }
+}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceSerializationTests.java
new file mode 100644
index 000000000000..bf3b15145e0f
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceSerializationTests.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.string;
+
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.expression.AbstractExpressionSerializationTests;
+
+import java.io.IOException;
+
+public class SpaceSerializationTests extends AbstractExpressionSerializationTests<Space> {
+    @Override
+    protected Space createTestInstance() {
+        Source source = randomSource();
+        Expression number = randomChild();
+        return new Space(source, number);
+    }
+
+    @Override
+    protected Space mutateInstance(Space instance) throws IOException {
+        Source source = instance.source();
+        Expression number = instance.field();
+        number = randomValueOtherThan(number, AbstractExpressionSerializationTests::randomChild);
+        return new Space(source, number);
+    }
+}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceTests.java
new file mode 100644
index 000000000000..308ce2c9d932
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/SpaceTests.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.expression.function.scalar.string;
+
+import com.carrotsearch.randomizedtesting.annotations.Name;
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.apache.lucene.util.BytesRef;
+import org.elasticsearch.xpack.esql.core.expression.Expression;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase;
+import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+
+import static org.elasticsearch.common.unit.ByteSizeUnit.MB;
+import static org.hamcrest.Matchers.nullValue;
+
+public class SpaceTests extends AbstractScalarFunctionTestCase {
+    public SpaceTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
+        this.testCase = testCaseSupplier.get();
+    }
+
+    @ParametersFactory
+    public static Iterable<Object[]> parameters() {
+
+        List<TestCaseSupplier> cases = new ArrayList<>();
+
+        TestCaseSupplier.forUnaryInt(
+            cases,
+            "SpaceEvaluator[number=Attribute[channel=0]]",
+            DataType.KEYWORD,
+            i -> new BytesRef(" ".repeat(i)),
+            0,
+            10,
+            List.of()
+        );
+
+        cases.add(new TestCaseSupplier("Space with negative number", List.of(DataType.INTEGER), () -> {
+            int number = randomIntBetween(-10, -1);
+            return new TestCaseSupplier.TestCase(
+                List.of(new TestCaseSupplier.TypedData(number, DataType.INTEGER, "number")),
+                "SpaceEvaluator[number=Attribute[channel=0]]",
+                DataType.KEYWORD,
+                nullValue()
+            ).withWarning("Line -1:-1: evaluation of [] failed, treating result as null. Only first 20 failures recorded.")
+                .withWarning("Line -1:-1: java.lang.IllegalArgumentException: Number parameter cannot be negative, found [" + number + "]")
+                .withFoldingException(IllegalArgumentException.class, "Number parameter cannot be negative, found [" + number + "]");
+        }));
+
+        cases.add(new TestCaseSupplier("Space with number too large", List.of(DataType.INTEGER), () -> {
+            int max = (int) MB.toBytes(1);
+            int number = randomIntBetween(max + 1, max + 10);
+            return new TestCaseSupplier.TestCase(
+                List.of(new TestCaseSupplier.TypedData(number, DataType.INTEGER, "number")),
+                "SpaceEvaluator[number=Attribute[channel=0]]",
+                DataType.KEYWORD,
+                nullValue()
+            ).withWarning("Line -1:-1: evaluation of [] failed, treating result as null. Only first 20 failures recorded.")
+                .withWarning(
+                    "Line -1:-1: java.lang.IllegalArgumentException: Creating strings longer than [" + max + "] bytes is not supported"
+                )
+                .withFoldingException(IllegalArgumentException.class, "Creating strings longer than [" + max + "] bytes is not supported");
+        }));
+
+        return parameterSuppliersFromTypedDataWithDefaultChecks(true, cases, (v, p) -> "integer");
+    }
+
+    @Override
+    protected Expression build(Source source, List<Expression> args) {
+        return new Space(source, args.get(0));
+    }
+}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalLogicalPlanOptimizerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalLogicalPlanOptimizerTests.java
index 3eef969f8f93..eba31cd1cf10 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalLogicalPlanOptimizerTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalLogicalPlanOptimizerTests.java
@@ -62,12 +62,12 @@
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.TEST_VERIFIER;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.as;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.getFieldAttribute;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.greaterThanOf;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.loadMapping;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.statsForExistingField;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.statsForMissingField;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.withDefaultLimitWarning;
 import static org.elasticsearch.xpack.esql.core.tree.Source.EMPTY;
-import static org.elasticsearch.xpack.esql.optimizer.LogicalPlanOptimizerTests.greaterThanOf;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java
index c769d01e7381..22a4b410a6d7 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java
@@ -34,14 +34,10 @@
 import org.elasticsearch.xpack.esql.core.expression.Nullability;
 import org.elasticsearch.xpack.esql.core.expression.ReferenceAttribute;
 import org.elasticsearch.xpack.esql.core.expression.UnresolvedAttribute;
-import org.elasticsearch.xpack.esql.core.expression.predicate.Predicates;
 import org.elasticsearch.xpack.esql.core.expression.predicate.logical.And;
 import org.elasticsearch.xpack.esql.core.expression.predicate.logical.Or;
 import org.elasticsearch.xpack.esql.core.expression.predicate.nulls.IsNotNull;
-import org.elasticsearch.xpack.esql.core.expression.predicate.nulls.IsNull;
 import org.elasticsearch.xpack.esql.core.expression.predicate.operator.comparison.BinaryComparison;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLikePattern;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardPattern;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.core.type.EsField;
@@ -50,17 +46,12 @@
 import org.elasticsearch.xpack.esql.expression.Order;
 import org.elasticsearch.xpack.esql.expression.function.EsqlFunctionRegistry;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.AggregateFunction;
-import org.elasticsearch.xpack.esql.expression.function.aggregate.Avg;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Count;
-import org.elasticsearch.xpack.esql.expression.function.aggregate.CountDistinct;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.FromPartial;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Max;
-import org.elasticsearch.xpack.esql.expression.function.aggregate.Median;
-import org.elasticsearch.xpack.esql.expression.function.aggregate.MedianAbsoluteDeviation;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Min;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Percentile;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Rate;
-import org.elasticsearch.xpack.esql.expression.function.aggregate.SpatialCentroid;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Sum;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.ToPartial;
 import org.elasticsearch.xpack.esql.expression.function.aggregate.Values;
@@ -69,30 +60,16 @@
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToInteger;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToLong;
 import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToString;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateExtract;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateFormat;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateParse;
-import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateTrunc;
-import org.elasticsearch.xpack.esql.expression.function.scalar.ip.CIDRMatch;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.Cos;
-import org.elasticsearch.xpack.esql.expression.function.scalar.math.Pow;
 import org.elasticsearch.xpack.esql.expression.function.scalar.math.Round;
-import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.AbstractMultivalueFunction;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvAvg;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvCount;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvDedupe;
-import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvFirst;
-import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvLast;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMax;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMedian;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMin;
 import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvSum;
 import org.elasticsearch.xpack.esql.expression.function.scalar.nulls.Coalesce;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.Concat;
-import org.elasticsearch.xpack.esql.expression.function.scalar.string.LTrim;
-import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
-import org.elasticsearch.xpack.esql.expression.function.scalar.string.Substring;
-import org.elasticsearch.xpack.esql.expression.function.scalar.string.WildcardLike;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Add;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Div;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Mod;
@@ -102,18 +79,12 @@
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.EsqlBinaryComparison;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThan;
-import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThanOrEqual;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.In;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.LessThan;
-import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.LessThanOrEqual;
-import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.NotEquals;
 import org.elasticsearch.xpack.esql.index.EsIndex;
 import org.elasticsearch.xpack.esql.index.IndexResolution;
-import org.elasticsearch.xpack.esql.optimizer.rules.logical.FoldNull;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.LiteralsOnTheRight;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.OptimizerRules;
-import org.elasticsearch.xpack.esql.optimizer.rules.logical.PropagateNullable;
-import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownAndCombineFilters;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownAndCombineLimits;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownEnrich;
 import org.elasticsearch.xpack.esql.optimizer.rules.logical.PushDownEval;
@@ -145,7 +116,6 @@
 import org.elasticsearch.xpack.esql.plan.logical.local.LocalSupplier;
 import org.junit.BeforeClass;
 
-import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -160,9 +130,11 @@
 import static org.elasticsearch.test.ListMatcher.matchesList;
 import static org.elasticsearch.test.MapMatcher.assertMap;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.L;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.ONE;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.TEST_VERIFIER;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.THREE;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.TWO;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.as;
-import static org.elasticsearch.xpack.esql.EsqlTestUtils.configuration;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.emptySource;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.getFieldAttribute;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.loadMapping;
@@ -171,21 +143,12 @@
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.withDefaultLimitWarning;
 import static org.elasticsearch.xpack.esql.analysis.Analyzer.NO_FIELDS;
 import static org.elasticsearch.xpack.esql.analysis.AnalyzerTestUtils.analyze;
-import static org.elasticsearch.xpack.esql.core.expression.Literal.FALSE;
 import static org.elasticsearch.xpack.esql.core.expression.Literal.NULL;
-import static org.elasticsearch.xpack.esql.core.expression.Literal.TRUE;
 import static org.elasticsearch.xpack.esql.core.tree.Source.EMPTY;
-import static org.elasticsearch.xpack.esql.core.type.DataType.BOOLEAN;
 import static org.elasticsearch.xpack.esql.core.type.DataType.DOUBLE;
 import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_POINT;
-import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_SHAPE;
 import static org.elasticsearch.xpack.esql.core.type.DataType.INTEGER;
-import static org.elasticsearch.xpack.esql.core.type.DataType.IP;
 import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
-import static org.elasticsearch.xpack.esql.core.type.DataType.LONG;
-import static org.elasticsearch.xpack.esql.core.type.DataType.TEXT;
-import static org.elasticsearch.xpack.esql.core.type.DataType.UNSIGNED_LONG;
-import static org.elasticsearch.xpack.esql.core.type.DataType.VERSION;
 import static org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.EsqlBinaryComparison.BinaryComparisonOperation.EQ;
 import static org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.EsqlBinaryComparison.BinaryComparisonOperation.GT;
 import static org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.EsqlBinaryComparison.BinaryComparisonOperation.GTE;
@@ -209,9 +172,6 @@
 //@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE", reason = "debug")
 public class LogicalPlanOptimizerTests extends ESTestCase {
 
-    private static final Literal ONE = L(1);
-    private static final Literal TWO = L(2);
-    private static final Literal THREE = L(3);
     private static EsqlParser parser;
     private static Analyzer analyzer;
     private static LogicalPlanOptimizer logicalOptimizer;
@@ -760,102 +720,6 @@ public void testMultipleCombineLimits() {
         );
     }
 
-    public static GreaterThan greaterThanOf(Expression left, Expression right) {
-        return new GreaterThan(EMPTY, left, right, randomZone());
-    }
-
-    public static LessThan lessThanOf(Expression left, Expression right) {
-        return new LessThan(EMPTY, left, right, randomZone());
-    }
-
-    public static GreaterThanOrEqual greaterThanOrEqualOf(Expression left, Expression right) {
-        return new GreaterThanOrEqual(EMPTY, left, right, randomZone());
-    }
-
-    public void testCombineFilters() {
-        EsRelation relation = relation();
-        GreaterThan conditionA = greaterThanOf(getFieldAttribute("a"), ONE);
-        LessThan conditionB = lessThanOf(getFieldAttribute("b"), TWO);
-
-        Filter fa = new Filter(EMPTY, relation, conditionA);
-        Filter fb = new Filter(EMPTY, fa, conditionB);
-
-        assertEquals(new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB)), new PushDownAndCombineFilters().apply(fb));
-    }
-
-    public void testCombineFiltersLikeRLike() {
-        EsRelation relation = relation();
-        RLike conditionA = rlike(getFieldAttribute("a"), "foo");
-        WildcardLike conditionB = wildcardLike(getFieldAttribute("b"), "bar");
-
-        Filter fa = new Filter(EMPTY, relation, conditionA);
-        Filter fb = new Filter(EMPTY, fa, conditionB);
-
-        assertEquals(new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB)), new PushDownAndCombineFilters().apply(fb));
-    }
-
-    public void testPushDownFilter() {
-        EsRelation relation = relation();
-        GreaterThan conditionA = greaterThanOf(getFieldAttribute("a"), ONE);
-        LessThan conditionB = lessThanOf(getFieldAttribute("b"), TWO);
-
-        Filter fa = new Filter(EMPTY, relation, conditionA);
-        List<FieldAttribute> projections = singletonList(getFieldAttribute("b"));
-        EsqlProject keep = new EsqlProject(EMPTY, fa, projections);
-        Filter fb = new Filter(EMPTY, keep, conditionB);
-
-        Filter combinedFilter = new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB));
-        assertEquals(new EsqlProject(EMPTY, combinedFilter, projections), new PushDownAndCombineFilters().apply(fb));
-    }
-
-    public void testPushDownLikeRlikeFilter() {
-        EsRelation relation = relation();
-        org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLike conditionA = rlike(getFieldAttribute("a"), "foo");
-        WildcardLike conditionB = wildcardLike(getFieldAttribute("b"), "bar");
-
-        Filter fa = new Filter(EMPTY, relation, conditionA);
-        List<FieldAttribute> projections = singletonList(getFieldAttribute("b"));
-        EsqlProject keep = new EsqlProject(EMPTY, fa, projections);
-        Filter fb = new Filter(EMPTY, keep, conditionB);
-
-        Filter combinedFilter = new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB));
-        assertEquals(new EsqlProject(EMPTY, combinedFilter, projections), new PushDownAndCombineFilters().apply(fb));
-    }
-
-    // from ... | where a > 1 | stats count(1) by b | where count(1) >= 3 and b < 2
-    // => ... | where a > 1 and b < 2 | stats count(1) by b | where count(1) >= 3
-    public void testSelectivelyPushDownFilterPastFunctionAgg() {
-        EsRelation relation = relation();
-        GreaterThan conditionA = greaterThanOf(getFieldAttribute("a"), ONE);
-        LessThan conditionB = lessThanOf(getFieldAttribute("b"), TWO);
-        GreaterThanOrEqual aggregateCondition = greaterThanOrEqualOf(new Count(EMPTY, ONE), THREE);
-
-        Filter fa = new Filter(EMPTY, relation, conditionA);
-        // invalid aggregate but that's fine cause its properties are not used by this rule
-        Aggregate aggregate = new Aggregate(
-            EMPTY,
-            fa,
-            Aggregate.AggregateType.STANDARD,
-            singletonList(getFieldAttribute("b")),
-            emptyList()
-        );
-        Filter fb = new Filter(EMPTY, aggregate, new And(EMPTY, aggregateCondition, conditionB));
-
-        // expected
-        Filter expected = new Filter(
-            EMPTY,
-            new Aggregate(
-                EMPTY,
-                new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB)),
-                Aggregate.AggregateType.STANDARD,
-                singletonList(getFieldAttribute("b")),
-                emptyList()
-            ),
-            aggregateCondition
-        );
-        assertEquals(expected, new PushDownAndCombineFilters().apply(fb));
-    }
-
     public void testSelectivelyPushDownFilterPastRefAgg() {
         // expected plan: "from test | where emp_no > 1 and emp_no < 3 | stats x = count(1) by emp_no | where x > 7"
         LogicalPlan plan = optimizedPlan("""
@@ -4972,316 +4836,11 @@ public void testSimplifyComparisonArithmeticSkippedOnFloats() {
         }
     }
 
-    public static WildcardLike wildcardLike(Expression left, String exp) {
-        return new WildcardLike(EMPTY, left, new WildcardPattern(exp));
-    }
-
-    public static RLike rlike(Expression left, String exp) {
-        return new RLike(EMPTY, left, new RLikePattern(exp));
-    }
-
     @Override
     protected List<String> filteredWarnings() {
         return withDefaultLimitWarning(super.filteredWarnings());
     }
 
-    // Null folding
-
-    public void testBasicNullFolding() {
-        FoldNull rule = new FoldNull();
-        assertNullLiteral(rule.rule(new Add(EMPTY, L(randomInt()), Literal.NULL)));
-        assertNullLiteral(rule.rule(new Round(EMPTY, Literal.NULL, null)));
-        assertNullLiteral(rule.rule(new Pow(EMPTY, Literal.NULL, Literal.NULL)));
-        assertNullLiteral(rule.rule(new DateFormat(EMPTY, Literal.NULL, Literal.NULL, null)));
-        assertNullLiteral(rule.rule(new DateParse(EMPTY, Literal.NULL, Literal.NULL)));
-        assertNullLiteral(rule.rule(new DateTrunc(EMPTY, Literal.NULL, Literal.NULL)));
-        assertNullLiteral(rule.rule(new Substring(EMPTY, Literal.NULL, Literal.NULL, Literal.NULL)));
-    }
-
-    public void testNullFoldingIsNull() {
-        FoldNull foldNull = new FoldNull();
-        assertEquals(true, foldNull.rule(new IsNull(EMPTY, NULL)).fold());
-        assertEquals(false, foldNull.rule(new IsNull(EMPTY, TRUE)).fold());
-    }
-
-    public void testNullFoldingIsNotNull() {
-        FoldNull foldNull = new FoldNull();
-        assertEquals(true, foldNull.rule(new IsNotNull(EMPTY, TRUE)).fold());
-        assertEquals(false, foldNull.rule(new IsNotNull(EMPTY, NULL)).fold());
-    }
-
-    public void testGenericNullableExpression() {
-        FoldNull rule = new FoldNull();
-        // arithmetic
-        assertNullLiteral(rule.rule(new Add(EMPTY, getFieldAttribute("a"), NULL)));
-        // comparison
-        assertNullLiteral(rule.rule(greaterThanOf(getFieldAttribute("a"), NULL)));
-        // regex
-        assertNullLiteral(rule.rule(new RLike(EMPTY, NULL, new RLikePattern("123"))));
-        // date functions
-        assertNullLiteral(rule.rule(new DateExtract(EMPTY, NULL, NULL, configuration(""))));
-        // math functions
-        assertNullLiteral(rule.rule(new Cos(EMPTY, NULL)));
-        // string functions
-        assertNullLiteral(rule.rule(new LTrim(EMPTY, NULL)));
-        // spatial
-        assertNullLiteral(rule.rule(new SpatialCentroid(EMPTY, NULL)));
-        // ip
-        assertNullLiteral(rule.rule(new CIDRMatch(EMPTY, NULL, List.of(NULL))));
-        // conversion
-        assertNullLiteral(rule.rule(new ToString(EMPTY, NULL)));
-    }
-
-    public void testNullFoldingDoesNotApplyOnLogicalExpressions() {
-        FoldNull rule = new FoldNull();
-
-        Or or = new Or(EMPTY, NULL, TRUE);
-        assertEquals(or, rule.rule(or));
-        or = new Or(EMPTY, NULL, NULL);
-        assertEquals(or, rule.rule(or));
-
-        And and = new And(EMPTY, NULL, TRUE);
-        assertEquals(and, rule.rule(and));
-        and = new And(EMPTY, NULL, NULL);
-        assertEquals(and, rule.rule(and));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testNullFoldingDoesNotApplyOnAbstractMultivalueFunction() throws Exception {
-        FoldNull rule = new FoldNull();
-
-        List<Class<? extends AbstractMultivalueFunction>> items = List.of(
-            MvDedupe.class,
-            MvFirst.class,
-            MvLast.class,
-            MvMax.class,
-            MvMedian.class,
-            MvMin.class,
-            MvSum.class
-        );
-        for (Class<? extends AbstractMultivalueFunction> clazz : items) {
-            Constructor<? extends AbstractMultivalueFunction> ctor = clazz.getConstructor(Source.class, Expression.class);
-            AbstractMultivalueFunction conditionalFunction = ctor.newInstance(EMPTY, getFieldAttribute("a"));
-            assertEquals(conditionalFunction, rule.rule(conditionalFunction));
-
-            conditionalFunction = ctor.newInstance(EMPTY, NULL);
-            assertEquals(NULL, rule.rule(conditionalFunction));
-        }
-
-        // avg and count ar different just because they know the return type in advance (all the others infer the type from the input)
-        MvAvg avg = new MvAvg(EMPTY, getFieldAttribute("a"));
-        assertEquals(avg, rule.rule(avg));
-        avg = new MvAvg(EMPTY, NULL);
-        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(avg));
-
-        MvCount count = new MvCount(EMPTY, getFieldAttribute("a"));
-        assertEquals(count, rule.rule(count));
-        count = new MvCount(EMPTY, NULL);
-        assertEquals(new Literal(EMPTY, null, INTEGER), rule.rule(count));
-    }
-
-    @SuppressWarnings("unchecked")
-    public void testNullFoldingDoesNotApplyOnAggregate() throws Exception {
-        FoldNull rule = new FoldNull();
-
-        List<Class<? extends AggregateFunction>> items = List.of(Max.class, Min.class);
-        for (Class<? extends AggregateFunction> clazz : items) {
-            Constructor<? extends AggregateFunction> ctor = clazz.getConstructor(Source.class, Expression.class);
-            AggregateFunction conditionalFunction = ctor.newInstance(EMPTY, getFieldAttribute("a"));
-            assertEquals(conditionalFunction, rule.rule(conditionalFunction));
-
-            conditionalFunction = ctor.newInstance(EMPTY, NULL);
-            assertEquals(NULL, rule.rule(conditionalFunction));
-        }
-
-        Avg avg = new Avg(EMPTY, getFieldAttribute("a"));
-        assertEquals(avg, rule.rule(avg));
-        avg = new Avg(EMPTY, NULL);
-        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(avg));
-
-        Count count = new Count(EMPTY, getFieldAttribute("a"));
-        assertEquals(count, rule.rule(count));
-        count = new Count(EMPTY, NULL);
-        assertEquals(count, rule.rule(count));
-
-        CountDistinct countd = new CountDistinct(EMPTY, getFieldAttribute("a"), getFieldAttribute("a"));
-        assertEquals(countd, rule.rule(countd));
-        countd = new CountDistinct(EMPTY, NULL, NULL);
-        assertEquals(new Literal(EMPTY, null, LONG), rule.rule(countd));
-
-        Median median = new Median(EMPTY, getFieldAttribute("a"));
-        assertEquals(median, rule.rule(median));
-        median = new Median(EMPTY, NULL);
-        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(median));
-
-        MedianAbsoluteDeviation medianad = new MedianAbsoluteDeviation(EMPTY, getFieldAttribute("a"));
-        assertEquals(medianad, rule.rule(medianad));
-        medianad = new MedianAbsoluteDeviation(EMPTY, NULL);
-        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(medianad));
-
-        Percentile percentile = new Percentile(EMPTY, getFieldAttribute("a"), getFieldAttribute("a"));
-        assertEquals(percentile, rule.rule(percentile));
-        percentile = new Percentile(EMPTY, NULL, NULL);
-        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(percentile));
-
-        Sum sum = new Sum(EMPTY, getFieldAttribute("a"));
-        assertEquals(sum, rule.rule(sum));
-        sum = new Sum(EMPTY, NULL);
-        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(sum));
-
-    }
-
-    public void testNullFoldableDoesNotApplyToIsNullAndNotNull() {
-        FoldNull rule = new FoldNull();
-
-        DataType numericType = randomFrom(INTEGER, LONG, DOUBLE);
-        DataType genericType = randomFrom(INTEGER, LONG, DOUBLE, UNSIGNED_LONG, KEYWORD, TEXT, GEO_POINT, GEO_SHAPE, VERSION, IP);
-        List<Expression> items = List.of(
-            new Add(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType)),
-            new Add(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER)),
-            new Sub(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType)),
-            new Sub(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER)),
-            new Mul(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType)),
-            new Mul(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER)),
-            new Div(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType)),
-            new Div(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER)),
-
-            new GreaterThan(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
-            new GreaterThan(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
-            new GreaterThanOrEqual(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
-            new GreaterThanOrEqual(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
-            new LessThan(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
-            new LessThan(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
-            new LessThanOrEqual(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
-            new LessThanOrEqual(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
-            new NotEquals(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
-            new NotEquals(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
-
-            new Equals(EMPTY, getFieldAttribute("a", genericType), getFieldAttribute("b", genericType)),
-            new Equals(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER))
-        );
-        for (Expression item : items) {
-            Expression isNull = new IsNull(EMPTY, item);
-            Expression transformed = rule.rule(isNull);
-            assertEquals(isNull, transformed);
-
-            IsNotNull isNotNull = new IsNotNull(EMPTY, item);
-            transformed = rule.rule(isNotNull);
-            assertEquals(isNotNull, transformed);
-        }
-
-    }
-
-    //
-    // Propagate nullability (IS NULL / IS NOT NULL)
-    //
-
-    // a IS NULL AND a IS NOT NULL => false
-    public void testIsNullAndNotNull() throws Exception {
-        FieldAttribute fa = getFieldAttribute("a");
-
-        And and = new And(EMPTY, new IsNull(EMPTY, fa), new IsNotNull(EMPTY, fa));
-        assertEquals(FALSE, new PropagateNullable().rule(and));
-    }
-
-    // a IS NULL AND b IS NOT NULL AND c IS NULL AND d IS NOT NULL AND e IS NULL AND a IS NOT NULL => false
-    public void testIsNullAndNotNullMultiField() throws Exception {
-        FieldAttribute fa = getFieldAttribute("a");
-
-        And andOne = new And(EMPTY, new IsNull(EMPTY, fa), new IsNotNull(EMPTY, getFieldAttribute("b")));
-        And andTwo = new And(EMPTY, new IsNull(EMPTY, getFieldAttribute("c")), new IsNotNull(EMPTY, getFieldAttribute("d")));
-        And andThree = new And(EMPTY, new IsNull(EMPTY, getFieldAttribute("e")), new IsNotNull(EMPTY, fa));
-
-        And and = new And(EMPTY, andOne, new And(EMPTY, andTwo, andThree));
-
-        assertEquals(FALSE, new PropagateNullable().rule(and));
-    }
-
-    // a IS NULL AND a > 1 => a IS NULL AND NULL
-    public void testIsNullAndComparison() {
-        FieldAttribute fa = getFieldAttribute("a");
-        IsNull isNull = new IsNull(EMPTY, fa);
-
-        And and = new And(EMPTY, isNull, greaterThanOf(fa, ONE));
-        assertEquals(new And(EMPTY, isNull, nullOf(BOOLEAN)), new PropagateNullable().rule(and));
-    }
-
-    // a IS NULL AND b < 1 AND c < 1 AND a < 1 => a IS NULL AND b < 1 AND c < 1 AND NULL
-    public void testIsNullAndMultipleComparison() {
-        FieldAttribute fa = getFieldAttribute("a");
-        IsNull aIsNull = new IsNull(EMPTY, fa);
-
-        And bLT1_AND_cLT1 = new And(EMPTY, lessThanOf(getFieldAttribute("b"), ONE), lessThanOf(getFieldAttribute("c"), ONE));
-        And aIsNull_AND_bLT1_AND_cLT1 = new And(EMPTY, aIsNull, bLT1_AND_cLT1);
-        And aIsNull_AND_bLT1_AND_cLT1_AND_aLT1 = new And(EMPTY, aIsNull_AND_bLT1_AND_cLT1, lessThanOf(fa, ONE));
-
-        Expression optimized = new PropagateNullable().rule(aIsNull_AND_bLT1_AND_cLT1_AND_aLT1);
-        Expression aIsNull_AND_bLT1_AND_cLT1_AND_NULL = new And(EMPTY, aIsNull_AND_bLT1_AND_cLT1, nullOf(BOOLEAN));
-        assertEquals(Predicates.splitAnd(aIsNull_AND_bLT1_AND_cLT1_AND_NULL), Predicates.splitAnd(optimized));
-    }
-
-    public void testDoNotOptimizeIsNullAndMultipleComparisonWithConstants() {
-        Literal a = ONE;
-        Literal b = ONE;
-        IsNull aIsNull = new IsNull(EMPTY, a);
-
-        And bLT1_AND_cLT1 = new And(EMPTY, lessThanOf(b, ONE), lessThanOf(getFieldAttribute("c"), ONE));
-        And aIsNull_AND_bLT1_AND_cLT1 = new And(EMPTY, aIsNull, bLT1_AND_cLT1);
-        And aIsNull_AND_bLT1_AND_cLT1_AND_aLT1 = new And(EMPTY, aIsNull_AND_bLT1_AND_cLT1, lessThanOf(a, ONE));
-
-        Expression optimized = new PropagateNullable().rule(aIsNull_AND_bLT1_AND_cLT1_AND_aLT1);
-        Literal nullLiteral = new Literal(EMPTY, null, BOOLEAN);
-        assertEquals(asList(aIsNull, nullLiteral, nullLiteral, nullLiteral), Predicates.splitAnd(optimized));
-    }
-
-    // ((a+1)/2) > 1 AND a + 2 AND a IS NULL AND b < 3 => NULL AND NULL AND a IS NULL AND b < 3
-    public void testIsNullAndDeeplyNestedExpression() throws Exception {
-        FieldAttribute fa = getFieldAttribute("a");
-        IsNull isNull = new IsNull(EMPTY, fa);
-
-        Expression nullified = new And(
-            EMPTY,
-            greaterThanOf(new Div(EMPTY, new Add(EMPTY, fa, ONE), TWO), ONE),
-            greaterThanOf(new Add(EMPTY, fa, TWO), ONE)
-        );
-        Expression kept = new And(EMPTY, isNull, lessThanOf(getFieldAttribute("b"), THREE));
-        And and = new And(EMPTY, nullified, kept);
-
-        Expression optimized = new PropagateNullable().rule(and);
-        Expression expected = new And(EMPTY, new And(EMPTY, nullOf(BOOLEAN), nullOf(BOOLEAN)), kept);
-
-        assertEquals(Predicates.splitAnd(expected), Predicates.splitAnd(optimized));
-    }
-
-    // a IS NULL OR a IS NOT NULL => no change
-    // a IS NULL OR a > 1 => no change
-    public void testIsNullInDisjunction() throws Exception {
-        FieldAttribute fa = getFieldAttribute("a");
-
-        Or or = new Or(EMPTY, new IsNull(EMPTY, fa), new IsNotNull(EMPTY, fa));
-        Filter dummy = new Filter(EMPTY, relation(), or);
-        LogicalPlan transformed = new PropagateNullable().apply(dummy);
-        assertSame(dummy, transformed);
-        assertEquals(or, ((Filter) transformed).condition());
-
-        or = new Or(EMPTY, new IsNull(EMPTY, fa), greaterThanOf(fa, ONE));
-        dummy = new Filter(EMPTY, relation(), or);
-        transformed = new PropagateNullable().apply(dummy);
-        assertSame(dummy, transformed);
-        assertEquals(or, ((Filter) transformed).condition());
-    }
-
-    // a + 1 AND (a IS NULL OR a > 3) => no change
-    public void testIsNullDisjunction() throws Exception {
-        FieldAttribute fa = getFieldAttribute("a");
-        IsNull isNull = new IsNull(EMPTY, fa);
-
-        Or or = new Or(EMPTY, isNull, greaterThanOf(fa, THREE));
-        And and = new And(EMPTY, new Add(EMPTY, fa, ONE), or);
-
-        assertEquals(and, new PropagateNullable().rule(and));
-    }
-
     //
     // Lookup
     //
@@ -5860,11 +5419,148 @@ public void testMvSortInvalidOrder() {
         assertEquals("Invalid order value in [mv_sort(v, o)], expected one of [ASC, DESC] but got [dsc]", iae.getMessage());
     }
 
-    private Literal nullOf(DataType dataType) {
-        return new Literal(Source.EMPTY, null, dataType);
+    public void testToDatePeriodTimeDurationInvalidIntervals() {
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types | EVAL interval = "3 dys", x = date + interval::date_period"""));
+        assertEquals(
+            "Invalid interval value in [interval::date_period], expected integer followed by one of "
+                + "[DAY, DAYS, D, WEEK, WEEKS, W, MONTH, MONTHS, MO, QUARTER, QUARTERS, Q, YEAR, YEARS, YR, Y] but got [3 dys]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types | EVAL interval = "- 3 days", x = date + interval::date_period"""));
+        assertEquals(
+            "Invalid interval value in [interval::date_period], expected integer followed by one of "
+                + "[DAY, DAYS, D, WEEK, WEEKS, W, MONTH, MONTHS, MO, QUARTER, QUARTERS, Q, YEAR, YEARS, YR, Y] but got [- 3 days]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types  | EVAL interval = "3 dys", x = date - to_dateperiod(interval)"""));
+        assertEquals(
+            "Invalid interval value in [to_dateperiod(interval)], expected integer followed by one of "
+                + "[DAY, DAYS, D, WEEK, WEEKS, W, MONTH, MONTHS, MO, QUARTER, QUARTERS, Q, YEAR, YEARS, YR, Y] but got [3 dys]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types  | EVAL interval = "- 3 days", x = date - to_dateperiod(interval)"""));
+        assertEquals(
+            "Invalid interval value in [to_dateperiod(interval)], expected integer followed by one of "
+                + "[DAY, DAYS, D, WEEK, WEEKS, W, MONTH, MONTHS, MO, QUARTER, QUARTERS, Q, YEAR, YEARS, YR, Y] but got [- 3 days]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types  | EVAL interval = "3 ours", x = date + interval::time_duration"""));
+        assertEquals(
+            "Invalid interval value in [interval::time_duration], expected integer followed by one of "
+                + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 ours]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types  | EVAL interval = "- 3 hours", x = date + interval::time_duration"""));
+        assertEquals(
+            "Invalid interval value in [interval::time_duration], expected integer followed by one of "
+                + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [- 3 hours]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types  | EVAL interval = "3 ours", x = date - to_timeduration(interval)"""));
+        assertEquals(
+            "Invalid interval value in [to_timeduration(interval)], expected integer followed by one of "
+                + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 ours]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types  | EVAL interval = "- 3 hours", x = date - to_timeduration(interval)"""));
+        assertEquals(
+            "Invalid interval value in [to_timeduration(interval)], expected integer followed by one of "
+                + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [- 3 hours]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            from types  | EVAL interval = "3.5 hours", x = date - to_timeduration(interval)"""));
+        assertEquals(
+            "Invalid interval value in [to_timeduration(interval)], expected integer followed by one of "
+                + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3.5 hours]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            row x = "2024-01-01"::datetime | eval y = x + "3 dys"::date_period"""));
+        assertEquals(
+            "Invalid interval value in [\"3 dys\"::date_period], expected integer followed by one of "
+                + "[DAY, DAYS, D, WEEK, WEEKS, W, MONTH, MONTHS, MO, QUARTER, QUARTERS, Q, YEAR, YEARS, YR, Y] but got [3 dys]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            row x = "2024-01-01"::datetime | eval y = x - to_dateperiod("3 dys")"""));
+        assertEquals(
+            "Invalid interval value in [to_dateperiod(\"3 dys\")], expected integer followed by one of "
+                + "[DAY, DAYS, D, WEEK, WEEKS, W, MONTH, MONTHS, MO, QUARTER, QUARTERS, Q, YEAR, YEARS, YR, Y] but got [3 dys]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            row x = "2024-01-01"::datetime | eval y = x + "3 ours"::time_duration"""));
+        assertEquals(
+            "Invalid interval value in [\"3 ours\"::time_duration], expected integer followed by one of "
+                + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 ours]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            row x = "2024-01-01"::datetime | eval y = x - to_timeduration("3 ours")"""));
+        assertEquals(
+            "Invalid interval value in [to_timeduration(\"3 ours\")], expected integer followed by one of "
+                + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 ours]",
+            e.getMessage()
+        );
+
+        e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
+            row x = "2024-01-01"::datetime | eval y = x - to_timeduration("3.5 hours")"""));
+        assertEquals(
+            "Invalid interval value in [to_timeduration(\"3.5 hours\")], expected integer followed by one of "
+                + "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3.5 hours]",
+            e.getMessage()
+        );
+    }
+
+    public void testToDatePeriodToTimeDurationWithField() {
+        final String header = "Found 1 problem\nline ";
+        VerificationException e = expectThrows(VerificationException.class, () -> planTypes("""
+            from types | EVAL x = date + keyword::date_period"""));
+        assertTrue(e.getMessage().startsWith("Found "));
+        assertEquals(
+            "1:30: argument of [keyword::date_period] must be a constant, received [keyword]",
+            e.getMessage().substring(header.length())
+        );
+
+        e = expectThrows(VerificationException.class, () -> planTypes("""
+            from types  | EVAL x = date - to_timeduration(keyword)"""));
+        assertEquals(
+            "1:47: argument of [to_timeduration(keyword)] must be a constant, received [keyword]",
+            e.getMessage().substring(header.length())
+        );
+
+        e = expectThrows(VerificationException.class, () -> planTypes("""
+            from types | EVAL x = keyword, y = date + x::date_period"""));
+        assertTrue(e.getMessage().startsWith("Found "));
+        assertEquals("1:43: argument of [x::date_period] must be a constant, received [x]", e.getMessage().substring(header.length()));
+
+        e = expectThrows(VerificationException.class, () -> planTypes("""
+            from types  | EVAL x = keyword, y = date - to_timeduration(x)"""));
+        assertEquals("1:60: argument of [to_timeduration(x)] must be a constant, received [x]", e.getMessage().substring(header.length()));
     }
 
-    public static EsRelation relation() {
-        return new EsRelation(EMPTY, new EsIndex(randomAlphaOfLength(8), emptyMap()), randomFrom(IndexMode.values()), randomBoolean());
+    private Literal nullOf(DataType dataType) {
+        return new Literal(Source.EMPTY, null, dataType);
     }
 }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/FoldNullTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/FoldNullTests.java
index 85b5cfa9ed52..89117b5d4e72 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/FoldNullTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/FoldNullTests.java
@@ -12,19 +12,129 @@
 import org.elasticsearch.xpack.esql.core.expression.Literal;
 import org.elasticsearch.xpack.esql.core.expression.predicate.logical.And;
 import org.elasticsearch.xpack.esql.core.expression.predicate.logical.Or;
+import org.elasticsearch.xpack.esql.core.expression.predicate.nulls.IsNotNull;
 import org.elasticsearch.xpack.esql.core.expression.predicate.nulls.IsNull;
-import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLike;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLikePattern;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.core.type.DataType;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.AggregateFunction;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.Avg;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.Count;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.CountDistinct;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.Max;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.Median;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.MedianAbsoluteDeviation;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.Min;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.Percentile;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.SpatialCentroid;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.Sum;
+import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToString;
+import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateExtract;
+import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateFormat;
+import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateParse;
+import org.elasticsearch.xpack.esql.expression.function.scalar.date.DateTrunc;
+import org.elasticsearch.xpack.esql.expression.function.scalar.ip.CIDRMatch;
+import org.elasticsearch.xpack.esql.expression.function.scalar.math.Cos;
+import org.elasticsearch.xpack.esql.expression.function.scalar.math.Pow;
+import org.elasticsearch.xpack.esql.expression.function.scalar.math.Round;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.AbstractMultivalueFunction;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvAvg;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvCount;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvDedupe;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvFirst;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvLast;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMax;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMedian;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvMin;
+import org.elasticsearch.xpack.esql.expression.function.scalar.multivalue.MvSum;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.LTrim;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.Substring;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Add;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Div;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Mul;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.Sub;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThan;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThanOrEqual;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.LessThan;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.LessThanOrEqual;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.NotEquals;
 
+import java.lang.reflect.Constructor;
+import java.util.List;
+
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.L;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.configuration;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.getFieldAttribute;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.greaterThanOf;
 import static org.elasticsearch.xpack.esql.core.expression.Literal.NULL;
 import static org.elasticsearch.xpack.esql.core.expression.Literal.TRUE;
 import static org.elasticsearch.xpack.esql.core.tree.Source.EMPTY;
+import static org.elasticsearch.xpack.esql.core.type.DataType.DOUBLE;
+import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_POINT;
+import static org.elasticsearch.xpack.esql.core.type.DataType.GEO_SHAPE;
+import static org.elasticsearch.xpack.esql.core.type.DataType.INTEGER;
+import static org.elasticsearch.xpack.esql.core.type.DataType.IP;
+import static org.elasticsearch.xpack.esql.core.type.DataType.KEYWORD;
+import static org.elasticsearch.xpack.esql.core.type.DataType.LONG;
+import static org.elasticsearch.xpack.esql.core.type.DataType.TEXT;
+import static org.elasticsearch.xpack.esql.core.type.DataType.UNSIGNED_LONG;
+import static org.elasticsearch.xpack.esql.core.type.DataType.VERSION;
 
 public class FoldNullTests extends ESTestCase {
 
+    public void testBasicNullFolding() {
+        FoldNull rule = new FoldNull();
+        assertNullLiteral(rule.rule(new Add(EMPTY, L(randomInt()), Literal.NULL)));
+        assertNullLiteral(rule.rule(new Round(EMPTY, Literal.NULL, null)));
+        assertNullLiteral(rule.rule(new Pow(EMPTY, Literal.NULL, Literal.NULL)));
+        assertNullLiteral(rule.rule(new DateFormat(EMPTY, Literal.NULL, Literal.NULL, null)));
+        assertNullLiteral(rule.rule(new DateParse(EMPTY, Literal.NULL, Literal.NULL)));
+        assertNullLiteral(rule.rule(new DateTrunc(EMPTY, Literal.NULL, Literal.NULL)));
+        assertNullLiteral(rule.rule(new Substring(EMPTY, Literal.NULL, Literal.NULL, Literal.NULL)));
+    }
+
+    public void testNullFoldingIsNotNull() {
+        FoldNull foldNull = new FoldNull();
+        assertEquals(true, foldNull.rule(new IsNotNull(EMPTY, TRUE)).fold());
+        assertEquals(false, foldNull.rule(new IsNotNull(EMPTY, NULL)).fold());
+    }
+
+    @SuppressWarnings("unchecked")
+    public void testNullFoldingDoesNotApplyOnAbstractMultivalueFunction() throws Exception {
+        FoldNull rule = new FoldNull();
+
+        List<Class<? extends AbstractMultivalueFunction>> items = List.of(
+            MvDedupe.class,
+            MvFirst.class,
+            MvLast.class,
+            MvMax.class,
+            MvMedian.class,
+            MvMin.class,
+            MvSum.class
+        );
+        for (Class<? extends AbstractMultivalueFunction> clazz : items) {
+            Constructor<? extends AbstractMultivalueFunction> ctor = clazz.getConstructor(Source.class, Expression.class);
+            AbstractMultivalueFunction conditionalFunction = ctor.newInstance(EMPTY, getFieldAttribute("a"));
+            assertEquals(conditionalFunction, rule.rule(conditionalFunction));
+
+            conditionalFunction = ctor.newInstance(EMPTY, NULL);
+            assertEquals(NULL, rule.rule(conditionalFunction));
+        }
+
+        // avg and count ar different just because they know the return type in advance (all the others infer the type from the input)
+        MvAvg avg = new MvAvg(EMPTY, getFieldAttribute("a"));
+        assertEquals(avg, rule.rule(avg));
+        avg = new MvAvg(EMPTY, NULL);
+        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(avg));
+
+        MvCount count = new MvCount(EMPTY, getFieldAttribute("a"));
+        assertEquals(count, rule.rule(count));
+        count = new MvCount(EMPTY, NULL);
+        assertEquals(new Literal(EMPTY, null, INTEGER), rule.rule(count));
+    }
+
     public void testNullFoldingIsNull() {
         FoldNull foldNull = new FoldNull();
         assertEquals(true, foldNull.rule(new IsNull(EMPTY, NULL)).fold());
@@ -34,11 +144,23 @@ public void testNullFoldingIsNull() {
     public void testGenericNullableExpression() {
         FoldNull rule = new FoldNull();
         // arithmetic
-        assertNullLiteral(rule.rule(new Add(EMPTY, getFieldAttribute(), NULL)));
+        assertNullLiteral(rule.rule(new Add(EMPTY, getFieldAttribute("a"), NULL)));
         // comparison
-        assertNullLiteral(rule.rule(greaterThanOf(getFieldAttribute(), NULL)));
+        assertNullLiteral(rule.rule(greaterThanOf(getFieldAttribute("a"), NULL)));
         // regex
         assertNullLiteral(rule.rule(new RLike(EMPTY, NULL, new RLikePattern("123"))));
+        // date functions
+        assertNullLiteral(rule.rule(new DateExtract(EMPTY, NULL, NULL, configuration(""))));
+        // math functions
+        assertNullLiteral(rule.rule(new Cos(EMPTY, NULL)));
+        // string functions
+        assertNullLiteral(rule.rule(new LTrim(EMPTY, NULL)));
+        // spatial
+        assertNullLiteral(rule.rule(new SpatialCentroid(EMPTY, NULL)));
+        // ip
+        assertNullLiteral(rule.rule(new CIDRMatch(EMPTY, NULL, List.of(NULL))));
+        // conversion
+        assertNullLiteral(rule.rule(new ToString(EMPTY, NULL)));
     }
 
     public void testNullFoldingDoesNotApplyOnLogicalExpressions() {
@@ -55,6 +177,96 @@ public void testNullFoldingDoesNotApplyOnLogicalExpressions() {
         assertEquals(and, rule.rule(and));
     }
 
+    @SuppressWarnings("unchecked")
+    public void testNullFoldingDoesNotApplyOnAggregate() throws Exception {
+        FoldNull rule = new FoldNull();
+
+        List<Class<? extends AggregateFunction>> items = List.of(Max.class, Min.class);
+        for (Class<? extends AggregateFunction> clazz : items) {
+            Constructor<? extends AggregateFunction> ctor = clazz.getConstructor(Source.class, Expression.class);
+            AggregateFunction conditionalFunction = ctor.newInstance(EMPTY, getFieldAttribute("a"));
+            assertEquals(conditionalFunction, rule.rule(conditionalFunction));
+
+            conditionalFunction = ctor.newInstance(EMPTY, NULL);
+            assertEquals(NULL, rule.rule(conditionalFunction));
+        }
+
+        Avg avg = new Avg(EMPTY, getFieldAttribute("a"));
+        assertEquals(avg, rule.rule(avg));
+        avg = new Avg(EMPTY, NULL);
+        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(avg));
+
+        Count count = new Count(EMPTY, getFieldAttribute("a"));
+        assertEquals(count, rule.rule(count));
+        count = new Count(EMPTY, NULL);
+        assertEquals(count, rule.rule(count));
+
+        CountDistinct countd = new CountDistinct(EMPTY, getFieldAttribute("a"), getFieldAttribute("a"));
+        assertEquals(countd, rule.rule(countd));
+        countd = new CountDistinct(EMPTY, NULL, NULL);
+        assertEquals(new Literal(EMPTY, null, LONG), rule.rule(countd));
+
+        Median median = new Median(EMPTY, getFieldAttribute("a"));
+        assertEquals(median, rule.rule(median));
+        median = new Median(EMPTY, NULL);
+        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(median));
+
+        MedianAbsoluteDeviation medianad = new MedianAbsoluteDeviation(EMPTY, getFieldAttribute("a"));
+        assertEquals(medianad, rule.rule(medianad));
+        medianad = new MedianAbsoluteDeviation(EMPTY, NULL);
+        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(medianad));
+
+        Percentile percentile = new Percentile(EMPTY, getFieldAttribute("a"), getFieldAttribute("a"));
+        assertEquals(percentile, rule.rule(percentile));
+        percentile = new Percentile(EMPTY, NULL, NULL);
+        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(percentile));
+
+        Sum sum = new Sum(EMPTY, getFieldAttribute("a"));
+        assertEquals(sum, rule.rule(sum));
+        sum = new Sum(EMPTY, NULL);
+        assertEquals(new Literal(EMPTY, null, DOUBLE), rule.rule(sum));
+    }
+
+    public void testNullFoldableDoesNotApplyToIsNullAndNotNull() {
+        FoldNull rule = new FoldNull();
+
+        DataType numericType = randomFrom(INTEGER, LONG, DOUBLE);
+        DataType genericType = randomFrom(INTEGER, LONG, DOUBLE, UNSIGNED_LONG, KEYWORD, TEXT, GEO_POINT, GEO_SHAPE, VERSION, IP);
+        List<Expression> items = List.of(
+            new Add(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType)),
+            new Add(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER)),
+            new Sub(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType)),
+            new Sub(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER)),
+            new Mul(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType)),
+            new Mul(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER)),
+            new Div(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType)),
+            new Div(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER)),
+
+            new GreaterThan(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
+            new GreaterThan(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
+            new GreaterThanOrEqual(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
+            new GreaterThanOrEqual(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
+            new LessThan(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
+            new LessThan(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
+            new LessThanOrEqual(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
+            new LessThanOrEqual(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
+            new NotEquals(EMPTY, getFieldAttribute("a", numericType), getFieldAttribute("b", numericType), randomZone()),
+            new NotEquals(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER), randomZone()),
+
+            new Equals(EMPTY, getFieldAttribute("a", genericType), getFieldAttribute("b", genericType)),
+            new Equals(EMPTY, new Literal(EMPTY, 1, INTEGER), new Literal(EMPTY, List.of(1, 2, 3), INTEGER))
+        );
+        for (Expression item : items) {
+            Expression isNull = new IsNull(EMPTY, item);
+            Expression transformed = rule.rule(isNull);
+            assertEquals(isNull, transformed);
+
+            IsNotNull isNotNull = new IsNotNull(EMPTY, item);
+            transformed = rule.rule(isNotNull);
+            assertEquals(isNotNull, transformed);
+        }
+    }
+
     private void assertNullLiteral(Expression expression) {
         assertEquals(Literal.class, expression.getClass());
         assertNull(expression.fold());
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PropagateNullableTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PropagateNullableTests.java
index 0838777a84e6..d1d6a7fbaa20 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PropagateNullableTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PropagateNullableTests.java
@@ -23,6 +23,7 @@
 import org.elasticsearch.xpack.esql.plan.logical.Filter;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 
+import static java.util.Arrays.asList;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.ONE;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.THREE;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.TWO;
@@ -130,4 +131,18 @@ public void testIsNullDisjunction() {
 
         assertEquals(and, new PropagateNullable().rule(and));
     }
+
+    public void testDoNotOptimizeIsNullAndMultipleComparisonWithConstants() {
+        Literal a = ONE;
+        Literal b = ONE;
+        IsNull aIsNull = new IsNull(EMPTY, a);
+
+        And bLT1_AND_cLT1 = new And(EMPTY, lessThanOf(b, ONE), lessThanOf(getFieldAttribute("c"), ONE));
+        And aIsNull_AND_bLT1_AND_cLT1 = new And(EMPTY, aIsNull, bLT1_AND_cLT1);
+        And aIsNull_AND_bLT1_AND_cLT1_AND_aLT1 = new And(EMPTY, aIsNull_AND_bLT1_AND_cLT1, lessThanOf(a, ONE));
+
+        Expression optimized = new PropagateNullable().rule(aIsNull_AND_bLT1_AND_cLT1_AND_aLT1);
+        Literal nullLiteral = new Literal(EMPTY, null, BOOLEAN);
+        assertEquals(asList(aIsNull, nullLiteral, nullLiteral, nullLiteral), Predicates.splitAnd(optimized));
+    }
 }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFiltersTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFiltersTests.java
new file mode 100644
index 000000000000..121c0ef33781
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFiltersTests.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.optimizer.rules.logical;
+
+import org.elasticsearch.index.IndexMode;
+import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.xpack.esql.core.expression.FieldAttribute;
+import org.elasticsearch.xpack.esql.core.expression.predicate.logical.And;
+import org.elasticsearch.xpack.esql.expression.function.aggregate.Count;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.RLike;
+import org.elasticsearch.xpack.esql.expression.function.scalar.string.WildcardLike;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThan;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.GreaterThanOrEqual;
+import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.LessThan;
+import org.elasticsearch.xpack.esql.index.EsIndex;
+import org.elasticsearch.xpack.esql.plan.logical.Aggregate;
+import org.elasticsearch.xpack.esql.plan.logical.EsRelation;
+import org.elasticsearch.xpack.esql.plan.logical.Filter;
+import org.elasticsearch.xpack.esql.plan.logical.local.EsqlProject;
+
+import java.util.List;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.ONE;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.THREE;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.TWO;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.getFieldAttribute;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.greaterThanOf;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.greaterThanOrEqualOf;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.lessThanOf;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.rlike;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.wildcardLike;
+import static org.elasticsearch.xpack.esql.core.tree.Source.EMPTY;
+
+public class PushDownAndCombineFiltersTests extends ESTestCase {
+
+    public void testCombineFilters() {
+        EsRelation relation = relation();
+        GreaterThan conditionA = greaterThanOf(getFieldAttribute("a"), ONE);
+        LessThan conditionB = lessThanOf(getFieldAttribute("b"), TWO);
+
+        Filter fa = new Filter(EMPTY, relation, conditionA);
+        Filter fb = new Filter(EMPTY, fa, conditionB);
+
+        assertEquals(new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB)), new PushDownAndCombineFilters().apply(fb));
+    }
+
+    public void testCombineFiltersLikeRLike() {
+        EsRelation relation = relation();
+        RLike conditionA = rlike(getFieldAttribute("a"), "foo");
+        WildcardLike conditionB = wildcardLike(getFieldAttribute("b"), "bar");
+
+        Filter fa = new Filter(EMPTY, relation, conditionA);
+        Filter fb = new Filter(EMPTY, fa, conditionB);
+
+        assertEquals(new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB)), new PushDownAndCombineFilters().apply(fb));
+    }
+
+    public void testPushDownFilter() {
+        EsRelation relation = relation();
+        GreaterThan conditionA = greaterThanOf(getFieldAttribute("a"), ONE);
+        LessThan conditionB = lessThanOf(getFieldAttribute("b"), TWO);
+
+        Filter fa = new Filter(EMPTY, relation, conditionA);
+        List<FieldAttribute> projections = singletonList(getFieldAttribute("b"));
+        EsqlProject keep = new EsqlProject(EMPTY, fa, projections);
+        Filter fb = new Filter(EMPTY, keep, conditionB);
+
+        Filter combinedFilter = new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB));
+        assertEquals(new EsqlProject(EMPTY, combinedFilter, projections), new PushDownAndCombineFilters().apply(fb));
+    }
+
+    public void testPushDownLikeRlikeFilter() {
+        EsRelation relation = relation();
+        org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLike conditionA = rlike(getFieldAttribute("a"), "foo");
+        WildcardLike conditionB = wildcardLike(getFieldAttribute("b"), "bar");
+
+        Filter fa = new Filter(EMPTY, relation, conditionA);
+        List<FieldAttribute> projections = singletonList(getFieldAttribute("b"));
+        EsqlProject keep = new EsqlProject(EMPTY, fa, projections);
+        Filter fb = new Filter(EMPTY, keep, conditionB);
+
+        Filter combinedFilter = new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB));
+        assertEquals(new EsqlProject(EMPTY, combinedFilter, projections), new PushDownAndCombineFilters().apply(fb));
+    }
+
+    // from ... | where a > 1 | stats count(1) by b | where count(1) >= 3 and b < 2
+    // => ... | where a > 1 and b < 2 | stats count(1) by b | where count(1) >= 3
+    public void testSelectivelyPushDownFilterPastFunctionAgg() {
+        EsRelation relation = relation();
+        GreaterThan conditionA = greaterThanOf(getFieldAttribute("a"), ONE);
+        LessThan conditionB = lessThanOf(getFieldAttribute("b"), TWO);
+        GreaterThanOrEqual aggregateCondition = greaterThanOrEqualOf(new Count(EMPTY, ONE), THREE);
+
+        Filter fa = new Filter(EMPTY, relation, conditionA);
+        // invalid aggregate but that's fine cause its properties are not used by this rule
+        Aggregate aggregate = new Aggregate(
+            EMPTY,
+            fa,
+            Aggregate.AggregateType.STANDARD,
+            singletonList(getFieldAttribute("b")),
+            emptyList()
+        );
+        Filter fb = new Filter(EMPTY, aggregate, new And(EMPTY, aggregateCondition, conditionB));
+
+        // expected
+        Filter expected = new Filter(
+            EMPTY,
+            new Aggregate(
+                EMPTY,
+                new Filter(EMPTY, relation, new And(EMPTY, conditionA, conditionB)),
+                Aggregate.AggregateType.STANDARD,
+                singletonList(getFieldAttribute("b")),
+                emptyList()
+            ),
+            aggregateCondition
+        );
+        assertEquals(expected, new PushDownAndCombineFilters().apply(fb));
+    }
+
+    private EsRelation relation() {
+        return new EsRelation(EMPTY, new EsIndex(randomAlphaOfLength(8), emptyMap()), randomFrom(IndexMode.values()), randomBoolean());
+    }
+}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
index 35a22fd542a1..9af152116e1e 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
@@ -1413,6 +1413,22 @@ public void testParamMixed() {
         );
     }
 
+    public void testIntervalParam() {
+        LogicalPlan stm = statement(
+            "row x = ?1::datetime | eval y = ?1::datetime + ?2::date_period",
+            new QueryParams(List.of(new QueryParam("datetime", "2024-01-01", KEYWORD), new QueryParam("date_period", "3 days", KEYWORD)))
+        );
+        assertThat(stm, instanceOf(Eval.class));
+        Eval eval = (Eval) stm;
+        assertThat(eval.fields().size(), is(1));
+
+        NamedExpression field = eval.fields().get(0);
+        assertThat(field.name(), is("y"));
+        assertThat(field, instanceOf(Alias.class));
+        assertThat(((Literal) ((Add) eval.fields().get(0).child()).left().children().get(0)).value(), equalTo("2024-01-01"));
+        assertThat(((Literal) ((Add) eval.fields().get(0).child()).right().children().get(0)).value(), equalTo("3 days"));
+    }
+
     public void testFieldContainingDotsAndNumbers() {
         LogicalPlan where = processingCommand("where `a.b.1m.4321`");
         assertThat(where, instanceOf(Filter.class));
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExecSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExecSerializationTests.java
new file mode 100644
index 000000000000..f2bc0d53581b
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/physical/EnrichExecSerializationTests.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.plan.physical;
+
+import org.elasticsearch.core.Tuple;
+import org.elasticsearch.xpack.esql.core.expression.NamedExpression;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+import org.elasticsearch.xpack.esql.expression.function.FieldAttributeTests;
+import org.elasticsearch.xpack.esql.plan.logical.Enrich;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public class EnrichExecSerializationTests extends AbstractPhysicalPlanSerializationTests<EnrichExec> {
+    public static EnrichExec randomEnrichExec(int depth) {
+        Source source = randomSource();
+        PhysicalPlan child = randomChild(depth);
+        Enrich.Mode mode = randomFrom(Enrich.Mode.values());
+        String matchType = randomAlphaOfLength(3);
+        NamedExpression matchField = FieldAttributeTests.createFieldAttribute(0, false);
+        String policyName = randomAlphaOfLength(4);
+        String policyMatchField = randomAlphaOfLength(5);
+        Map<String, String> concreteIndices = randomMap(1, 4, () -> Tuple.tuple(randomAlphaOfLength(3), randomAlphaOfLength(5)));
+        List<NamedExpression> enrichFields = randomFieldAttributes(1, 4, false).stream().map(f -> (NamedExpression) f).toList();
+        return new EnrichExec(source, child, mode, matchType, matchField, policyName, policyMatchField, concreteIndices, enrichFields);
+    }
+
+    @Override
+    protected EnrichExec createTestInstance() {
+        return randomEnrichExec(0);
+    }
+
+    @Override
+    protected EnrichExec mutateInstance(EnrichExec instance) throws IOException {
+        PhysicalPlan child = instance.child();
+        Enrich.Mode mode = instance.mode();
+        String matchType = instance.matchType();
+        NamedExpression matchField = instance.matchField();
+        String policyName = instance.policyName();
+        String policyMatchField = instance.policyMatchField();
+        Map<String, String> concreteIndices = instance.concreteIndices();
+        List<NamedExpression> enrichFields = instance.enrichFields();
+        switch (between(0, 7)) {
+            case 0 -> child = randomValueOtherThan(child, () -> randomChild(0));
+            case 1 -> mode = randomValueOtherThan(mode, () -> randomFrom(Enrich.Mode.values()));
+            case 2 -> matchType = randomValueOtherThan(matchType, () -> randomAlphaOfLength(3));
+            case 3 -> matchField = randomValueOtherThan(matchField, () -> FieldAttributeTests.createFieldAttribute(0, false));
+            case 4 -> policyName = randomValueOtherThan(policyName, () -> randomAlphaOfLength(4));
+            case 5 -> policyMatchField = randomValueOtherThan(policyMatchField, () -> randomAlphaOfLength(5));
+            case 6 -> concreteIndices = randomValueOtherThan(
+                concreteIndices,
+                () -> randomMap(1, 4, () -> Tuple.tuple(randomAlphaOfLength(3), randomAlphaOfLength(5)))
+            );
+            case 7 -> enrichFields = randomValueOtherThan(
+                enrichFields,
+                () -> randomFieldAttributes(1, 4, false).stream().map(f -> (NamedExpression) f).toList()
+            );
+        }
+        return new EnrichExec(
+            instance.source(),
+            child,
+            mode,
+            matchType,
+            matchField,
+            policyName,
+            policyMatchField,
+            concreteIndices,
+            enrichFields
+        );
+    }
+
+    @Override
+    protected boolean alwaysEmptySource() {
+        return true;
+    }
+}
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/physical/FieldExtractExecSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/physical/FieldExtractExecSerializationTests.java
new file mode 100644
index 000000000000..da77ea4c2497
--- /dev/null
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/physical/FieldExtractExecSerializationTests.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql.plan.physical;
+
+import org.elasticsearch.xpack.esql.core.expression.Attribute;
+import org.elasticsearch.xpack.esql.core.tree.Source;
+
+import java.io.IOException;
+import java.util.List;
+
+public class FieldExtractExecSerializationTests extends AbstractPhysicalPlanSerializationTests<FieldExtractExec> {
+    public static FieldExtractExec randomFieldExtractExec(int depth) {
+        Source source = randomSource();
+        PhysicalPlan child = randomChild(depth);
+        List<Attribute> attributesToExtract = randomFieldAttributes(1, 4, false);
+        return new FieldExtractExec(source, child, attributesToExtract);
+    }
+
+    @Override
+    protected FieldExtractExec createTestInstance() {
+        return randomFieldExtractExec(0);
+    }
+
+    @Override
+    protected FieldExtractExec mutateInstance(FieldExtractExec instance) throws IOException {
+        PhysicalPlan child = instance.child();
+        List<Attribute> attributesToExtract = instance.attributesToExtract();
+        if (randomBoolean()) {
+            child = randomValueOtherThan(child, () -> randomChild(0));
+        } else {
+            attributesToExtract = randomValueOtherThan(attributesToExtract, () -> randomFieldAttributes(1, 4, false));
+        }
+        return new FieldExtractExec(instance.source(), child, attributesToExtract);
+    }
+
+    @Override
+    protected boolean alwaysEmptySource() {
+        return true;
+    }
+}
diff --git a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java
index ad9900b5b016..3f7607d9032e 100644
--- a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java
+++ b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java
@@ -96,7 +96,7 @@ public void testTimestampRangeRecalculatedOnStalePrimaryAllocation() throws IOEx
         final String excludeSetting = INDEX_ROUTING_EXCLUDE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey();
         updateIndexSettings(Settings.builder().put(excludeSetting, nodeNames.get(0)), "index");
         ClusterRerouteUtils.reroute(client(), new CancelAllocationCommand("index", 0, nodeNames.get(0), true));
-        assertThat(clusterAdmin().prepareHealth("index").get().getUnassignedShards(), equalTo(1));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index").get().getUnassignedShards(), equalTo(1));
 
         assertThat(client().prepareDelete("index", indexResponse.getId()).get().status(), equalTo(RestStatus.OK));
 
@@ -108,20 +108,20 @@ public void testTimestampRangeRecalculatedOnStalePrimaryAllocation() throws IOEx
         );
 
         assertThat(
-            clusterAdmin().prepareState().get().getState().metadata().index("index").getTimestampRange(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("index").getTimestampRange(),
             sameInstance(IndexLongFieldRange.EMPTY)
         );
 
         internalCluster().stopNode(nodeNames.get(1));
-        assertThat(clusterAdmin().prepareHealth("index").get().getUnassignedShards(), equalTo(2));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index").get().getUnassignedShards(), equalTo(2));
         updateIndexSettings(Settings.builder().putNull(excludeSetting), "index");
-        assertThat(clusterAdmin().prepareHealth("index").get().getUnassignedShards(), equalTo(2));
+        assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "index").get().getUnassignedShards(), equalTo(2));
 
         ClusterRerouteUtils.reroute(client(), new AllocateStalePrimaryAllocationCommand("index", 0, nodeNames.get(0), true));
 
         ensureYellowAndNoInitializingShards("index");
 
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("index");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("index");
         final IndexLongFieldRange timestampFieldRange = indexMetadata.getTimestampRange();
         assertThat(timestampFieldRange, not(sameInstance(IndexLongFieldRange.UNKNOWN)));
         assertThat(timestampFieldRange, not(sameInstance(IndexLongFieldRange.EMPTY)));
@@ -129,7 +129,7 @@ public void testTimestampRangeRecalculatedOnStalePrimaryAllocation() throws IOEx
         assertThat(timestampFieldRange.getMin(), equalTo(Instant.parse(timestampVal).toEpochMilli()));
         assertThat(timestampFieldRange.getMax(), equalTo(Instant.parse(timestampVal).toEpochMilli()));
 
-        IndexLongFieldRange eventIngestedFieldRange = clusterAdmin().prepareState()
+        IndexLongFieldRange eventIngestedFieldRange = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .metadata()
@@ -188,7 +188,7 @@ public void testTimestampAndEventIngestedFieldTypeExposedByAllIndicesServices()
                 )
         );
 
-        final Index index = clusterAdmin().prepareState()
+        final Index index = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setIndices("index")
             .setMetadata(true)
@@ -292,7 +292,7 @@ public void testTimestampOrEventIngestedFieldTypeExposedByAllIndicesServices() t
                 )
         );
 
-        final Index index = clusterAdmin().prepareState()
+        final Index index = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setIndices("index")
             .setMetadata(true)
diff --git a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java
index ccb917c9dbda..8ba88865e361 100644
--- a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java
+++ b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java
@@ -317,7 +317,7 @@ public void testUnfreezeClosedIndices() {
                     .indicesOptions(IndicesOptions.strictExpand())
             )
         );
-        ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse stateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         assertEquals(IndexMetadata.State.CLOSE, stateResponse.getState().getMetadata().index("idx-closed").getState());
         assertEquals(IndexMetadata.State.OPEN, stateResponse.getState().getMetadata().index("idx").getState());
         assertHitCount(client().prepareSearch(), 1L);
@@ -516,7 +516,10 @@ public void testIgnoreUnavailable() {
             )
         );
         assertIndexFrozen("idx");
-        assertEquals(IndexMetadata.State.CLOSE, clusterAdmin().prepareState().get().getState().metadata().index("idx-close").getState());
+        assertEquals(
+            IndexMetadata.State.CLOSE,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("idx-close").getState()
+        );
     }
 
     public void testUnfreezeClosedIndex() {
@@ -525,7 +528,10 @@ public void testUnfreezeClosedIndex() {
             client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "idx")).actionGet()
         );
         assertAcked(indicesAdmin().prepareClose("idx"));
-        assertEquals(IndexMetadata.State.CLOSE, clusterAdmin().prepareState().get().getState().metadata().index("idx").getState());
+        assertEquals(
+            IndexMetadata.State.CLOSE,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("idx").getState()
+        );
         expectThrows(
             IndexNotFoundException.class,
             client().execute(
@@ -545,7 +551,10 @@ public void testUnfreezeClosedIndex() {
                 new FreezeRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "idx").setFreeze(false)
             ).actionGet()
         );
-        assertEquals(IndexMetadata.State.OPEN, clusterAdmin().prepareState().get().getState().metadata().index("idx").getState());
+        assertEquals(
+            IndexMetadata.State.OPEN,
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("idx").getState()
+        );
     }
 
     public void testFreezeIndexIncreasesIndexSettingsVersion() {
@@ -553,14 +562,19 @@ public void testFreezeIndexIncreasesIndexSettingsVersion() {
         createIndex(index, indexSettings(1, 0).build());
         prepareIndex(index).setSource("field", "value").get();
 
-        final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index(index).getSettingsVersion();
+        final long settingsVersion = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index(index)
+            .getSettingsVersion();
 
         assertAcked(
             client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, index)).actionGet()
         );
         assertIndexFrozen(index);
         assertThat(
-            clusterAdmin().prepareState().get().getState().metadata().index(index).getSettingsVersion(),
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index(index).getSettingsVersion(),
             greaterThan(settingsVersion)
         );
     }
@@ -577,7 +591,7 @@ public void testFreezeEmptyIndexWithTranslogOps() throws Exception {
 
         final IndicesService indicesService = getInstanceFromNode(IndicesService.class);
         assertBusy(() -> {
-            final Index index = clusterAdmin().prepareState().get().getState().metadata().index(indexName).getIndex();
+            final Index index = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index(indexName).getIndex();
             final IndexService indexService = indicesService.indexService(index);
             assertThat(indexService.hasShard(0), is(true));
             assertThat(indexService.getShard(0).getLastKnownGlobalCheckpoint(), greaterThanOrEqualTo(nbNoOps - 1L));
@@ -606,7 +620,7 @@ public void testRecoveryState() {
         );
         assertIndexFrozen(indexName);
 
-        final IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index(indexName);
+        final IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index(indexName);
         final IndexService indexService = getInstanceFromNode(IndicesService.class).indexService(indexMetadata.getIndex());
         for (int i = 0; i < indexMetadata.getNumberOfShards(); i++) {
             final IndexShard indexShard = indexService.getShardOrNull(i);
@@ -674,7 +688,7 @@ public void testComputesTimestampRangeFromMilliseconds() {
             client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "index")).actionGet()
         );
 
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("index");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("index");
         final IndexLongFieldRange timestampFieldRange = indexMetadata.getTimestampRange();
         assertThat(timestampFieldRange, not(sameInstance(IndexLongFieldRange.UNKNOWN)));
         assertThat(timestampFieldRange, not(sameInstance(IndexLongFieldRange.EMPTY)));
@@ -706,7 +720,7 @@ public void testComputesTimestampRangeFromNanoseconds() throws IOException {
             client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "index")).actionGet()
         );
 
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("index");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("index");
         final IndexLongFieldRange timestampFieldRange = indexMetadata.getTimestampRange();
         assertThat(timestampFieldRange, not(sameInstance(IndexLongFieldRange.UNKNOWN)));
         assertThat(timestampFieldRange, not(sameInstance(IndexLongFieldRange.EMPTY)));
@@ -728,7 +742,7 @@ public void testComputesEventIngestedRangeFromMilliseconds() {
             client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "index")).actionGet()
         );
 
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("index");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("index");
         final IndexLongFieldRange eventIngestedRange = indexMetadata.getEventIngestedRange();
         assertThat(eventIngestedRange, not(sameInstance(IndexLongFieldRange.UNKNOWN)));
         assertThat(eventIngestedRange, not(sameInstance(IndexLongFieldRange.EMPTY)));
@@ -760,7 +774,7 @@ public void testComputesEventIngestedRangeFromNanoseconds() throws IOException {
             client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "index")).actionGet()
         );
 
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("index");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("index");
         final IndexLongFieldRange eventIngestedRange = indexMetadata.getEventIngestedRange();
         assertThat(eventIngestedRange, not(sameInstance(IndexLongFieldRange.UNKNOWN)));
         assertThat(eventIngestedRange, not(sameInstance(IndexLongFieldRange.EMPTY)));
@@ -784,7 +798,7 @@ public void testComputesEventIngestedAndTimestampRangesWhenBothPresent() {
             client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, "index")).actionGet()
         );
 
-        IndexMetadata indexMetadata = clusterAdmin().prepareState().get().getState().metadata().index("index");
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().metadata().index("index");
 
         final IndexLongFieldRange eventIngestedRange = indexMetadata.getEventIngestedRange();
         assertThat(eventIngestedRange, not(sameInstance(IndexLongFieldRange.UNKNOWN)));
diff --git a/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java b/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java
index 30d1d6f7c914..d06a9f9cc19b 100644
--- a/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java
+++ b/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/IndexLifecycleInitialisationTests.java
@@ -180,7 +180,7 @@ public void testSingleNodeCluster() throws Exception {
         logger.info("Creating index [test]");
         CreateIndexResponse createIndexResponse = indicesAdmin().create(new CreateIndexRequest("test").settings(settings)).actionGet();
         assertAcked(createIndexResponse);
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         RoutingNode routingNodeEntry1 = clusterState.getRoutingNodes().node(node1);
         assertThat(routingNodeEntry1.numberOfShardsWithState(STARTED), equalTo(1));
         assertBusy(() -> { assertTrue(indexExists("test")); });
@@ -188,7 +188,7 @@ public void testSingleNodeCluster() throws Exception {
         assertThat(indexLifecycleService.getScheduler().jobCount(), equalTo(1));
         assertNotNull(indexLifecycleService.getScheduledJob());
         assertBusy(() -> {
-            LifecycleExecutionState lifecycleState = clusterAdmin().prepareState()
+            LifecycleExecutionState lifecycleState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .get()
                 .getState()
                 .getMetadata()
@@ -425,13 +425,13 @@ public void testMasterDedicatedDataDedicated() throws Exception {
         CreateIndexResponse createIndexResponse = indicesAdmin().create(new CreateIndexRequest("test").settings(settings)).actionGet();
         assertAcked(createIndexResponse);
 
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         RoutingNode routingNodeEntry1 = clusterState.getRoutingNodes().node(node2);
         assertThat(routingNodeEntry1.numberOfShardsWithState(STARTED), equalTo(1));
 
         assertBusy(() -> assertTrue(indexExists("test")));
         assertBusy(() -> {
-            LifecycleExecutionState lifecycleState = clusterAdmin().prepareState()
+            LifecycleExecutionState lifecycleState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .get()
                 .getState()
                 .getMetadata()
diff --git a/x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java b/x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java
index d776f3963c2c..5157683f2dce 100644
--- a/x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java
+++ b/x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/ModelRegistryIT.java
@@ -25,7 +25,6 @@
 import org.elasticsearch.test.ESSingleNodeTestCase;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsFeatureFlag;
 import org.elasticsearch.xpack.inference.InferencePlugin;
 import org.elasticsearch.xpack.inference.registry.ModelRegistry;
 import org.elasticsearch.xpack.inference.services.elser.ElserInternalModel;
@@ -102,7 +101,6 @@ public void testStoreModelWithUnknownFields() throws Exception {
     }
 
     public void testGetModel() throws Exception {
-        assumeTrue("Only if 'inference_adaptive_allocations' feature flag is enabled", AdaptiveAllocationsFeatureFlag.isEnabled());
         String inferenceEntityId = "test-get-model";
         Model model = buildElserModelConfig(inferenceEntityId, TaskType.SPARSE_EMBEDDING);
         AtomicReference<Boolean> putModelHolder = new AtomicReference<>();
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java
index 71906a720e96..1577fbc4a642 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/mapper/SemanticTextFieldMapper.java
@@ -170,13 +170,13 @@ public SemanticTextFieldMapper build(MapperBuilderContext context) {
                     indexVersionCreated,
                     meta.getValue()
                 ),
-                copyTo
+                builderParams(this, context)
             );
         }
     }
 
-    private SemanticTextFieldMapper(String simpleName, MappedFieldType mappedFieldType, CopyTo copyTo) {
-        super(simpleName, mappedFieldType, MultiFields.empty(), copyTo);
+    private SemanticTextFieldMapper(String simpleName, MappedFieldType mappedFieldType, BuilderParams builderParams) {
+        super(simpleName, mappedFieldType, builderParams);
     }
 
     @Override
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ServiceUtils.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ServiceUtils.java
index 7e46dcfea759..c75ded629605 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ServiceUtils.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/ServiceUtils.java
@@ -24,7 +24,6 @@
 import org.elasticsearch.xpack.core.inference.action.InferenceAction;
 import org.elasticsearch.xpack.core.inference.results.InferenceTextEmbeddingFloatResults;
 import org.elasticsearch.xpack.core.inference.results.TextEmbedding;
-import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsFeatureFlag;
 import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsSettings;
 import org.elasticsearch.xpack.inference.services.settings.ApiKeySecrets;
 
@@ -137,9 +136,6 @@ public static AdaptiveAllocationsSettings removeAsAdaptiveAllocationsSettings(
         String key,
         ValidationException validationException
     ) {
-        if (AdaptiveAllocationsFeatureFlag.isEnabled() == false) {
-            return null;
-        }
         Map<String, Object> settingsMap = ServiceUtils.removeFromMap(sourceMap, key);
         if (settingsMap == null) {
             return null;
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceSettings.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceSettings.java
index 8de791325a6d..1acf19c5373b 100644
--- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceSettings.java
+++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elasticsearch/ElasticsearchInternalServiceSettings.java
@@ -16,7 +16,6 @@
 import org.elasticsearch.inference.ServiceSettings;
 import org.elasticsearch.xcontent.ToXContentObject;
 import org.elasticsearch.xcontent.XContentBuilder;
-import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsFeatureFlag;
 import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsSettings;
 import org.elasticsearch.xpack.inference.services.ServiceUtils;
 
@@ -88,18 +87,12 @@ protected static ElasticsearchInternalServiceSettings.Builder fromMap(
         String modelId = extractOptionalString(map, MODEL_ID, ModelConfigurations.SERVICE_SETTINGS, validationException);
 
         if (numAllocations == null && adaptiveAllocationsSettings == null) {
-            if (AdaptiveAllocationsFeatureFlag.isEnabled()) {
-                validationException.addValidationError(
-                    ServiceUtils.missingOneOfSettingsErrorMsg(
-                        List.of(NUM_ALLOCATIONS, ADAPTIVE_ALLOCATIONS),
-                        ModelConfigurations.SERVICE_SETTINGS
-                    )
-                );
-            } else {
-                validationException.addValidationError(
-                    ServiceUtils.missingSettingErrorMsg(NUM_ALLOCATIONS, ModelConfigurations.SERVICE_SETTINGS)
-                );
-            }
+            validationException.addValidationError(
+                ServiceUtils.missingOneOfSettingsErrorMsg(
+                    List.of(NUM_ALLOCATIONS, ADAPTIVE_ALLOCATIONS),
+                    ModelConfigurations.SERVICE_SETTINGS
+                )
+            );
         }
 
         // if an error occurred while parsing, we'll set these to an invalid value, so we don't accidentally get a
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankRetrieverBuilderTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankRetrieverBuilderTests.java
index 332e567cae79..c834f58f1134 100644
--- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankRetrieverBuilderTests.java
+++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankRetrieverBuilderTests.java
@@ -62,7 +62,7 @@ public static TextSimilarityRankRetrieverBuilder createRandomTextSimilarityRankR
             randomAlphaOfLength(10),
             randomAlphaOfLength(20),
             randomAlphaOfLength(50),
-            randomIntBetween(1, 10000),
+            randomIntBetween(100, 10000),
             randomBoolean() ? null : randomFloatBetween(-1.0f, 1.0f, true)
         );
     }
diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/ServiceUtilsTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/ServiceUtilsTests.java
index 76f095236af8..86af5e431d78 100644
--- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/ServiceUtilsTests.java
+++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/ServiceUtilsTests.java
@@ -21,7 +21,6 @@
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.core.inference.results.InferenceTextEmbeddingByteResults;
 import org.elasticsearch.xpack.core.inference.results.InferenceTextEmbeddingFloatResults;
-import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsFeatureFlag;
 import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsSettings;
 import org.elasticsearch.xpack.inference.results.InferenceTextEmbeddingByteResultsTests;
 import org.elasticsearch.xpack.inference.results.TextEmbeddingResultsTests;
@@ -290,8 +289,6 @@ public void testRemoveAsOneOfTypesMissingReturnsNull() {
     }
 
     public void testRemoveAsAdaptiveAllocationsSettings() {
-        assumeTrue("Should only run if adaptive allocations feature flag is enabled", AdaptiveAllocationsFeatureFlag.isEnabled());
-
         Map<String, Object> map = new HashMap<>(
             Map.of("settings", new HashMap<>(Map.of("enabled", true, "min_number_of_allocations", 7, "max_number_of_allocations", 42)))
         );
@@ -314,8 +311,6 @@ public void testRemoveAsAdaptiveAllocationsSettings() {
     }
 
     public void testRemoveAsAdaptiveAllocationsSettings_exceptions() {
-        assumeTrue("Should only run if adaptive allocations feature flag is enabled", AdaptiveAllocationsFeatureFlag.isEnabled());
-
         Map<String, Object> map = new HashMap<>(
             Map.of("settings", new HashMap<>(Map.of("enabled", "YES!", "blah", 42, "max_number_of_allocations", -7)))
         );
diff --git a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java
index 6a481aa11fdc..b1f38191ba7b 100644
--- a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java
+++ b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java
@@ -37,7 +37,6 @@
 import org.elasticsearch.index.mapper.NumberFieldMapper;
 import org.elasticsearch.index.mapper.SimpleMappedFieldType;
 import org.elasticsearch.index.mapper.SortedNumericDocValuesSyntheticFieldLoader;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.TextSearchInfo;
 import org.elasticsearch.index.mapper.TimeSeriesParams;
@@ -267,7 +266,7 @@ public AggregateDoubleMetricFieldMapper build(MapperBuilderContext context) {
             metricFieldType.setMetricFields(metricFields);
             metricFieldType.setDefaultMetric(defaultMetric.getValue());
 
-            return new AggregateDoubleMetricFieldMapper(leafName(), metricFieldType, metricMappers, this);
+            return new AggregateDoubleMetricFieldMapper(leafName(), metricFieldType, metricMappers, builderParams(this, context), this);
         }
     }
 
@@ -543,9 +542,10 @@ private AggregateDoubleMetricFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
         EnumMap<Metric, NumberFieldMapper> metricFieldMappers,
+        BuilderParams builderParams,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, MultiFields.empty(), CopyTo.empty());
+        super(simpleName, mappedFieldType, builderParams);
         this.ignoreMalformed = builder.ignoreMalformed.getValue();
         this.ignoreMalformedByDefault = builder.ignoreMalformed.getDefaultValue();
         this.metrics = builder.metrics.getValue();
@@ -710,18 +710,15 @@ public FieldMapper.Builder getMergeBuilder() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        return new CompositeSyntheticFieldLoader(
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        var loader = new CompositeSyntheticFieldLoader(
             leafName(),
             fullPath(),
             new AggregateMetricSyntheticFieldLoader(fullPath(), metrics),
             new CompositeSyntheticFieldLoader.MalformedValuesLayer(fullPath())
         );
+
+        return new SyntheticSourceSupport.Native(loader);
     }
 
     public static class AggregateMetricSyntheticFieldLoader implements CompositeSyntheticFieldLoader.DocValuesLayer {
diff --git a/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java b/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java
index ed4fa99b29ea..c594c9f55316 100644
--- a/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java
+++ b/x-pack/plugin/mapper-constant-keyword/src/main/java/org/elasticsearch/xpack/constantkeyword/mapper/ConstantKeywordFieldMapper.java
@@ -111,7 +111,8 @@ public ConstantKeywordFieldMapper build(MapperBuilderContext context) {
             }
             return new ConstantKeywordFieldMapper(
                 leafName(),
-                new ConstantKeywordFieldType(context.buildFullName(leafName()), value.getValue(), meta.getValue())
+                new ConstantKeywordFieldType(context.buildFullName(leafName()), value.getValue(), meta.getValue()),
+                builderParams(this, context)
             );
         }
     }
@@ -301,8 +302,8 @@ public Query regexpQuery(
 
     }
 
-    ConstantKeywordFieldMapper(String simpleName, MappedFieldType mappedFieldType) {
-        super(simpleName, mappedFieldType, MultiFields.empty(), CopyTo.empty());
+    ConstantKeywordFieldMapper(String simpleName, MappedFieldType mappedFieldType, BuilderParams builderParams) {
+        super(simpleName, mappedFieldType, builderParams);
     }
 
     @Override
@@ -321,7 +322,7 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
 
         if (fieldType().value == null) {
             ConstantKeywordFieldType newFieldType = new ConstantKeywordFieldType(fieldType().name(), value, fieldType().meta());
-            Mapper update = new ConstantKeywordFieldMapper(leafName(), newFieldType);
+            Mapper update = new ConstantKeywordFieldMapper(leafName(), newFieldType, builderParams);
             boolean dynamicMapperAdded = context.addDynamicMapper(update);
             // the mapper is already part of the mapping, we're just updating it with the new value
             assert dynamicMapperAdded;
@@ -344,18 +345,14 @@ protected String contentType() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
+    protected SyntheticSourceSupport syntheticSourceSupport() {
         String value = fieldType().value();
-        ;
+
         if (value == null) {
-            return SourceLoader.SyntheticFieldLoader.NOTHING;
+            return new SyntheticSourceSupport.Native(SourceLoader.SyntheticFieldLoader.NOTHING);
         }
-        return new SourceLoader.SyntheticFieldLoader() {
+
+        var loader = new SourceLoader.SyntheticFieldLoader() {
             @Override
             public Stream<Map.Entry<String, StoredFieldLoader>> storedFieldLoaders() {
                 return Stream.of();
@@ -388,5 +385,7 @@ public String fieldName() {
                 return fullPath();
             }
         };
+
+        return new SyntheticSourceSupport.Native(loader);
     }
 }
diff --git a/x-pack/plugin/mapper-counted-keyword/src/main/java/org/elasticsearch/xpack/countedkeyword/CountedKeywordFieldMapper.java b/x-pack/plugin/mapper-counted-keyword/src/main/java/org/elasticsearch/xpack/countedkeyword/CountedKeywordFieldMapper.java
index dcf4ba7a3ce2..e728a74955f3 100644
--- a/x-pack/plugin/mapper-counted-keyword/src/main/java/org/elasticsearch/xpack/countedkeyword/CountedKeywordFieldMapper.java
+++ b/x-pack/plugin/mapper-counted-keyword/src/main/java/org/elasticsearch/xpack/countedkeyword/CountedKeywordFieldMapper.java
@@ -307,8 +307,7 @@ public FieldMapper build(MapperBuilderContext context) {
                     meta.getValue(),
                     countFieldMapper.fieldType()
                 ),
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 countFieldMapper
             );
         }
@@ -323,11 +322,10 @@ protected CountedKeywordFieldMapper(
         String simpleName,
         FieldType fieldType,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         BinaryFieldMapper countFieldMapper
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+        super(simpleName, mappedFieldType, builderParams);
         this.fieldType = fieldType;
         this.countFieldMapper = countFieldMapper;
     }
diff --git a/x-pack/plugin/mapper-unsigned-long/build.gradle b/x-pack/plugin/mapper-unsigned-long/build.gradle
index 9c04584cdf13..e011723da623 100644
--- a/x-pack/plugin/mapper-unsigned-long/build.gradle
+++ b/x-pack/plugin/mapper-unsigned-long/build.gradle
@@ -37,15 +37,6 @@ restResources {
     }
 }
 
-tasks.named("yamlRestTestV7CompatTest").configure {
-    systemProperty 'tests.rest.blacklist', [
-        '50_script_values/Scripted fields values return Long',
-        '50_script_values/Scripted sort values',
-        '50_script_values/Script query',
-        '50_script_values/script_score query'
-    ].join(',')
-}
-
 if (BuildParams.isSnapshotBuild() == false) {
   tasks.named("test").configure {
     systemProperty 'es.index_mode_feature_flag_registered', 'true'
diff --git a/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java b/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java
index eae4094fee0d..5b04225cee10 100644
--- a/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java
+++ b/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java
@@ -36,7 +36,6 @@
 import org.elasticsearch.index.mapper.MappingLookup;
 import org.elasticsearch.index.mapper.SimpleMappedFieldType;
 import org.elasticsearch.index.mapper.SortedNumericDocValuesSyntheticFieldLoader;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.TextSearchInfo;
 import org.elasticsearch.index.mapper.TimeSeriesParams;
@@ -210,14 +209,7 @@ public UnsignedLongFieldMapper build(MapperBuilderContext context) {
                 metric.getValue(),
                 indexMode
             );
-            return new UnsignedLongFieldMapper(
-                leafName(),
-                fieldType,
-                multiFieldsBuilder.build(this, context),
-                copyTo,
-                context.isSourceSynthetic(),
-                this
-            );
+            return new UnsignedLongFieldMapper(leafName(), fieldType, builderParams(this, context), context.isSourceSynthetic(), this);
         }
     }
 
@@ -577,12 +569,11 @@ public MetricType getMetricType() {
     private UnsignedLongFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         boolean isSourceSynthetic,
         Builder builder
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+        super(simpleName, mappedFieldType, builderParams);
         this.isSourceSynthetic = isSourceSynthetic;
         this.indexed = builder.indexed.getValue();
         this.hasDocValues = builder.hasDocValues.getValue();
@@ -761,31 +752,18 @@ public void doValidate(MappingLookup lookup) {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        if (hasDocValues) {
+            var loader = new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed()) {
+                @Override
+                protected void writeValue(XContentBuilder b, long value) throws IOException {
+                    b.value(DocValueFormat.UNSIGNED_LONG_SHIFTED.format(value));
+                }
+            };
 
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (hasDocValues == false) {
-            throw new IllegalArgumentException(
-                "field ["
-                    + fullPath()
-                    + "] of type ["
-                    + typeName()
-                    + "] doesn't support synthetic source because it doesn't have doc values"
-            );
-        }
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
+            return new SyntheticSourceSupport.Native(loader);
         }
-        return new SortedNumericDocValuesSyntheticFieldLoader(fullPath(), leafName(), ignoreMalformed()) {
-            @Override
-            protected void writeValue(XContentBuilder b, long value) throws IOException {
-                b.value(DocValueFormat.UNSIGNED_LONG_SHIFTED.format(value));
-            }
-        };
+
+        return super.syntheticSourceSupport();
     }
 }
diff --git a/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapperTests.java b/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapperTests.java
index 46969d8dbb2e..cdb25fbe995b 100644
--- a/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapperTests.java
+++ b/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapperTests.java
@@ -42,7 +42,6 @@
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.matchesPattern;
 
 public class UnsignedLongFieldMapperTests extends WholeNumberFieldMapperTests {
 
@@ -504,15 +503,7 @@ private void mapping(XContentBuilder b) throws IOException {
 
         @Override
         public List<SyntheticSourceInvalidExample> invalidExample() {
-            return List.of(
-                new SyntheticSourceInvalidExample(
-                    matchesPattern("field \\[field] of type \\[.+] doesn't support synthetic source because it doesn't have doc values"),
-                    b -> {
-                        minimalMapping(b);
-                        b.field("doc_values", false);
-                    }
-                )
-            );
+            return List.of();
         }
     }
 }
diff --git a/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/80_synthetic_source.yml b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/80_synthetic_source.yml
new file mode 100644
index 000000000000..b88fca3c478a
--- /dev/null
+++ b/x-pack/plugin/mapper-unsigned-long/src/yamlRestTest/resources/rest-api-spec/test/80_synthetic_source.yml
@@ -0,0 +1,152 @@
+synthetic source:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires synthetic source support
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              name:
+                type: keyword
+              ulong:
+                type: unsigned_long
+                ignore_malformed: true
+
+  - do:
+      bulk:
+        index: synthetic_source_test
+        refresh: true
+        body: |
+          { "index": {"_id" : "1"} }
+          { "name": "A", "ulong": "120" }
+          { "index": {"_id" : "2"} }
+          { "name": "B", "ulong": "hello" }
+          { "index": {"_id" : "3"} }
+          { "name": "C", "ulong": [6, 5, 4] }
+
+  - do:
+      search:
+        index: synthetic_source_test
+        sort: name
+
+  - match: { "hits.total.value": 3 }
+  - match:
+      hits.hits.0._source.ulong: 120
+  - match:
+      hits.hits.1._source.ulong: "hello"
+  - match:
+      hits.hits.2._source.ulong: [4, 5, 6]
+
+---
+synthetic source with copy_to:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires copy_to support in synthetic source
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              name:
+                type: keyword
+              ulong:
+                type: unsigned_long
+                ignore_malformed: true
+                copy_to: copy
+              copy:
+                type: keyword
+
+  - do:
+      bulk:
+        index: synthetic_source_test
+        refresh: true
+        body: |
+          { "index": {"_id" : "1"} }
+          { "name": "A", "ulong": "120" }
+          { "index": {"_id" : "2"} }
+          { "name": "B", "ulong": "hello" }
+          { "index": {"_id" : "3"} }
+          { "name": "C", "ulong": [6, 5, 4] }
+
+  - do:
+      search:
+        index: synthetic_source_test
+        sort: name
+        body:
+          docvalue_fields: ["copy"]
+
+  - match: { "hits.total.value": 3 }
+
+  - match:
+      hits.hits.0._source.ulong: "120"
+  - match:
+      hits.hits.0.fields.copy.0: "120"
+
+  - match:
+      hits.hits.1._source.ulong: "hello"
+  - match:
+      hits.hits.1.fields.copy.0: "hello"
+
+  - match:
+      hits.hits.2._source.ulong: [6, 5, 4]
+  - match:
+      hits.hits.2.fields.copy: ["4", "5", "6"]
+
+---
+synthetic source with disabled doc_values:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires disabled doc_values support in synthetic source
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              name:
+                type: keyword
+              ulong:
+                type: unsigned_long
+                ignore_malformed: true
+                doc_values: false
+
+  - do:
+      bulk:
+        index: synthetic_source_test
+        refresh: true
+        body: |
+          { "index": {"_id" : "1"} }
+          { "name": "A", "ulong": "120" }
+          { "index": {"_id" : "2"} }
+          { "name": "B", "ulong": "hello" }
+          { "index": {"_id" : "3"} }
+          { "name": "C", "ulong": [6, 5, 4] }
+
+  - do:
+      search:
+        index: synthetic_source_test
+        sort: name
+
+  - match: { "hits.total.value": 3 }
+
+  - match:
+      hits.hits.0._source.ulong: "120"
+
+  - match:
+      hits.hits.1._source.ulong: "hello"
+
+  - match:
+      hits.hits.2._source.ulong: [6, 5, 4]
+
diff --git a/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java
index 553b9847001c..b49b4500ce7b 100644
--- a/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java
+++ b/x-pack/plugin/mapper-version/src/main/java/org/elasticsearch/xpack/versionfield/VersionStringFieldMapper.java
@@ -49,7 +49,6 @@
 import org.elasticsearch.index.mapper.MapperBuilderContext;
 import org.elasticsearch.index.mapper.SearchAfterTermsEnum;
 import org.elasticsearch.index.mapper.SortedSetDocValuesSyntheticFieldLoaderLayer;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.TermBasedFieldType;
 import org.elasticsearch.index.mapper.TextSearchInfo;
@@ -119,13 +118,7 @@ private VersionStringFieldType buildFieldType(MapperBuilderContext context, Fiel
         @Override
         public VersionStringFieldMapper build(MapperBuilderContext context) {
             FieldType fieldtype = new FieldType(Defaults.FIELD_TYPE);
-            return new VersionStringFieldMapper(
-                leafName(),
-                fieldtype,
-                buildFieldType(context, fieldtype),
-                multiFieldsBuilder.build(this, context),
-                copyTo
-            );
+            return new VersionStringFieldMapper(leafName(), fieldtype, buildFieldType(context, fieldtype), builderParams(this, context));
         }
 
         @Override
@@ -361,14 +354,8 @@ public TermsEnum getTerms(IndexReader reader, String prefix, boolean caseInsensi
 
     private final FieldType fieldType;
 
-    private VersionStringFieldMapper(
-        String simpleName,
-        FieldType fieldType,
-        MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo
-    ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+    private VersionStringFieldMapper(String simpleName, FieldType fieldType, MappedFieldType mappedFieldType, BuilderParams buildParams) {
+        super(simpleName, mappedFieldType, buildParams);
         this.fieldType = freezeAndDeduplicateFieldType(fieldType);
     }
 
@@ -447,18 +434,8 @@ public FieldMapper.Builder getMergeBuilder() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-        return new CompositeSyntheticFieldLoader(leafName(), fullPath(), new SortedSetDocValuesSyntheticFieldLoaderLayer(fullPath()) {
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        var loader = new CompositeSyntheticFieldLoader(leafName(), fullPath(), new SortedSetDocValuesSyntheticFieldLoaderLayer(fullPath()) {
             @Override
             protected BytesRef convert(BytesRef value) {
                 return VersionEncoder.decodeVersion(value);
@@ -470,5 +447,7 @@ protected BytesRef preserve(BytesRef value) {
                 return value;
             }
         });
+
+        return new SyntheticSourceSupport.Native(loader);
     }
 }
diff --git a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml
index 4ff2499ad7e7..1ec91f5fde8d 100644
--- a/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml
+++ b/x-pack/plugin/mapper-version/src/yamlRestTest/resources/rest-api-spec/test/40_synthetic_source.yml
@@ -65,3 +65,43 @@ script values:
   - match: { hits.hits.1.fields.field.0: "1.2.3.4.5" }
   - match: { hits.hits.2.fields.field.0: "1.2.3-abc+def" }
   - match: { hits.hits.3.fields.field.0: "1.0.0" }
+
+---
+synthetic source with copy_to:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires copy_to support in synthetic source
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              ver:
+                type: version
+                copy_to: copy
+              copy:
+                type: keyword
+
+  - do:
+      bulk:
+        index: synthetic_source_test
+        refresh: true
+        body: |
+          { "index": {"_id" : "1"} }
+          { "ver": "1.2.3-abc+def" }
+
+  - do:
+      search:
+        index: synthetic_source_test
+        body:
+          fields: ["copy"]
+
+  - match: { "hits.total.value": 1 }
+  - match:
+      hits.hits.0._source.ver: "1.2.3-abc+def"
+  - match:
+      hits.hits.0.fields.copy.0: "1.2.3-abc+def"
diff --git a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/build.gradle b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/build.gradle
index b19fa4ab5f18..bc22552d0d73 100644
--- a/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/build.gradle
+++ b/x-pack/plugin/ml/qa/multi-cluster-tests-with-security/build.gradle
@@ -12,7 +12,7 @@ dependencies {
   testImplementation project(':x-pack:qa')
 }
 
-Version ccsCompatVersion = new Version(VersionProperties.getElasticsearchVersion().getMajor(), VersionProperties.getElasticsearchVersion().getMinor() - 1, 0)
+Version ccsCompatVersion = BuildParams.bwcVersions.minimumWireCompatibleVersion
 
 restResources {
   restApi {
diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle b/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle
index c9e860f27a5d..19f2e984f649 100644
--- a/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle
+++ b/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle
@@ -17,6 +17,7 @@ dependencies {
   javaRestTestImplementation project(path: xpackModule('rank-rrf'))
   javaRestTestImplementation project(path: xpackModule('esql-core'))
   javaRestTestImplementation project(path: xpackModule('esql'))
+  javaRestTestImplementation project(path: xpackModule('snapshot-repo-test-kit'))
 }
 
 // location for keys and certificates
diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java
index 623b676e0e0e..5287d149fae3 100644
--- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java
+++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java
@@ -91,7 +91,7 @@ public void testLookbackOnly() throws Exception {
         indexDocs(logger, "data-1", numDocs, twoWeeksAgo, oneWeekAgo);
 
         client().admin().indices().prepareCreate("data-2").setMapping("time", "type=date").get();
-        clusterAdmin().prepareHealth("data-1", "data-2").setWaitForYellowStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "data-1", "data-2").setWaitForYellowStatus().get();
         long numDocs2 = randomIntBetween(32, 2048);
         indexDocs(logger, "data-2", numDocs2, oneWeekAgo, now);
 
@@ -137,7 +137,7 @@ public void testLookbackOnlyDataStream() throws Exception {
         long twoWeeksAgo = oneWeekAgo - 604800000;
         indexDocs(logger, "datafeed_data_stream", numDocs, twoWeeksAgo, oneWeekAgo);
 
-        clusterAdmin().prepareHealth("datafeed_data_stream").setWaitForYellowStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "datafeed_data_stream").setWaitForYellowStatus().get();
 
         Job.Builder job = createScheduledJob("lookback-data-stream-job");
         PutJobAction.Response putJobResponse = putJob(job);
@@ -320,7 +320,7 @@ public void testStopAndRestartCompositeDatafeed() throws Exception {
             Intervals.alignToCeil(oneWeekAgo, intervalMillis),
             Intervals.alignToFloor(now, intervalMillis)
         );
-        clusterAdmin().prepareHealth(indexName).setWaitForYellowStatus().get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).setWaitForYellowStatus().get();
 
         String scrollJobId = "stop-restart-scroll";
         Job.Builder scrollJob = createScheduledJob(scrollJobId);
diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java
index 90f9c721d25a..e8acc37e0e15 100644
--- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java
+++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java
@@ -281,7 +281,7 @@ private void assertInferenceModelPersisted(String jobId, Matcher<? super Integer
     }
 
     protected Collection<PersistentTasksCustomMetadata.PersistentTask<?>> analyticsTaskList() {
-        ClusterState masterClusterState = clusterAdmin().prepareState().all().get().getState();
+        ClusterState masterClusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState();
         PersistentTasksCustomMetadata persistentTasks = masterClusterState.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
         return persistentTasks != null
             ? persistentTasks.findTasks(MlTasks.DATA_FRAME_ANALYTICS_TASK_NAME, task -> true)
diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeIntegTestCase.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeIntegTestCase.java
index ca5ecd80a83b..3b705e63a145 100644
--- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeIntegTestCase.java
+++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeIntegTestCase.java
@@ -279,7 +279,7 @@ protected void setUpgradeModeTo(boolean enabled) {
     }
 
     protected boolean upgradeMode() {
-        ClusterState masterClusterState = clusterAdmin().prepareState().all().get().getState();
+        ClusterState masterClusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState();
         MlMetadata mlMetadata = MlMetadata.getMlMetadata(masterClusterState);
         return mlMetadata.isUpgradeMode();
     }
diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/SetUpgradeModeIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/SetUpgradeModeIT.java
index 123300455202..1f38fb05cb6e 100644
--- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/SetUpgradeModeIT.java
+++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/SetUpgradeModeIT.java
@@ -62,7 +62,7 @@ public void testEnableUpgradeMode() throws Exception {
             hasSize(2)
         );
 
-        ClusterState masterClusterState = clusterAdmin().prepareState().all().get().getState();
+        ClusterState masterClusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState();
 
         PersistentTasksCustomMetadata persistentTasks = masterClusterState.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
         assertThat(persistentTasks.findTasks(MlTasks.DATAFEED_TASK_NAME, task -> true), hasSize(1));
@@ -71,7 +71,7 @@ public void testEnableUpgradeMode() throws Exception {
         // Set the upgrade mode setting
         setUpgradeModeTo(true);
 
-        masterClusterState = clusterAdmin().prepareState().all().get().getState();
+        masterClusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState();
 
         // Assert state for tasks still exists and that the upgrade setting is set
         persistentTasks = masterClusterState.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
@@ -99,7 +99,7 @@ public void testEnableUpgradeMode() throws Exception {
         // Disable the setting
         setUpgradeModeTo(false);
 
-        masterClusterState = clusterAdmin().prepareState().all().get().getState();
+        masterClusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).all().get().getState();
 
         persistentTasks = masterClusterState.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
         assertThat(persistentTasks.findTasks(MlTasks.DATAFEED_TASK_NAME, task -> true), hasSize(1));
diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureResetIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureResetIT.java
index 1b1ad986bc8a..d179a28aa989 100644
--- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureResetIT.java
+++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureResetIT.java
@@ -8,12 +8,9 @@
 
 import org.elasticsearch.action.admin.cluster.snapshots.features.ResetFeatureStateAction;
 import org.elasticsearch.action.admin.cluster.snapshots.features.ResetFeatureStateRequest;
-import org.elasticsearch.action.ingest.DeletePipelineRequest;
-import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.bytes.BytesArray;
+import org.elasticsearch.ingest.IngestPipelineTestUtils;
 import org.elasticsearch.tasks.TaskInfo;
 import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.core.ml.MlMetadata;
@@ -112,13 +109,7 @@ protected void cleanUpResources() {
     @After
     public void cleanup() throws Exception {
         cleanUp();
-        for (String pipeline : createdPipelines) {
-            try {
-                client().execute(DeletePipelineTransportAction.TYPE, new DeletePipelineRequest(pipeline)).actionGet();
-            } catch (Exception ex) {
-                logger.warn(() -> "error cleaning up pipeline [" + pipeline + "]", ex);
-            }
-        }
+        IngestPipelineTestUtils.deletePipelinesIgnoringExceptions(client(), createdPipelines);
     }
 
     public void testMLFeatureReset() throws Exception {
@@ -130,10 +121,12 @@ public void testMLFeatureReset() throws Exception {
         for (int i = 0; i < 100; i++) {
             indexDocForInference("feature_reset_inference_pipeline");
         }
-        client().execute(DeletePipelineTransportAction.TYPE, new DeletePipelineRequest("feature_reset_inference_pipeline")).actionGet();
+        deletePipeline("feature_reset_inference_pipeline");
         createdPipelines.remove("feature_reset_inference_pipeline");
 
-        assertBusy(() -> assertThat(countInferenceProcessors(clusterAdmin().prepareState().get().getState()), equalTo(0)));
+        assertBusy(
+            () -> assertThat(countInferenceProcessors(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState()), equalTo(0))
+        );
         client().execute(ResetFeatureStateAction.INSTANCE, new ResetFeatureStateRequest(TEST_REQUEST_TIMEOUT)).actionGet();
         assertBusy(() -> {
             List<String> indices = Arrays.asList(client().admin().indices().prepareGetIndex().addIndices(".ml*").get().indices());
@@ -158,8 +151,7 @@ public void testMLFeatureResetFailureDueToPipelines() throws Exception {
                 "Unable to reset machine learning feature as there are ingest pipelines still referencing trained machine learning models"
             )
         );
-        client().execute(DeletePipelineTransportAction.TYPE, new DeletePipelineRequest("feature_reset_failure_inference_pipeline"))
-            .actionGet();
+        deletePipeline("feature_reset_failure_inference_pipeline");
         createdPipelines.remove("feature_reset_failure_inference_pipeline");
         assertThat(isResetMode(), is(false));
     }
@@ -224,7 +216,7 @@ void createModelDeployment() {
     }
 
     private boolean isResetMode() {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         return MlMetadata.getMlMetadata(state).isResetMode();
     }
 
@@ -292,8 +284,8 @@ private void startRealtime(String jobId) throws Exception {
         }, 30, TimeUnit.SECONDS);
     }
 
-    private void putTrainedModelIngestPipeline(String pipelineId) throws Exception {
-        client().execute(PutPipelineTransportAction.TYPE, new PutPipelineRequest(pipelineId, new BytesArray("""
+    private void putTrainedModelIngestPipeline(String pipelineId) {
+        putJsonPipeline(pipelineId, """
             {
                 "processors": [
                   {
@@ -304,7 +296,7 @@ private void putTrainedModelIngestPipeline(String pipelineId) throws Exception {
                     }
                   }
                 ]
-              }"""), XContentType.JSON)).actionGet();
+              }""");
     }
 
     private void indexDocForInference(String pipelineId) {
diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/license/MachineLearningLicensingIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/license/MachineLearningLicensingIT.java
index 592f42e13e30..08d09f70cb46 100644
--- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/license/MachineLearningLicensingIT.java
+++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/license/MachineLearningLicensingIT.java
@@ -9,8 +9,6 @@
 import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.ElasticsearchSecurityException;
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.action.ingest.PutPipelineTransportAction;
 import org.elasticsearch.action.ingest.SimulateDocumentBaseResult;
 import org.elasticsearch.action.ingest.SimulatePipelineAction;
 import org.elasticsearch.action.ingest.SimulatePipelineRequest;
@@ -251,7 +249,7 @@ public void testAutoCloseJobWithDatafeed() throws Exception {
             DatafeedState datafeedState = getDatafeedStats(datafeedId).getDatafeedState();
             assertEquals(DatafeedState.STOPPED, datafeedState);
 
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             List<PersistentTasksCustomMetadata.PersistentTask<?>> tasks = findTasks(state, RELATED_TASKS);
             assertEquals(0, tasks.size());
         });
@@ -276,7 +274,7 @@ public void testAutoCloseJobWithDatafeed() throws Exception {
             DatafeedState datafeedState = getDatafeedStats(datafeedId).getDatafeedState();
             assertEquals(DatafeedState.STARTED, datafeedState);
 
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             List<PersistentTasksCustomMetadata.PersistentTask<?>> tasks = findTasks(state, RELATED_TASKS);
             assertEquals(2, tasks.size());
         });
@@ -296,7 +294,7 @@ public void testAutoCloseJobWithDatafeed() throws Exception {
             DatafeedState datafeedState = getDatafeedStats(datafeedId).getDatafeedState();
             assertEquals(DatafeedState.STOPPED, datafeedState);
 
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             List<PersistentTasksCustomMetadata.PersistentTask<?>> tasks = findTasks(state, RELATED_TASKS);
             assertEquals(0, tasks.size());
         });
@@ -336,7 +334,7 @@ public void testMachineLearningStartDatafeedActionRestricted() throws Exception
         assertBusy(() -> {
             JobState jobState = getJobStats(jobId).getState();
             assertEquals(JobState.CLOSED, jobState);
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             List<PersistentTasksCustomMetadata.PersistentTask<?>> tasks = findTasks(state, RELATED_TASKS);
             assertEquals(0, tasks.size());
         });
@@ -527,18 +525,7 @@ public void testMachineLearningCreateInferenceProcessorRestricted() {
                   }]}
             """;
         // Creating a pipeline should work
-        PlainActionFuture<AcknowledgedResponse> putPipelineListener = new PlainActionFuture<>();
-        client().execute(
-            PutPipelineTransportAction.TYPE,
-            new PutPipelineRequest(
-                "test_infer_license_pipeline",
-                new BytesArray(pipeline.getBytes(StandardCharsets.UTF_8)),
-                XContentType.JSON
-            ),
-            putPipelineListener
-        );
-        AcknowledgedResponse putPipelineResponse = putPipelineListener.actionGet();
-        assertTrue(putPipelineResponse.isAcknowledged());
+        putJsonPipeline("test_infer_license_pipeline", pipeline);
 
         prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline").setSource("{}", XContentType.JSON).get();
 
@@ -575,18 +562,7 @@ public void testMachineLearningCreateInferenceProcessorRestricted() {
         }
 
         // Creating a new pipeline with an inference processor should work
-        putPipelineListener = new PlainActionFuture<>();
-        client().execute(
-            PutPipelineTransportAction.TYPE,
-            new PutPipelineRequest(
-                "test_infer_license_pipeline_again",
-                new BytesArray(pipeline.getBytes(StandardCharsets.UTF_8)),
-                XContentType.JSON
-            ),
-            putPipelineListener
-        );
-        putPipelineResponse = putPipelineListener.actionGet();
-        assertTrue(putPipelineResponse.isAcknowledged());
+        putJsonPipeline("test_infer_license_pipeline_again", pipeline);
 
         // Inference against the new pipeline should fail since it has never previously succeeded
         ElasticsearchSecurityException e = expectThrows(ElasticsearchSecurityException.class, () -> {
@@ -609,18 +585,7 @@ public void testMachineLearningCreateInferenceProcessorRestricted() {
         enableLicensing(mode);
         assertMLAllowed(true);
         // test that license restricted apis do now work
-        PlainActionFuture<AcknowledgedResponse> putPipelineListenerNewLicense = new PlainActionFuture<>();
-        client().execute(
-            PutPipelineTransportAction.TYPE,
-            new PutPipelineRequest(
-                "test_infer_license_pipeline",
-                new BytesArray(pipeline.getBytes(StandardCharsets.UTF_8)),
-                XContentType.JSON
-            ),
-            putPipelineListenerNewLicense
-        );
-        AcknowledgedResponse putPipelineResponseNewLicense = putPipelineListenerNewLicense.actionGet();
-        assertTrue(putPipelineResponseNewLicense.isAcknowledged());
+        putJsonPipeline("test_infer_license_pipeline", pipeline);
 
         PlainActionFuture<SimulatePipelineResponse> simulatePipelineListenerNewLicense = new PlainActionFuture<>();
         client().execute(
diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java
index 6dbec53994b2..a6eecfeb94c3 100644
--- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java
+++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/BasicDistributedJobsIT.java
@@ -230,7 +230,7 @@ public void testDedicatedMlNode() throws Exception {
         OpenJobAction.Request openJobRequest = new OpenJobAction.Request(job.getId());
         client().execute(OpenJobAction.INSTANCE, openJobRequest).actionGet();
         assertBusy(() -> {
-            ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+            ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             PersistentTasksCustomMetadata tasks = clusterState.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
             PersistentTask<?> task = tasks.getTask(MlTasks.jobTaskId(jobId));
 
@@ -328,7 +328,7 @@ public void testMaxConcurrentJobAllocations() throws Exception {
         }
         ensureStableCluster(1, nonMlNode);
         assertBusy(() -> {
-            ClusterState state = client(nonMlNode).admin().cluster().prepareState().get().getState();
+            ClusterState state = client(nonMlNode).admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             List<PersistentTask<?>> tasks = findTasks(state, MlTasks.JOB_TASK_NAME);
             assertEquals(numJobs, tasks.size());
             for (PersistentTask<?> task : tasks) {
@@ -411,7 +411,7 @@ public void testMlStateAndResultsIndicesNotAvailable() throws Exception {
         CloseJobAction.Request closeJobRequest = new CloseJobAction.Request(jobId);
         client().execute(CloseJobAction.INSTANCE, closeJobRequest).actionGet();
         assertBusy(() -> {
-            ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+            ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             List<PersistentTask<?>> tasks = findTasks(clusterState, MlTasks.JOB_TASK_NAME);
             assertEquals(0, tasks.size());
         });
@@ -502,7 +502,7 @@ public void testCloseUnassignedLazyJobAndDatafeed() {
     }
 
     private void assertJobTask(String jobId, JobState expectedState, boolean hasExecutorNode) {
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<PersistentTask<?>> tasks = findTasks(clusterState, MlTasks.JOB_TASK_NAME);
         assertEquals(1, tasks.size());
         PersistentTask<?> task = tasks.get(0);
@@ -524,7 +524,7 @@ private void assertJobTask(String jobId, JobState expectedState, boolean hasExec
 
     private CheckedRunnable<Exception> checkAllJobsAreAssignedAndOpened(int numJobs) {
         return () -> {
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             List<PersistentTask<?>> tasks = findTasks(state, MlTasks.JOB_TASK_NAME);
             assertEquals(numJobs, tasks.size());
             for (PersistentTask<?> task : tasks) {
diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/DatafeedCcsIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/DatafeedCcsIT.java
index b71ecd485853..8fddfa47c377 100644
--- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/DatafeedCcsIT.java
+++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/DatafeedCcsIT.java
@@ -244,7 +244,7 @@ private void setupJobAndDatafeed(String jobId, String datafeedId, Long endTimeMs
     private void setSkipUnavailable(boolean skip) {
         client(LOCAL_CLUSTER).admin()
             .cluster()
-            .prepareUpdateSettings()
+            .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().put("cluster.remote." + REMOTE_CLUSTER + ".skip_unavailable", skip).build())
             .get();
     }
@@ -252,7 +252,7 @@ private void setSkipUnavailable(boolean skip) {
     private void clearSkipUnavailable() {
         client(LOCAL_CLUSTER).admin()
             .cluster()
-            .prepareUpdateSettings()
+            .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
             .setPersistentSettings(Settings.builder().putNull("cluster.remote." + REMOTE_CLUSTER + ".skip_unavailable").build())
             .get();
     }
diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java
index 33fd7c108863..17fe20c5115f 100644
--- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java
+++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java
@@ -135,7 +135,12 @@ public void testLoseDedicatedMasterNode() throws Exception {
             Settings masterDataPathSettings = internalCluster().dataPathSettings(internalCluster().getMasterName());
             internalCluster().stopCurrentMasterNode();
             assertBusy(() -> {
-                ClusterState state = client(mlAndDataNode).admin().cluster().prepareState().setLocal(true).get().getState();
+                ClusterState state = client(mlAndDataNode).admin()
+                    .cluster()
+                    .prepareState(TEST_REQUEST_TIMEOUT)
+                    .setLocal(true)
+                    .get()
+                    .getState();
                 assertNull(state.nodes().getMasterNodeId());
             });
             logger.info("Restarting dedicated master node");
diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureLicenseTrackingIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureLicenseTrackingIT.java
index 936e499e94fe..ce270c570c8c 100644
--- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureLicenseTrackingIT.java
+++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureLicenseTrackingIT.java
@@ -7,16 +7,10 @@
 
 package org.elasticsearch.xpack.ml.integration;
 
-import org.elasticsearch.action.ingest.DeletePipelineRequest;
-import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
-import org.elasticsearch.action.ingest.PutPipelineRequest;
-import org.elasticsearch.action.ingest.PutPipelineTransportAction;
-import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.core.Strings;
+import org.elasticsearch.ingest.IngestPipelineTestUtils;
 import org.elasticsearch.license.GetFeatureUsageRequest;
 import org.elasticsearch.license.GetFeatureUsageResponse;
 import org.elasticsearch.license.TransportGetFeatureUsageAction;
-import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.core.ml.action.CloseJobAction;
 import org.elasticsearch.xpack.core.ml.action.GetJobsStatsAction;
 import org.elasticsearch.xpack.core.ml.action.OpenJobAction;
@@ -42,6 +36,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import static org.elasticsearch.core.Strings.format;
 import static org.elasticsearch.xpack.core.ml.MachineLearningField.ML_FEATURE_FAMILY;
 import static org.elasticsearch.xpack.ml.inference.loadingservice.LocalModelTests.buildClassification;
 import static org.elasticsearch.xpack.ml.integration.ModelInferenceActionIT.buildTrainedModelConfigBuilder;
@@ -59,13 +54,7 @@ public class TestFeatureLicenseTrackingIT extends MlSingleNodeTestCase {
 
     @After
     public void cleanup() throws Exception {
-        for (String pipeline : createdPipelines) {
-            try {
-                client().execute(DeletePipelineTransportAction.TYPE, new DeletePipelineRequest(pipeline)).actionGet();
-            } catch (Exception ex) {
-                logger.warn(() -> "error cleaning up pipeline [" + pipeline + "]", ex);
-            }
-        }
+        IngestPipelineTestUtils.deletePipelinesIgnoringExceptions(client(), createdPipelines);
         // Some of the tests have async side effects. We need to wait for these to complete before continuing
         // the cleanup, otherwise unexpected indices may get created during the cleanup process.
         BaseMlIntegTestCase.waitForPendingTasks(client());
@@ -170,7 +159,7 @@ public void testFeatureTrackingInferenceModelPipeline() throws Exception {
             assertThat(lastUsage.toInstant(), lessThan(recentUsage.toInstant()));
         });
 
-        client().execute(DeletePipelineTransportAction.TYPE, new DeletePipelineRequest(pipelineId)).actionGet();
+        deletePipeline(pipelineId);
         createdPipelines.remove(pipelineId);
 
         // Make sure that feature usage keeps the last usage once the model is removed
@@ -210,8 +199,8 @@ private List<GetJobsStatsAction.Response.JobStats> getJobStats(String jobId) {
         return response.getResponse().results();
     }
 
-    private void putTrainedModelIngestPipeline(String pipelineId, String modelId) throws Exception {
-        client().execute(PutPipelineTransportAction.TYPE, new PutPipelineRequest(pipelineId, new BytesArray(Strings.format("""
+    private void putTrainedModelIngestPipeline(String pipelineId, String modelId) {
+        putJsonPipeline(pipelineId, format("""
             {
                 "processors": [
                   {
@@ -222,7 +211,7 @@ private void putTrainedModelIngestPipeline(String pipelineId, String modelId) th
                     }
                   }
                 ]
-              }""", modelId)), XContentType.JSON)).actionGet();
+              }""", modelId));
     }
 
 }
diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java
index b62a524245d8..f6a58002bbac 100644
--- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java
+++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TooManyJobsIT.java
@@ -63,7 +63,7 @@ public void testCloseFailedJob() throws Exception {
             new GetJobsStatsAction.Request("close-failed-job-2")
         ).actionGet();
         assertEquals(statsResponse.getResponse().results().get(0).getState(), JobState.CLOSED);
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<PersistentTasksCustomMetadata.PersistentTask<?>> tasks = findTasks(state, MlTasks.JOB_TASK_NAME);
         assertEquals(1, tasks.size());
         // now just double check that the first job is still opened:
@@ -147,7 +147,10 @@ private void verifyMaxNumberOfJobsLimit(int numNodes, int maxNumberOfJobsPerNode
         boolean expectMemoryLimitBeforeCountLimit = maxJobsPerNodeDueToMemoryLimit < maxNumberOfJobsPerNode;
         for (int i = 1; i <= (clusterWideMaxNumberOfJobs + 1); i++) {
             if (i == 2 && testDynamicChange) {
-                ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest().persistentSettings(
+                ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest(
+                    TEST_REQUEST_TIMEOUT,
+                    TEST_REQUEST_TIMEOUT
+                ).persistentSettings(
                     Settings.builder().put(MachineLearning.MAX_OPEN_JOBS_PER_NODE.getKey(), maxNumberOfJobsPerNode).build()
                 );
                 client().execute(ClusterUpdateSettingsAction.INSTANCE, clusterUpdateSettingsRequest).actionGet();
@@ -215,7 +218,7 @@ private void verifyMaxNumberOfJobsLimit(int numNodes, int maxNumberOfJobsPerNode
                     for (Client client : clients()) {
                         PersistentTasksCustomMetadata tasks = client.admin()
                             .cluster()
-                            .prepareState()
+                            .prepareState(TEST_REQUEST_TIMEOUT)
                             .get()
                             .getState()
                             .getMetadata()
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java
index 2b3ed3f7a656..98dfb13d9e3e 100644
--- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java
+++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlInitializationService.java
@@ -33,7 +33,6 @@
 import org.elasticsearch.telemetry.metric.MeterRegistry;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.xpack.core.ml.annotations.AnnotationIndex;
-import org.elasticsearch.xpack.core.ml.inference.assignment.AdaptiveAllocationsFeatureFlag;
 import org.elasticsearch.xpack.ml.inference.adaptiveallocations.AdaptiveAllocationsScalerService;
 import org.elasticsearch.xpack.ml.notifications.InferenceAuditor;
 
@@ -126,17 +125,13 @@ public void beforeStop() {
 
     public void onMaster() {
         mlDailyMaintenanceService.start();
-        if (AdaptiveAllocationsFeatureFlag.isEnabled()) {
-            adaptiveAllocationsScalerService.start();
-        }
+        adaptiveAllocationsScalerService.start();
         threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME).execute(this::makeMlInternalIndicesHidden);
     }
 
     public void offMaster() {
         mlDailyMaintenanceService.stop();
-        if (AdaptiveAllocationsFeatureFlag.isEnabled()) {
-            adaptiveAllocationsScalerService.stop();
-        }
+        adaptiveAllocationsScalerService.stop();
     }
 
     @Override
diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java
index 33e5582ec992..ebc92eee61ea 100644
--- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java
+++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java
@@ -74,7 +74,7 @@ public MockClientBuilder addClusterStatusYellowResponse() {
         PlainActionFuture<ClusterHealthResponse> actionFuture = mock(PlainActionFuture.class);
         ClusterHealthRequestBuilder clusterHealthRequestBuilder = mock(ClusterHealthRequestBuilder.class);
 
-        when(clusterAdminClient.prepareHealth()).thenReturn(clusterHealthRequestBuilder);
+        when(clusterAdminClient.prepareHealth(any())).thenReturn(clusterHealthRequestBuilder);
         when(clusterHealthRequestBuilder.setWaitForYellowStatus()).thenReturn(clusterHealthRequestBuilder);
         when(clusterHealthRequestBuilder.execute()).thenReturn(actionFuture);
         when(actionFuture.actionGet()).thenReturn(mock(ClusterHealthResponse.class));
diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java
index 5aaaa3ff958f..4ac028ec3af2 100644
--- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java
+++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/support/BaseMlIntegTestCase.java
@@ -513,7 +513,7 @@ protected String awaitJobOpenedAndAssigned(String jobId, String queryNode) throw
     }
 
     protected void assertRecentLastTaskStateChangeTime(String taskId, Duration howRecent, String queryNode) {
-        ClusterStateRequest csRequest = new ClusterStateRequest().clear().metadata(true);
+        ClusterStateRequest csRequest = new ClusterStateRequest(TEST_REQUEST_TIMEOUT).clear().metadata(true);
         ClusterStateResponse csResponse = client(queryNode).execute(ClusterStateAction.INSTANCE, csRequest).actionGet();
         PersistentTasksCustomMetadata tasks = csResponse.getState().getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
         assertNotNull(tasks);
diff --git a/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterSslIT.java b/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterSslIT.java
index 3b61b0496c64..cfeb55feba2c 100644
--- a/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterSslIT.java
+++ b/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterSslIT.java
@@ -160,7 +160,7 @@ private Exporter getExporter(String name) {
     }
 
     private ActionFuture<ClusterUpdateSettingsResponse> setVerificationMode(String name, SslVerificationMode mode) {
-        final ClusterUpdateSettingsRequest updateSettings = new ClusterUpdateSettingsRequest();
+        final ClusterUpdateSettingsRequest updateSettings = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         final String verificationModeName = randomBoolean() ? mode.name() : mode.name().toLowerCase(Locale.ROOT);
         final Settings settings = Settings.builder()
             .put("xpack.monitoring.exporters." + name + ".type", HttpExporter.TYPE)
diff --git a/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java b/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java
index 350d91048ac9..daea70abd29e 100644
--- a/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java
+++ b/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java
@@ -207,7 +207,7 @@ public void testMonitoringService() throws Exception {
         );
 
         final Settings settings = Settings.builder().put("cluster.metadata.display_name", "my cluster").build();
-        assertAcked(clusterAdmin().prepareUpdateSettings().setTransientSettings(settings));
+        assertAcked(clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(settings));
 
         whenExportersAreReady(() -> {
             assertBusy(() -> {
@@ -373,7 +373,7 @@ public void enableMonitoring() throws Exception {
             .put("xpack.monitoring.exporters._local.enabled", true)
             .build();
 
-        assertAcked(clusterAdmin().prepareUpdateSettings().setTransientSettings(settings));
+        assertAcked(clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(settings));
 
         assertBusy(() -> assertThat("[_local] exporter not enabled yet", getMonitoringUsageExportersDefined(), is(true)));
 
@@ -401,7 +401,7 @@ public void disableMonitoring() throws Exception {
             .putNull("cluster.metadata.display_name")
             .build();
 
-        assertAcked(clusterAdmin().prepareUpdateSettings().setTransientSettings(settings));
+        assertAcked(clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(settings));
 
         assertBusy(() -> assertThat("Exporters are not yet stopped", getMonitoringUsageExportersDefined(), is(false)));
         assertBusy(() -> {
diff --git a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsAction.java b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsAction.java
index bf2825155530..182930d47065 100644
--- a/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsAction.java
+++ b/x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/action/TransportMonitoringMigrateAlertsAction.java
@@ -98,7 +98,11 @@ protected void masterOperation(
             Settings.Builder decommissionAlertSetting = Settings.builder().put(Monitoring.MIGRATION_DECOMMISSION_ALERTS.getKey(), true);
             client.admin()
                 .cluster()
-                .prepareUpdateSettings()
+                .prepareUpdateSettings(
+                    request.masterNodeTimeout(),
+                    /* TODO expose separate ack timeout? use masterNodeTimeout() for now */
+                    request.masterNodeTimeout()
+                )
                 .setPersistentSettings(decommissionAlertSetting)
                 .execute(completeOnManagementThread(listener));
         } catch (Exception e) {
diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MultiNodesStatsTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MultiNodesStatsTests.java
index 3c085b9bb282..fbe2e957fc73 100644
--- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MultiNodesStatsTests.java
+++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MultiNodesStatsTests.java
@@ -67,7 +67,7 @@ public void testMultipleNodes() throws Exception {
         final int nbNodes = nodes;
         assertBusy(() -> {
             assertThat(cluster().size(), equalTo(nbNodes));
-            assertNoTimeout(clusterAdmin().prepareHealth().setWaitForNodes(Integer.toString(nbNodes)).get());
+            assertNoTimeout(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForNodes(Integer.toString(nbNodes)).get());
         });
 
         enableMonitoringCollection();
diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
index 4a695f7c51e4..279fec8cc99a 100644
--- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
+++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
@@ -754,7 +754,38 @@ public void testToXContent() throws IOException {
                   },
                   "repositories": {}
                 },
-                "repositories": {}
+                "repositories": {},
+                "ccs": {
+                    "_search": {
+                        "total": 0,
+                        "success": 0,
+                        "skipped": 0,
+                        "took": {
+                            "max": 0,
+                            "avg": 0,
+                            "p90": 0
+                        },
+                        "took_mrt_true": {
+                            "max": 0,
+                            "avg": 0,
+                            "p90": 0
+                        },
+                        "took_mrt_false": {
+                            "max": 0,
+                            "avg": 0,
+                            "p90": 0
+                        },
+                        "remotes_per_search_max": 0,
+                        "remotes_per_search_avg": 0.0,
+                        "failure_reasons": {
+                        },
+                        "features": {
+                        },
+                        "clients": {
+                        },
+                        "clusters": {}
+                    }
+                  }
               },
               "cluster_state": {
                 "nodes_hash": 1314980060,
diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java
index 69ac9d4ddd87..93e055b58ddc 100644
--- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java
+++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java
@@ -246,7 +246,7 @@ private void checkMonitoringTemplates() {
      * fields and belongs to the right data or timestamped index.
      */
     private void checkMonitoringDocs() {
-        ClusterStateResponse response = clusterAdmin().prepareState().get();
+        ClusterStateResponse response = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         String customTimeFormat = response.getState()
             .getMetadata()
             .persistentSettings()
diff --git a/x-pack/plugin/old-lucene-versions/src/internalClusterTest/java/org/elasticsearch/xpack/lucene/bwc/ArchiveLicenseIntegTests.java b/x-pack/plugin/old-lucene-versions/src/internalClusterTest/java/org/elasticsearch/xpack/lucene/bwc/ArchiveLicenseIntegTests.java
index 79227f3dd2ce..a9f4ce806cdc 100644
--- a/x-pack/plugin/old-lucene-versions/src/internalClusterTest/java/org/elasticsearch/xpack/lucene/bwc/ArchiveLicenseIntegTests.java
+++ b/x-pack/plugin/old-lucene-versions/src/internalClusterTest/java/org/elasticsearch/xpack/lucene/bwc/ArchiveLicenseIntegTests.java
@@ -119,7 +119,7 @@ public void testShardAllocationOnInvalidLicense() throws Exception {
         assertBusy(
             () -> assertEquals(
                 ClusterHealthStatus.RED,
-                clusterAdmin().prepareHealth(indexName).get().getIndices().get(indexName).getStatus()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).get().getIndices().get(indexName).getStatus()
             )
         );
 
diff --git a/x-pack/plugin/old-lucene-versions/src/test/java/org/elasticsearch/xpack/lucene/bwc/codecs/OldCodecsAvailableTests.java b/x-pack/plugin/old-lucene-versions/src/test/java/org/elasticsearch/xpack/lucene/bwc/codecs/OldCodecsAvailableTests.java
index bf1538b4e5dd..42b5ba83a082 100644
--- a/x-pack/plugin/old-lucene-versions/src/test/java/org/elasticsearch/xpack/lucene/bwc/codecs/OldCodecsAvailableTests.java
+++ b/x-pack/plugin/old-lucene-versions/src/test/java/org/elasticsearch/xpack/lucene/bwc/codecs/OldCodecsAvailableTests.java
@@ -8,6 +8,7 @@
 package org.elasticsearch.xpack.lucene.bwc.codecs;
 
 import org.elasticsearch.Version;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.ESTestCase;
 
 public class OldCodecsAvailableTests extends ESTestCase {
@@ -16,6 +17,8 @@ public class OldCodecsAvailableTests extends ESTestCase {
      * Reminder to add Lucene BWC codecs under {@link org.elasticsearch.xpack.lucene.bwc.codecs} whenever Elasticsearch is upgraded
      * to the next major Lucene version.
      */
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "muted until we add bwc codecs as part of lucene 10 upgrade")
     public void testLuceneBWCCodecsAvailable() {
         assertEquals("Add Lucene BWC codecs for Elasticsearch version 7", 8, Version.CURRENT.major);
     }
diff --git a/x-pack/plugin/profiling/src/internalClusterTest/java/org/elasticsearch/xpack/profiling/action/ProfilingTestCase.java b/x-pack/plugin/profiling/src/internalClusterTest/java/org/elasticsearch/xpack/profiling/action/ProfilingTestCase.java
index 67825f6ce857..f6c55d9894c3 100644
--- a/x-pack/plugin/profiling/src/internalClusterTest/java/org/elasticsearch/xpack/profiling/action/ProfilingTestCase.java
+++ b/x-pack/plugin/profiling/src/internalClusterTest/java/org/elasticsearch/xpack/profiling/action/ProfilingTestCase.java
@@ -95,13 +95,13 @@ protected boolean requiresDataSetup() {
 
     protected void waitForIndices(Collection<String> indices) throws Exception {
         assertBusy(() -> {
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             assertTrue("Timed out waiting for indices to be created", state.metadata().indices().keySet().containsAll(indices));
         });
     }
 
     protected void updateProfilingTemplatesEnabled(boolean newValue) {
-        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
+        ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         request.persistentSettings(Settings.builder().put(ProfilingPlugin.PROFILING_TEMPLATES_ENABLED.getKey(), newValue).build());
         ClusterUpdateSettingsResponse response = clusterAdmin().updateSettings(request).actionGet();
         assertTrue("Update of profiling templates enabled setting is not acknowledged", response.isAcknowledged());
diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/expression/function/aggregate/SpatialAggregateFunction.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/expression/function/aggregate/SpatialAggregateFunction.java
deleted file mode 100644
index e73d0e71eb24..000000000000
--- a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/expression/function/aggregate/SpatialAggregateFunction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-package org.elasticsearch.xpack.ql.expression.function.aggregate;
-
-import org.elasticsearch.xpack.ql.expression.Expression;
-import org.elasticsearch.xpack.ql.tree.Source;
-
-import java.util.Objects;
-
-/**
- * All spatial aggregate functions extend this class to enable the planning of reading from doc values for higher performance.
- * The AggregateMapper class will generate multiple aggregation functions for each combination, allowing the planner to
- * select the best one.
- */
-public abstract class SpatialAggregateFunction extends AggregateFunction {
-    protected final boolean useDocValues;
-
-    protected SpatialAggregateFunction(Source source, Expression field, boolean useDocValues) {
-        super(source, field);
-        this.useDocValues = useDocValues;
-    }
-
-    public abstract SpatialAggregateFunction withDocValues();
-
-    @Override
-    public int hashCode() {
-        // NB: the hashcode is currently used for key generation so
-        // to avoid clashes between aggs with the same arguments, add the class name as variation
-        return Objects.hash(getClass(), children(), useDocValues);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (super.equals(obj)) {
-            SpatialAggregateFunction other = (SpatialAggregateFunction) obj;
-            return Objects.equals(other.field(), field())
-                && Objects.equals(other.parameters(), parameters())
-                && Objects.equals(other.useDocValues, useDocValues);
-        }
-        return false;
-    }
-
-    public boolean useDocValues() {
-        return useDocValues;
-    }
-}
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java
index f73890e50a3a..3ee49cce85a8 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java
@@ -342,7 +342,7 @@ protected void assertRecoveryStats(String indexName, boolean preWarmEnabled) thr
     }
 
     protected DiscoveryNodes getDiscoveryNodes() {
-        return clusterAdmin().prepareState().clear().setNodes(true).get().getState().nodes();
+        return clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setNodes(true).get().getState().nodes();
     }
 
     protected void assertExecutorIsIdle(String executorName) throws Exception {
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java
index 7ce1da3a0791..67d9d7a82acf 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java
@@ -147,7 +147,7 @@ public void testCreateAndRestorePartialSearchableSnapshot() throws Exception {
         assertShardFolders(indexName, false);
 
         assertThat(
-            clusterAdmin().prepareState()
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setMetadata(true)
                 .setIndices(indexName)
@@ -311,7 +311,7 @@ public void testCreateAndRestorePartialSearchableSnapshot() throws Exception {
         assertBusy(() -> assertShardFolders(restoredIndexName, true), 30, TimeUnit.SECONDS);
 
         assertThat(
-            clusterAdmin().prepareState()
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                 .clear()
                 .setMetadata(true)
                 .setIndices(restoredIndexName)
@@ -365,7 +365,9 @@ public void testCreateAndRestorePartialSearchableSnapshot() throws Exception {
 
         internalCluster().ensureAtLeastNumDataNodes(2);
 
-        final DiscoveryNode dataNode = randomFrom(clusterAdmin().prepareState().get().getState().nodes().getDataNodes().values());
+        final DiscoveryNode dataNode = randomFrom(
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getDataNodes().values()
+        );
 
         updateIndexSettings(
             Settings.builder()
@@ -378,7 +380,7 @@ public void testCreateAndRestorePartialSearchableSnapshot() throws Exception {
         );
 
         assertFalse(
-            clusterAdmin().prepareHealth(restoredIndexName)
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, restoredIndexName)
                 .setWaitForNoRelocatingShards(true)
                 .setWaitForEvents(Priority.LANGUID)
                 .get()
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/PrevalidateNodeRemovalWithSearchableSnapshotIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/PrevalidateNodeRemovalWithSearchableSnapshotIntegTests.java
index 37e2427ae689..96f4ae7fc891 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/PrevalidateNodeRemovalWithSearchableSnapshotIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/PrevalidateNodeRemovalWithSearchableSnapshotIntegTests.java
@@ -52,7 +52,7 @@ public void testNodeRemovalFromClusterWihRedSearchableSnapshotIndex() throws Exc
         // Make sure the searchable snapshot index is red
         internalCluster().stopNode(node1);
         assertBusy(() -> {
-            ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(restoredIndexName)
+            ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, restoredIndexName)
                 .setWaitForStatus(ClusterHealthStatus.RED)
                 .setWaitForEvents(Priority.LANGUID)
                 .execute()
@@ -67,7 +67,8 @@ public void testNodeRemovalFromClusterWihRedSearchableSnapshotIndex() throws Exc
             case 2 -> req.setExternalIds(internalCluster().clusterService(node2).localNode().getExternalId());
             default -> throw new IllegalStateException("Unexpected value");
         }
-        PrevalidateNodeRemovalResponse resp = client().execute(PrevalidateNodeRemovalAction.INSTANCE, req.build()).get();
+        PrevalidateNodeRemovalResponse resp = client().execute(PrevalidateNodeRemovalAction.INSTANCE, req.build(TEST_REQUEST_TIMEOUT))
+            .get();
         assertTrue(resp.getPrevalidation().isSafe());
         assertThat(resp.getPrevalidation().message(), equalTo("all red indices are searchable snapshot indices"));
         assertThat(resp.getPrevalidation().nodes().size(), equalTo(1));
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java
index d5e87558d1ce..faf41e7e655a 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java
@@ -1067,7 +1067,14 @@ private void indexDocumentsWithTimestampAndEventIngestedDates(String indexName,
     }
 
     private IndexMetadata getIndexMetadata(String indexName) {
-        return clusterAdmin().prepareState().clear().setMetadata(true).setIndices(indexName).get().getState().metadata().index(indexName);
+        return clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setMetadata(true)
+            .setIndices(indexName)
+            .get()
+            .getState()
+            .metadata()
+            .index(indexName);
     }
 
     private void waitUntilRecoveryIsDone(String index) throws Exception {
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java
index c99f2be0a6ca..84a632a419ea 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java
@@ -145,7 +145,7 @@ public void testCreateAndRestoreSearchableSnapshot() throws Exception {
 
         assertShardFolders(indexName, false);
 
-        IndexMetadata indexMetadata = clusterAdmin().prepareState()
+        IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(indexName)
@@ -251,7 +251,7 @@ public void testCreateAndRestoreSearchableSnapshot() throws Exception {
         ensureGreen(restoredIndexName);
         assertBusy(() -> assertShardFolders(restoredIndexName, true), 30, TimeUnit.SECONDS);
 
-        indexMetadata = clusterAdmin().prepareState()
+        indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(restoredIndexName)
@@ -285,7 +285,9 @@ public void testCreateAndRestoreSearchableSnapshot() throws Exception {
 
         internalCluster().ensureAtLeastNumDataNodes(2);
 
-        final DiscoveryNode dataNode = randomFrom(clusterAdmin().prepareState().get().getState().nodes().getDataNodes().values());
+        final DiscoveryNode dataNode = randomFrom(
+            clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getDataNodes().values()
+        );
 
         updateIndexSettings(
             Settings.builder()
@@ -298,7 +300,7 @@ public void testCreateAndRestoreSearchableSnapshot() throws Exception {
         );
 
         assertFalse(
-            clusterAdmin().prepareHealth(restoredIndexName)
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, restoredIndexName)
                 .setWaitForNoRelocatingShards(true)
                 .setWaitForEvents(Priority.LANGUID)
                 .get()
@@ -630,7 +632,7 @@ public void testMountedSnapshotHasNoReplicasByDefault() throws Exception {
             assertThat(restoreSnapshotResponse.getRestoreInfo().failedShards(), equalTo(0));
             ensureGreen(restoredIndexName);
 
-            final ClusterState state = clusterAdmin().prepareState().clear().setRoutingTable(true).get().getState();
+            final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setRoutingTable(true).get().getState();
             assertThat(
                 state.toString(),
                 state.routingTable().index(restoredIndexName).shard(0).size(),
@@ -751,7 +753,7 @@ public void testSnapshotMountedIndexWithTimestampsRecordsTimestampRangeInIndexMe
         mountSnapshot(repositoryName, snapshotOne.getName(), indexName, indexName, Settings.EMPTY);
         ensureGreen(indexName);
 
-        final IndexMetadata indexMetadata = clusterAdmin().prepareState()
+        final IndexMetadata indexMetadata = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .setIndices(indexName)
@@ -1044,7 +1046,7 @@ public void testSnapshotOfSearchableSnapshotCanBeRestoredBeforeRepositoryRegiste
 
         assertBusy(() -> {
             final RestoreInProgress restoreInProgress = RestoreInProgress.get(
-                clusterAdmin().prepareState().clear().setCustoms(true).get().getState()
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setCustoms(true).get().getState()
             );
             assertTrue(Strings.toString(restoreInProgress, true, true), restoreInProgress.isEmpty());
         });
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsLicenseIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsLicenseIntegTests.java
index 73f12f98f8ca..a7e83325bef8 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsLicenseIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsLicenseIntegTests.java
@@ -148,7 +148,7 @@ public void testShardAllocationOnInvalidLicense() throws Exception {
         assertBusy(
             () -> assertEquals(
                 ClusterHealthStatus.RED,
-                clusterAdmin().prepareHealth(indexName).get().getIndices().get(indexName).getStatus()
+                clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, indexName).get().getIndices().get(indexName).getStatus()
             )
         );
 
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocationIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocationIntegTests.java
index 6feccfc5ed11..6c6993b9a4ef 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocationIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotAllocationIntegTests.java
@@ -50,7 +50,7 @@ public void testAllocatesToBestAvailableNodeOnRestart() throws Exception {
         setAllocation(EnableAllocationDecider.Allocation.ALL);
         ensureGreen(restoredIndex);
 
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertEquals(
             state.nodes().resolveNode(firstDataNode).getId(),
             state.routingTable().index(restoredIndex).shard(0).primaryShard().currentNodeId()
@@ -88,7 +88,7 @@ public void testAllocatesReplicaToBestAvailableNodeOnRestart() throws Exception
         setAllocation(EnableAllocationDecider.Allocation.ALL);
         ensureGreen(restoredIndex);
 
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final Set<String> nodesWithCache = Set.of(
             state.nodes().resolveNode(firstDataNode).getId(),
             state.nodes().resolveNode(secondDataNode).getId()
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotDiskThresholdIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotDiskThresholdIntegTests.java
index a34bcd16c375..730118ceb6ee 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotDiskThresholdIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotDiskThresholdIntegTests.java
@@ -241,7 +241,7 @@ public void testHighWatermarkCanNotBeExceededOnColdNode() throws Exception {
 
         // The cold/frozen data node has enough disk space to hold all the shards
         assertBusy(() -> {
-            var state = clusterAdmin().prepareState().setRoutingTable(true).get().getState();
+            var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setRoutingTable(true).get().getState();
             assertThat(
                 state.routingTable()
                     .allShards()
@@ -257,7 +257,7 @@ public void testHighWatermarkCanNotBeExceededOnColdNode() throws Exception {
         mountIndices(indicesStoresSizes.keySet(), "extra-", repositoryName, snapshot, storage);
 
         assertBusy(() -> {
-            var state = clusterAdmin().prepareState().setRoutingTable(true).get().getState();
+            var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setRoutingTable(true).get().getState();
             assertThat(
                 state.routingTable()
                     .allShards()
@@ -294,7 +294,7 @@ public void testHighWatermarkCanNotBeExceededWithInitializingSearchableSnapshots
         );
         ensureStableCluster(3);
 
-        String coldNodeId = clusterAdmin().prepareState().get().getState().nodes().resolveNode(coldNodeName).getId();
+        String coldNodeId = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().resolveNode(coldNodeName).getId();
         logger.info("--> reducing disk size of node [{}/{}] so that all shards except one can fit on the node", coldNodeName, coldNodeId);
         String indexToSkip = randomFrom(indicesStoresSizes.keySet());
         Map<String, Long> indicesToBeMounted = indicesStoresSizes.entrySet()
@@ -316,7 +316,7 @@ public void testHighWatermarkCanNotBeExceededWithInitializingSearchableSnapshots
         mountIndices(indicesToBeMounted.keySet(), prefix, repositoryName, snapshotName, FULL_COPY);
 
         assertBusy(() -> {
-            var state = clusterAdmin().prepareState().setRoutingTable(true).get().getState();
+            var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setRoutingTable(true).get().getState();
             assertThat(
                 state.routingTable()
                     .allShards()
@@ -333,7 +333,7 @@ public void testHighWatermarkCanNotBeExceededWithInitializingSearchableSnapshots
 
         mountIndices(List.of(indexToSkip), prefix, repositoryName, snapshotName, FULL_COPY);
         assertBusy(() -> {
-            var state = clusterAdmin().prepareState().setRoutingTable(true).get().getState();
+            var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setRoutingTable(true).get().getState();
             assertThat(state.routingTable().index(prefix + indexToSkip).shardsWithState(ShardRoutingState.UNASSIGNED).size(), equalTo(1));
         });
 
@@ -343,7 +343,7 @@ public void testHighWatermarkCanNotBeExceededWithInitializingSearchableSnapshots
         mockRepository.unlockRestore();
 
         assertBusy(() -> {
-            var state = clusterAdmin().prepareState().setRoutingTable(true).get().getState();
+            var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setRoutingTable(true).get().getState();
             assertThat(state.routingTable().index(prefix + indexToSkip).shardsWithState(ShardRoutingState.UNASSIGNED).size(), equalTo(1));
             assertThat(
                 state.routingTable()
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotEnableAllocationDeciderIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotEnableAllocationDeciderIntegTests.java
index d6291225f0c1..9dadb75e87ce 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotEnableAllocationDeciderIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotEnableAllocationDeciderIntegTests.java
@@ -39,7 +39,8 @@ public void testAllocationDisabled() throws Exception {
             internalCluster().restartNode(indexNode);
         }
 
-        ClusterHealthResponse response = clusterAdmin().health(new ClusterHealthRequest(restoredIndexName)).actionGet();
+        ClusterHealthResponse response = clusterAdmin().health(new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, restoredIndexName))
+            .actionGet();
         assertThat(response.getUnassignedShards(), Matchers.equalTo(numPrimaries));
 
         setAllocateOnRollingRestart(true);
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotShutdownIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotShutdownIntegTests.java
index 6a1de58e9703..1fd30b5e5b9a 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotShutdownIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotShutdownIntegTests.java
@@ -58,7 +58,12 @@ public void testAllocationDisabledDuringShutdown() throws Exception {
         final Set<String> indexNodes = restoredIndexNames.stream()
             .flatMap(index -> internalCluster().nodesInclude(index).stream())
             .collect(Collectors.toSet());
-        final ClusterState state = clusterAdmin().prepareState().clear().setRoutingTable(true).setNodes(true).get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setRoutingTable(true)
+            .setNodes(true)
+            .get()
+            .getState();
         final Map<String, String> nodeNameToId = state.getNodes()
             .stream()
             .collect(Collectors.toMap(DiscoveryNode::getName, DiscoveryNode::getId));
@@ -82,8 +87,9 @@ public void testAllocationDisabledDuringShutdown() throws Exception {
                 @Override
                 public Settings onNodeStopped(String nodeName) throws Exception {
                     assertBusy(() -> {
-                        ClusterHealthResponse response = clusterAdmin().health(new ClusterHealthRequest(restoredIndexNamesArray))
-                            .actionGet();
+                        ClusterHealthResponse response = clusterAdmin().health(
+                            new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, restoredIndexNamesArray)
+                        ).actionGet();
                         assertThat(response.getUnassignedShards(), Matchers.equalTo(shards));
                     });
                     return super.onNodeStopped(nodeName);
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotsRelocationIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotsRelocationIntegTests.java
index a45d6b5c72a6..434ed6822e2d 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotsRelocationIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/allocation/SearchableSnapshotsRelocationIntegTests.java
@@ -75,10 +75,15 @@ public void testRelocationWaitsForPreWarm() throws Exception {
         });
 
         assertBusy(() -> assertSame(RecoveryState.Stage.FINALIZE, getRelocations(restoredIndex).get(0).getStage()));
-        final Index restoredIdx = clusterAdmin().prepareState().get().getState().metadata().index(restoredIndex).getIndex();
+        final Index restoredIdx = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .get()
+            .getState()
+            .metadata()
+            .index(restoredIndex)
+            .getIndex();
         final IndicesService indicesService = internalCluster().getInstance(IndicesService.class, secondDataNode);
         assertEquals(1, indicesService.indexService(restoredIdx).getShard(0).outstandingCleanFilesConditions());
-        final ClusterState state = clusterAdmin().prepareState().get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         final String primaryNodeId = state.routingTable().index(restoredIndex).shard(0).primaryShard().currentNodeId();
         final DiscoveryNode primaryNode = state.nodes().resolveNode(primaryNodeId);
         assertEquals(firstDataNode, primaryNode.getName());
@@ -87,7 +92,7 @@ public void testRelocationWaitsForPreWarm() throws Exception {
         latch.countDown();
 
         assertFalse(
-            clusterAdmin().prepareHealth(restoredIndex)
+            clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, restoredIndex)
                 .setWaitForNoRelocatingShards(true)
                 .setWaitForEvents(Priority.LANGUID)
                 .get()
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPersistentCacheIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPersistentCacheIntegTests.java
index 93d60f161e65..ca2e683736be 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPersistentCacheIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPersistentCacheIntegTests.java
@@ -79,7 +79,12 @@ public void testCacheSurviveRestart() throws Exception {
         assertThat(snapshotInfo.successfulShards(), equalTo(snapshotInfo.totalShards()));
         assertAcked(client().admin().indices().prepareDelete(indexName));
 
-        final DiscoveryNodes discoveryNodes = clusterAdmin().prepareState().clear().setNodes(true).get().getState().nodes();
+        final DiscoveryNodes discoveryNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .get()
+            .getState()
+            .nodes();
         final String dataNode = randomFrom(discoveryNodes.getDataNodes().values()).getName();
 
         mountSnapshot(
@@ -94,7 +99,7 @@ public void testCacheSurviveRestart() throws Exception {
         assertExecutorIsIdle(SearchableSnapshots.CACHE_FETCH_ASYNC_THREAD_POOL_NAME);
         assertExecutorIsIdle(SearchableSnapshots.CACHE_PREWARMING_THREAD_POOL_NAME);
 
-        final Index restoredIndex = clusterAdmin().prepareState()
+        final Index restoredIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .get()
@@ -208,7 +213,11 @@ public void testPersistentCacheCleanUpAfterRelocation() throws Exception {
                 .allMatch(recoveryState -> recoveryState.getStage() == RecoveryState.Stage.DONE)
         );
 
-        final ClusterStateResponse state = clusterAdmin().prepareState().clear().setMetadata(true).setIndices(mountedIndexName).get();
+        final ClusterStateResponse state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setMetadata(true)
+            .setIndices(mountedIndexName)
+            .get();
         final Index mountedIndex = state.getState().metadata().index(mountedIndexName).getIndex();
 
         final Set<DiscoveryNode> dataNodes = new HashSet<>();
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/NodesCachesStatsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/NodesCachesStatsIntegTests.java
index b260f6cf2a89..15d03c20af79 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/NodesCachesStatsIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/NodesCachesStatsIntegTests.java
@@ -124,7 +124,7 @@ public void testNodesCachesStats() throws Exception {
         assertThat(clearCacheResponse.getSuccessfulShards(), greaterThan(0));
         assertThat(clearCacheResponse.getFailedShards(), equalTo(0));
 
-        final String[] dataNodesWithFrozenShards = clusterAdmin().prepareState()
+        final String[] dataNodesWithFrozenShards = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .get()
             .getState()
             .routingTable()
@@ -136,30 +136,34 @@ public void testNodesCachesStats() throws Exception {
             .collect(toSet())
             .toArray(String[]::new);
 
-        final NodesCachesStatsResponse response = client().execute(
-            TransportSearchableSnapshotsNodeCachesStatsAction.TYPE,
-            new NodesRequest(dataNodesWithFrozenShards)
-        ).actionGet();
-        assertThat(
-            response.getNodes().stream().map(r -> r.getNode().getId()).collect(Collectors.toList()),
-            containsInAnyOrder(dataNodesWithFrozenShards)
-        );
-        assertThat(response.hasFailures(), equalTo(false));
-
-        for (NodeCachesStatsResponse nodeCachesStats : response.getNodes()) {
-            if (nodeCachesStats.getNumRegions() > 0) {
-                assertThat(nodeCachesStats.getWrites(), greaterThan(0L));
-                assertThat(nodeCachesStats.getBytesWritten(), greaterThan(0L));
-                assertThat(nodeCachesStats.getReads(), greaterThan(0L));
-                assertThat(nodeCachesStats.getBytesRead(), greaterThan(0L));
-                assertThat(nodeCachesStats.getEvictions(), greaterThan(0L));
-            } else {
-                assertThat(nodeCachesStats.getWrites(), equalTo(0L));
-                assertThat(nodeCachesStats.getBytesWritten(), equalTo(0L));
-                assertThat(nodeCachesStats.getReads(), equalTo(0L));
-                assertThat(nodeCachesStats.getBytesRead(), equalTo(0L));
-                assertThat(nodeCachesStats.getEvictions(), equalTo(0L));
+        // We've seen `getWrites` inexplicably return zero. `assertBusy` to test the theory of it being due
+        // to contention on the `LongAdder` at `SharedBlobCacheService#writeCount`.
+        assertBusy(() -> {
+            final NodesCachesStatsResponse response = client().execute(
+                TransportSearchableSnapshotsNodeCachesStatsAction.TYPE,
+                new NodesRequest(dataNodesWithFrozenShards)
+            ).actionGet();
+            assertThat(
+                response.getNodes().stream().map(r -> r.getNode().getId()).collect(Collectors.toList()),
+                containsInAnyOrder(dataNodesWithFrozenShards)
+            );
+            assertThat(response.hasFailures(), equalTo(false));
+
+            for (NodeCachesStatsResponse nodeCachesStats : response.getNodes()) {
+                if (nodeCachesStats.getNumRegions() > 0) {
+                    assertThat(nodeCachesStats.getWrites(), greaterThan(0L));
+                    assertThat(nodeCachesStats.getBytesWritten(), greaterThan(0L));
+                    assertThat(nodeCachesStats.getReads(), greaterThan(0L));
+                    assertThat(nodeCachesStats.getBytesRead(), greaterThan(0L));
+                    assertThat(nodeCachesStats.getEvictions(), greaterThan(0L));
+                } else {
+                    assertThat(nodeCachesStats.getWrites(), equalTo(0L));
+                    assertThat(nodeCachesStats.getBytesWritten(), equalTo(0L));
+                    assertThat(nodeCachesStats.getReads(), equalTo(0L));
+                    assertThat(nodeCachesStats.getBytesRead(), equalTo(0L));
+                    assertThat(nodeCachesStats.getEvictions(), equalTo(0L));
+                }
             }
-        }
+        });
     }
 }
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/PartiallyCachedShardAllocationIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/PartiallyCachedShardAllocationIntegTests.java
index 7b372ddc53d8..3896a57027a6 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/PartiallyCachedShardAllocationIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/PartiallyCachedShardAllocationIntegTests.java
@@ -107,7 +107,7 @@ public void testPartialSearchableSnapshotNotAllocatedToNodesWithoutCache() throw
         final MountSearchableSnapshotRequest req = prepareMountRequest();
         final RestoreSnapshotResponse restoreSnapshotResponse = client().execute(MountSearchableSnapshotAction.INSTANCE, req).get();
         assertThat(restoreSnapshotResponse.getRestoreInfo().successfulShards(), equalTo(0));
-        final ClusterState state = clusterAdmin().prepareState().clear().setRoutingTable(true).get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setRoutingTable(true).get().getState();
         assertTrue(state.toString(), state.routingTable().index(req.mountedIndexName()).allPrimaryShardsUnassigned());
 
         final var explanation = getClusterAllocationExplanation(client(), req.mountedIndexName(), 0, true);
@@ -139,7 +139,12 @@ public void testPartialSearchableSnapshotAllocatedToNodesWithCache() throws Exce
         assertThat(restoreSnapshotResponse.getRestoreInfo().failedShards(), equalTo(0));
         ensureGreen(req.mountedIndexName());
 
-        final ClusterState state = clusterAdmin().prepareState().clear().setNodes(true).setRoutingTable(true).get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .setRoutingTable(true)
+            .get()
+            .getState();
         final Set<String> newNodeIds = newNodeNames.stream().map(n -> state.nodes().resolveNode(n).getId()).collect(Collectors.toSet());
         for (ShardRouting shardRouting : state.routingTable().index(req.mountedIndexName()).shardsWithState(ShardRoutingState.STARTED)) {
             assertThat(state.toString(), newNodeIds, hasItem(shardRouting.currentNodeId()));
@@ -160,7 +165,7 @@ public void testOnlyPartialSearchableSnapshotAllocatedToDedicatedFrozenNodes() t
 
         createIndex("other-index", Settings.builder().putNull(TIER_PREFERENCE).build());
         ensureGreen("other-index");
-        final RoutingNodes routingNodes = clusterAdmin().prepareState()
+        final RoutingNodes routingNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setRoutingTable(true)
             .setNodes(true)
@@ -177,7 +182,12 @@ public void testOnlyPartialSearchableSnapshotAllocatedToDedicatedFrozenNodes() t
         assertThat(restoreSnapshotResponse.getRestoreInfo().failedShards(), equalTo(0));
         ensureGreen(req.mountedIndexName());
 
-        final ClusterState state = clusterAdmin().prepareState().clear().setNodes(true).setRoutingTable(true).get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setNodes(true)
+            .setRoutingTable(true)
+            .get()
+            .getState();
         final Set<String> newNodeIds = newNodeNames.stream().map(n -> state.nodes().resolveNode(n).getId()).collect(Collectors.toSet());
         for (ShardRouting shardRouting : state.routingTable().index(req.mountedIndexName()).shardsWithState(ShardRoutingState.STARTED)) {
             assertThat(state.toString(), newNodeIds, hasItem(shardRouting.currentNodeId()));
@@ -272,7 +282,12 @@ public void testPartialSearchableSnapshotDelaysAllocationUntilNodeCacheStatesKno
         assertFalse("should have failed before success", failurePermits.tryAcquire());
 
         final Map<String, Integer> shardCountsByNodeName = new HashMap<>();
-        final ClusterState state = clusterAdmin().prepareState().clear().setRoutingTable(true).setNodes(true).get().getState();
+        final ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
+            .clear()
+            .setRoutingTable(true)
+            .setNodes(true)
+            .get()
+            .getState();
         for (RoutingNode routingNode : state.getRoutingNodes()) {
             shardCountsByNodeName.put(
                 routingNode.node().getName(),
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/recovery/SearchableSnapshotRecoveryStateIntegrationTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/recovery/SearchableSnapshotRecoveryStateIntegrationTests.java
index 4e5e6ab97633..9257fc747b75 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/recovery/SearchableSnapshotRecoveryStateIntegrationTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/recovery/SearchableSnapshotRecoveryStateIntegrationTests.java
@@ -83,7 +83,7 @@ public void testRecoveryStateRecoveredBytesMatchPhysicalCacheState() throws Exce
         mountSnapshot(fsRepoName, snapshotName, indexName, restoredIndexName, Settings.EMPTY);
         ensureGreen(restoredIndexName);
 
-        final Index restoredIndex = clusterAdmin().prepareState()
+        final Index restoredIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .get()
@@ -145,7 +145,7 @@ public void testFilesStoredInThePersistentCacheAreMarkedAsReusedInRecoveryState(
         internalCluster().restartRandomDataNode();
         ensureGreen(restoredIndexName);
 
-        final Index restoredIndex = clusterAdmin().prepareState()
+        final Index restoredIndex = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
             .clear()
             .setMetadata(true)
             .get()
diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/MetadataCachingIndexInput.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/MetadataCachingIndexInput.java
index 8c978c344552..94ba06a00cc4 100644
--- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/MetadataCachingIndexInput.java
+++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/MetadataCachingIndexInput.java
@@ -538,14 +538,6 @@ protected InputStream openInputStreamFromBlobStore(final long position, final lo
     private SlicedInputStream openInputStreamMultipleParts(long position, long readLength) {
         final int startPart = getPartNumberForPosition(position);
         final int endPart = getPartNumberForPosition(position + readLength - 1);
-
-        for (int currentPart = startPart; currentPart <= endPart; currentPart++) {
-            final long startInPart = (currentPart == startPart) ? getRelativePositionInPart(position) : 0L;
-            final long endInPart;
-            endInPart = currentPart == endPart ? getRelativePositionInPart(position + readLength - 1) + 1 : fileInfo.partBytes(currentPart);
-            stats.addBlobStoreBytesRequested(endInPart - startInPart);
-        }
-
         return new SlicedInputStream(endPart - startPart + 1) {
             @Override
             protected InputStream openSlice(int slice) throws IOException {
@@ -555,8 +547,15 @@ protected InputStream openSlice(int slice) throws IOException {
                 endInPart = currentPart == endPart
                     ? getRelativePositionInPart(position + readLength - 1) + 1
                     : fileInfo.partBytes(currentPart);
+                final long length = endInPart - startInPart;
+                stats.addBlobStoreBytesRequested(length);
                 return directory.blobContainer()
-                    .readBlob(OperationPurpose.SNAPSHOT_DATA, fileInfo.partName(currentPart), startInPart, endInPart - startInPart);
+                    .readBlob(OperationPurpose.SNAPSHOT_DATA, fileInfo.partName(currentPart), startInPart, length);
+            }
+
+            @Override
+            public boolean markSupported() {
+                return false;
             }
         };
     }
diff --git a/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/upgrade/SearchableSnapshotIndexMetadataUpgraderTests.java b/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/upgrade/SearchableSnapshotIndexMetadataUpgraderTests.java
index 594d356becf8..bd090b528bb9 100644
--- a/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/upgrade/SearchableSnapshotIndexMetadataUpgraderTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/test/java/org/elasticsearch/xpack/searchablesnapshots/upgrade/SearchableSnapshotIndexMetadataUpgraderTests.java
@@ -7,11 +7,13 @@
 
 package org.elasticsearch.xpack.searchablesnapshots.upgrade;
 
+import org.apache.lucene.tests.util.LuceneTestCase;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexModule;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -27,6 +29,8 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.sameInstance;
 
+@UpdateForV9
+@LuceneTestCase.AwaitsFix(bugUrl = "this testing a number of pre 8.0 upgrade scenarios so needs updating or removal for 9.0")
 public class SearchableSnapshotIndexMetadataUpgraderTests extends ESTestCase {
 
     public void testNoUpgradeNeeded() {
diff --git a/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/ConsumingTestServer.java b/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/ConsumingTestServer.java
new file mode 100644
index 000000000000..07fb84cf5600
--- /dev/null
+++ b/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/ConsumingTestServer.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+package org.elasticsearch.xpack.remotecluster;
+
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpServer;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.elasticsearch.core.SuppressForbidden;
+import org.junit.rules.ExternalResource;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+@SuppressForbidden(reason = "Uses an HTTP server for testing")
+class ConsumingTestServer extends ExternalResource {
+    private static final Logger logger = LogManager.getLogger(ConsumingTestServer.class);
+    final ArrayBlockingQueue<String> received = new ArrayBlockingQueue<>(1000);
+
+    private static HttpServer server;
+    private final Thread messageConsumerThread = consumerThread();
+    private volatile Consumer<String> consumer;
+    private volatile boolean consumerRunning = true;
+
+    @Override
+    protected void before() throws Throwable {
+        server = HttpServer.create();
+        server.bind(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
+        server.createContext("/", this::handle);
+        server.start();
+
+        messageConsumerThread.start();
+    }
+
+    private Thread consumerThread() {
+        return new Thread(() -> {
+            while (consumerRunning) {
+                if (consumer != null) {
+                    try {
+                        String msg = received.poll(1L, TimeUnit.SECONDS);
+                        if (msg != null && msg.isEmpty() == false) {
+                            consumer.accept(msg);
+                        }
+
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void after() {
+        server.stop(1);
+        consumerRunning = false;
+    }
+
+    private void handle(HttpExchange exchange) throws IOException {
+        try (exchange) {
+            try {
+                try (InputStream requestBody = exchange.getRequestBody()) {
+                    if (requestBody != null) {
+                        var read = readJsonMessages(requestBody);
+                        received.addAll(read);
+                    }
+                }
+
+            } catch (RuntimeException e) {
+                logger.warn("failed to parse request", e);
+            }
+            exchange.sendResponseHeaders(201, 0);
+        }
+    }
+
+    private List<String> readJsonMessages(InputStream input) {
+        // parse NDJSON
+        return new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8)).lines().toList();
+    }
+
+    public int getPort() {
+        return server.getAddress().getPort();
+    }
+
+    public void addMessageConsumer(Consumer<String> messageConsumer) {
+        this.consumer = messageConsumer;
+    }
+}
diff --git a/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityWithApmTracingRestIT.java b/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityWithApmTracingRestIT.java
new file mode 100644
index 000000000000..f4d8177685b3
--- /dev/null
+++ b/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityWithApmTracingRestIT.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.remotecluster;
+
+import org.elasticsearch.client.Request;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.Response;
+import org.elasticsearch.common.xcontent.support.XContentMapValues;
+import org.elasticsearch.tasks.Task;
+import org.elasticsearch.test.cluster.ElasticsearchCluster;
+import org.elasticsearch.test.cluster.local.distribution.DistributionType;
+import org.elasticsearch.test.cluster.util.resource.Resource;
+import org.elasticsearch.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentParserConfiguration;
+import org.elasticsearch.xcontent.spi.XContentProvider;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import static org.hamcrest.Matchers.equalTo;
+
+public class RemoteClusterSecurityWithApmTracingRestIT extends AbstractRemoteClusterSecurityTestCase {
+    private static final AtomicReference<Map<String, Object>> API_KEY_MAP_REF = new AtomicReference<>();
+    private static final XContentProvider.FormatProvider XCONTENT = XContentProvider.provider().getJsonXContent();
+    final String traceIdValue = "0af7651916cd43dd8448eb211c80319c";
+    final String traceParentValue = "00-" + traceIdValue + "-b7ad6b7169203331-01";
+
+    private static final ConsumingTestServer mockApmServer = new ConsumingTestServer();
+
+    static {
+        fulfillingCluster = ElasticsearchCluster.local()
+            .distribution(DistributionType.DEFAULT)
+            .name("fulfilling-cluster")
+            .apply(commonClusterConfig)
+            .setting("telemetry.metrics.enabled", "false")
+            .setting("telemetry.tracing.enabled", "true")
+            .setting("telemetry.agent.metrics_interval", "1s")
+            .setting("telemetry.agent.server_url", () -> "http://127.0.0.1:" + mockApmServer.getPort())
+            // to ensure tracestate header is always set to cover RCS 2.0 handling of the tracestate header
+            .setting("telemetry.agent.transaction_sample_rate", "1.0")
+            .setting("remote_cluster_server.enabled", "true")
+            .setting("remote_cluster.port", "0")
+            .setting("xpack.security.remote_cluster_server.ssl.enabled", "true")
+            .setting("xpack.security.remote_cluster_server.ssl.key", "remote-cluster.key")
+            .setting("xpack.security.remote_cluster_server.ssl.certificate", "remote-cluster.crt")
+            .keystore("xpack.security.remote_cluster_server.ssl.secure_key_passphrase", "remote-cluster-password")
+            .rolesFile(Resource.fromClasspath("roles.yml"))
+            .build();
+
+        queryCluster = ElasticsearchCluster.local()
+            .distribution(DistributionType.DEFAULT)
+            .name("query-cluster")
+            .apply(commonClusterConfig)
+            .setting("telemetry.metrics.enabled", "false")
+            .setting("telemetry.tracing.enabled", "true")
+            // to ensure tracestate header is always set to cover RCS 2.0 handling of the tracestate header
+            .setting("telemetry.agent.transaction_sample_rate", "1.0")
+            .setting("telemetry.agent.metrics_interval", "1s")
+            .setting("telemetry.agent.server_url", () -> "http://127.0.0.1:" + mockApmServer.getPort())
+            .setting("xpack.security.remote_cluster_client.ssl.enabled", "true")
+            .setting("xpack.security.remote_cluster_client.ssl.certificate_authorities", "remote-cluster-ca.crt")
+            .keystore("cluster.remote.my_remote_cluster.credentials", () -> {
+                if (API_KEY_MAP_REF.get() == null) {
+                    final Map<String, Object> apiKeyMap = createCrossClusterAccessApiKey("""
+                        {
+                            "search": [
+                              {
+                                "names": ["*"]
+                              }
+                            ]
+                        }""");
+                    API_KEY_MAP_REF.set(apiKeyMap);
+                }
+                return (String) API_KEY_MAP_REF.get().get("encoded");
+            })
+            .rolesFile(Resource.fromClasspath("roles.yml"))
+            .user(REMOTE_METRIC_USER, PASS.toString(), "read_remote_shared_metrics", false)
+            .build();
+    }
+
+    @ClassRule
+    // Use a RuleChain to ensure that fulfilling cluster is started before query cluster
+    public static TestRule clusterRule = RuleChain.outerRule(mockApmServer).around(fulfillingCluster).around(queryCluster);
+
+    @SuppressWarnings("unchecked")
+    public void testTracingCrossCluster() throws Exception {
+        configureRemoteCluster();
+        Set<Predicate<Map<String, Object>>> assertions = new HashSet<>(
+            Set.of(
+                // REST action on query cluster
+                allTrue(
+                    transactionValue("name", equalTo("GET /_resolve/cluster/{name}")),
+                    transactionValue("trace_id", equalTo(traceIdValue))
+                ),
+                // transport action on fulfilling cluster
+                allTrue(
+                    transactionValue("name", equalTo("indices:admin/resolve/cluster")),
+                    transactionValue("trace_id", equalTo(traceIdValue))
+                )
+            )
+        );
+
+        CountDownLatch finished = new CountDownLatch(1);
+
+        // a consumer that will remove the assertions from a map once it matched
+        Consumer<String> messageConsumer = (String message) -> {
+            var apmMessage = parseMap(message);
+            if (isTransactionTraceMessage(apmMessage)) {
+                logger.info("Apm transaction message received: {}", message);
+                assertions.removeIf(e -> e.test(apmMessage));
+            }
+
+            if (assertions.isEmpty()) {
+                finished.countDown();
+            }
+        };
+
+        mockApmServer.addMessageConsumer(messageConsumer);
+
+        // Trigger an action that we know will cross clusters -- doesn't much matter which one
+        final Request resolveRequest = new Request("GET", "/_resolve/cluster/my_remote_cluster:*");
+        resolveRequest.setOptions(
+            RequestOptions.DEFAULT.toBuilder()
+                .addHeader("Authorization", headerFromRandomAuthMethod(REMOTE_METRIC_USER, PASS))
+                .addHeader(Task.TRACE_PARENT_HTTP_HEADER, traceParentValue)
+        );
+        final Response response = client().performRequest(resolveRequest);
+        assertOK(response);
+
+        finished.await(30, TimeUnit.SECONDS);
+        assertThat(assertions, equalTo(Collections.emptySet()));
+    }
+
+    private boolean isTransactionTraceMessage(Map<String, Object> apmMessage) {
+        return apmMessage.containsKey("transaction");
+    }
+
+    @SuppressWarnings("unchecked")
+    private Predicate<Map<String, Object>> allTrue(Predicate<Map<String, Object>>... predicates) {
+        var allTrueTest = Arrays.stream(predicates).reduce(v -> true, Predicate::and);
+        return new Predicate<>() {
+            @Override
+            public boolean test(Map<String, Object> map) {
+                return allTrueTest.test(map);
+            }
+
+            @Override
+            public String toString() {
+                return Arrays.stream(predicates).map(Object::toString).collect(Collectors.joining(" and "));
+            }
+        };
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> Predicate<Map<String, Object>> transactionValue(String path, Matcher<T> expected) {
+        return new Predicate<>() {
+            @Override
+            public boolean test(Map<String, Object> map) {
+                var transaction = (Map<String, Object>) map.get("transaction");
+                var value = XContentMapValues.extractValue(path, transaction);
+                return expected.matches((T) value);
+            }
+
+            @Override
+            public String toString() {
+                StringDescription matcherDescription = new StringDescription();
+                expected.describeTo(matcherDescription);
+                return path + " " + matcherDescription;
+            }
+        };
+    }
+
+    private Map<String, Object> parseMap(String message) {
+        try (XContentParser parser = XCONTENT.XContent().createParser(XContentParserConfiguration.EMPTY, message)) {
+            return parser.map();
+        } catch (IOException e) {
+            fail(e);
+            return Collections.emptyMap();
+        }
+    }
+}
diff --git a/x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java b/x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java
index c5304d8313df..853d0fd9318a 100644
--- a/x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java
+++ b/x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java
@@ -98,6 +98,7 @@ public class Constants {
         "cluster:admin/snapshot/restore",
         "cluster:admin/snapshot/status",
         "cluster:admin/snapshot/status[nodes]",
+        "cluster:admin/repository/verify_integrity",
         "cluster:admin/features/get",
         "cluster:admin/features/reset",
         "cluster:admin/tasks/cancel",
diff --git a/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/SecurityRealmSmokeTestCase.java b/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/SecurityRealmSmokeTestCase.java
index caeeb02e341d..567c81ead334 100644
--- a/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/SecurityRealmSmokeTestCase.java
+++ b/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/java/org/elasticsearch/xpack/security/authc/SecurityRealmSmokeTestCase.java
@@ -53,6 +53,8 @@ public abstract class SecurityRealmSmokeTestCase extends ESRestTestCase {
         .configFile("saml-metadata.xml", Resource.fromClasspath("saml-metadata.xml"))
         .configFile("kerberos.keytab", Resource.fromClasspath("kerberos.keytab"))
         .configFile("oidc-jwkset.json", Resource.fromClasspath("oidc-jwkset.json"))
+        .configFile("ldap_role_mapping.yml", Resource.fromClasspath("ldap_role_mapping.yml"))
+        .configFile("pki_role_mapping.yml", Resource.fromClasspath("pki_role_mapping.yml"))
         .setting("xpack.ml.enabled", "false")
         .setting("xpack.security.enabled", "true")
         .setting("xpack.security.authc.token.enabled", "true")
@@ -77,11 +79,16 @@ public abstract class SecurityRealmSmokeTestCase extends ESRestTestCase {
         .setting("xpack.security.authc.realms.ldap.ldap2.order", "2")
         .setting("xpack.security.authc.realms.ldap.ldap2.url", "ldap://localhost:7777")
         .setting("xpack.security.authc.realms.ldap.ldap2.user_search.base_dn", "OU=users,DC=example,DC=com")
+        .setting("xpack.security.authc.realms.ldap.ldap2.files.role_mapping", "ldap_role_mapping.yml")
         // - AD (configured but won't work because we don't want external fixtures in this test suite)
         .setting("xpack.security.authc.realms.active_directory.ad3.order", "3")
         .setting("xpack.security.authc.realms.active_directory.ad3.domain_name", "localhost")
+        // role mappings don't matter, but we need to read the file as part of the test
+        .setting("xpack.security.authc.realms.active_directory.ad3.files.role_mapping", "ldap_role_mapping.yml")
         // - PKI (works)
         .setting("xpack.security.authc.realms.pki.pki4.order", "4")
+        // role mappings don't matter, but we need to read the file as part of the test
+        .setting("xpack.security.authc.realms.pki.pki4.files.role_mapping", "pki_role_mapping.yml")
         // - SAML (configured but won't work because we don't want external fixtures in this test suite)
         .setting("xpack.security.authc.realms.saml.saml5.order", "5")
         .setting("xpack.security.authc.realms.saml.saml5.idp.metadata.path", "saml-metadata.xml")
diff --git a/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/resources/ldap_role_mapping.yml b/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/resources/ldap_role_mapping.yml
new file mode 100644
index 000000000000..73ebdf44794b
--- /dev/null
+++ b/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/resources/ldap_role_mapping.yml
@@ -0,0 +1,5 @@
+# AD Realm Role Mapping - not actually used, we just want some valid file content.
+group_role:
+  - "CN=Avengers,CN=users,DC=ad,DC=test,DC=elasticsearch,DC=com"
+user_role:
+  - "CN=Thor,CN=Users,DC=ad,DC=test,DC=elasticsearch,DC=com"
diff --git a/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/resources/pki_role_mapping.yml b/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/resources/pki_role_mapping.yml
new file mode 100644
index 000000000000..0346aa57f566
--- /dev/null
+++ b/x-pack/plugin/security/qa/smoke-test-all-realms/src/javaRestTest/resources/pki_role_mapping.yml
@@ -0,0 +1,4 @@
+# Role mappings for PKI tests - not actually used, we just want some valid file content.
+
+user:
+  - "CN=Elasticsearch Test Node, OU=elasticsearch, O=org"
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ClusterPrivilegeIntegrationTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ClusterPrivilegeIntegrationTests.java
index f17a0552f583..bd32fd75793c 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ClusterPrivilegeIntegrationTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ClusterPrivilegeIntegrationTests.java
@@ -260,7 +260,7 @@ private void waitForSnapshotToFinish(String repo, String snapshot) throws Except
             // The status of the snapshot in the repository can become SUCCESS before it is fully finalized in the cluster state so wait for
             // it to disappear from the cluster state as well
             SnapshotsInProgress snapshotsInProgress = SnapshotsInProgress.get(
-                clusterAdmin().state(new ClusterStateRequest()).get().getState()
+                clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).get().getState()
             );
             assertTrue(snapshotsInProgress.isEmpty());
         });
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndexPrivilegeIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndexPrivilegeIntegTests.java
index 0baafc14d9ca..b1ddc0fa5bde 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndexPrivilegeIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndexPrivilegeIntegTests.java
@@ -559,7 +559,7 @@ private void assertUserExecutes(String user, String action, String index, boolea
                     assertAccessIsAllowed(user, "DELETE", "/" + index);
                     assertUserIsAllowed(user, "create_index", index);
                     // wait until index ready, but as admin
-                    assertNoTimeout(clusterAdmin().prepareHealth(index).setWaitForGreenStatus().get());
+                    assertNoTimeout(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, index).setWaitForGreenStatus().get());
                     assertAccessIsAllowed(user, "POST", "/" + index + "/_refresh");
                     assertAccessIsAllowed(user, "GET", "/" + index + "/_analyze", "{ \"text\" : \"test\" }");
                     assertAccessIsAllowed(user, "POST", "/" + index + "/_flush");
@@ -569,7 +569,7 @@ private void assertUserExecutes(String user, String action, String index, boolea
                     assertAccessIsAllowed(user, "POST", "/" + index + "/_cache/clear");
                     // indexing a document to have the mapping available, and wait for green state to make sure index is created
                     assertAccessIsAllowed("admin", "PUT", "/" + index + "/_doc/1", jsonDoc);
-                    assertNoTimeout(clusterAdmin().prepareHealth(index).setWaitForGreenStatus().get());
+                    assertNoTimeout(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, index).setWaitForGreenStatus().get());
                     assertAccessIsAllowed(user, "GET", "/" + index + "/_mapping/field/name");
                     assertAccessIsAllowed(user, "GET", "/" + index + "/_settings");
                     assertAccessIsAllowed(user, randomFrom("GET", "POST"), "/" + index + "/_field_caps?fields=*");
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java
index 21a5b53e89af..38dd7116acce 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java
@@ -229,7 +229,7 @@ private void assertRoleMappingsSaveOK(CountDownLatch savedClusterState, AtomicLo
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).get();
 
         ReservedStateMetadata reservedState = clusterStateResponse.getState()
@@ -251,7 +251,7 @@ private void assertRoleMappingsSaveOK(CountDownLatch savedClusterState, AtomicLo
             equalTo("50mb")
         );
 
-        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest().persistentSettings(
+        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).persistentSettings(
             Settings.builder().put(INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey(), "1234kb")
         );
         assertEquals(
@@ -300,7 +300,7 @@ public void testRoleMappingsApplied() throws Exception {
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(savedClusterState.v2().get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(savedClusterState.v2().get())
         ).get();
 
         assertNull(
@@ -384,7 +384,7 @@ public void testErrorSaved() throws Exception {
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(savedClusterState.v2().get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(savedClusterState.v2().get())
         ).get();
 
         assertNull(
@@ -440,8 +440,9 @@ public void testRoleMappingApplyWithSecurityIndexClosed() throws Exception {
             assertFalse(response.hasMappings());
 
             // cluster state settings are also applied
-            var clusterStateResponse = clusterAdmin().state(new ClusterStateRequest().waitForMetadataVersion(savedClusterState.v2().get()))
-                .get();
+            var clusterStateResponse = clusterAdmin().state(
+                new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(savedClusterState.v2().get())
+            ).get();
             assertThat(
                 clusterStateResponse.getState().metadata().persistentSettings().get(INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey()),
                 equalTo("50mb")
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityFeatureStateIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityFeatureStateIntegTests.java
index 2ca799e94874..90ed62c971d9 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityFeatureStateIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityFeatureStateIntegTests.java
@@ -175,7 +175,7 @@ private void waitForSnapshotToFinish(String repo, String snapshot) throws Except
             // The status of the snapshot in the repository can become SUCCESS before it is fully finalized in the cluster state so wait for
             // it to disappear from the cluster state as well
             SnapshotsInProgress snapshotsInProgress = SnapshotsInProgress.get(
-                clusterAdmin().state(new ClusterStateRequest()).get().getState()
+                clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).get().getState()
             );
             assertTrue(snapshotsInProgress.isEmpty());
         });
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java
index e5a1ff867302..05dc4325a302 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java
@@ -34,7 +34,7 @@ public void testShrinkIndex() throws Exception {
             prepareIndex("bigindex").setSource("foo", "bar").get();
         }
 
-        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes();
+        Map<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getDataNodes();
         DiscoveryNode[] discoveryNodes = dataNodes.values().toArray(DiscoveryNode[]::new);
         final String mergeNode = discoveryNodes[0].getName();
         ensureGreen();
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/license/LicensingTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/license/LicensingTests.java
index 27b85888864c..42b807b5f045 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/license/LicensingTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/license/LicensingTests.java
@@ -158,7 +158,7 @@ public void testEnableDisableBehaviour() throws Exception {
 
         assertElasticsearchSecurityException(() -> client.admin().indices().prepareStats().get());
         assertElasticsearchSecurityException(() -> client.admin().cluster().prepareClusterStats().get());
-        assertElasticsearchSecurityException(() -> client.admin().cluster().prepareHealth().get());
+        assertElasticsearchSecurityException(() -> client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get());
         assertElasticsearchSecurityException(() -> client.admin().cluster().prepareNodesStats().get());
 
         enableLicensing(randomFrom(License.OperationMode.values()));
@@ -172,7 +172,7 @@ public void testEnableDisableBehaviour() throws Exception {
         assertThat(indices, notNullValue());
         assertThat(indices.getIndexCount(), greaterThanOrEqualTo(2));
 
-        ClusterHealthResponse clusterIndexHealth = client.admin().cluster().prepareHealth().get();
+        ClusterHealthResponse clusterIndexHealth = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
         assertThat(clusterIndexHealth, notNullValue());
 
         NodesStatsResponse nodeStats = client.admin().cluster().prepareNodesStats().get();
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/FileSettingsRoleMappingsRestartIT.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/FileSettingsRoleMappingsRestartIT.java
index 032cab446df2..c0f82adc8878 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/FileSettingsRoleMappingsRestartIT.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/FileSettingsRoleMappingsRestartIT.java
@@ -88,7 +88,7 @@ public void testReservedStatePersistsOnRestart() throws Exception {
         boolean awaitSuccessful = savedClusterState.v1().await(20, TimeUnit.SECONDS);
         assertTrue(awaitSuccessful);
 
-        var clusterState = clusterAdmin().state(new ClusterStateRequest()).actionGet().getState();
+        var clusterState = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).actionGet().getState();
         assertRoleMappingReservedMetadata(clusterState, "everyone_kibana_alone", "everyone_fleet_alone");
         List<ExpressionRoleMapping> roleMappings = new ArrayList<>(RoleMappingMetadata.getFromClusterState(clusterState).getRoleMappings());
         assertThat(
@@ -118,7 +118,7 @@ public void testReservedStatePersistsOnRestart() throws Exception {
         ensureGreen();
 
         // assert role mappings are recovered from "disk"
-        clusterState = clusterAdmin().state(new ClusterStateRequest()).actionGet().getState();
+        clusterState = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).actionGet().getState();
         assertRoleMappingReservedMetadata(clusterState, "everyone_kibana_alone", "everyone_fleet_alone");
         roleMappings = new ArrayList<>(RoleMappingMetadata.getFromClusterState(clusterState).getRoleMappings());
         assertThat(
@@ -151,7 +151,7 @@ public void testReservedStatePersistsOnRestart() throws Exception {
         awaitSuccessful = savedClusterState.v1().await(20, TimeUnit.SECONDS);
         assertTrue(awaitSuccessful);
 
-        clusterState = clusterAdmin().state(new ClusterStateRequest()).actionGet().getState();
+        clusterState = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).actionGet().getState();
         assertRoleMappingReservedMetadata(clusterState);
         roleMappings = new ArrayList<>(RoleMappingMetadata.getFromClusterState(clusterState).getRoleMappings());
         assertThat(roleMappings, emptyIterable());
@@ -162,7 +162,7 @@ public void testReservedStatePersistsOnRestart() throws Exception {
         ensureGreen();
 
         // assert empty role mappings are recovered from "disk"
-        clusterState = clusterAdmin().state(new ClusterStateRequest()).actionGet().getState();
+        clusterState = clusterAdmin().state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT)).actionGet().getState();
         assertRoleMappingReservedMetadata(clusterState);
         roleMappings = new ArrayList<>(RoleMappingMetadata.getFromClusterState(clusterState).getRoleMappings());
         assertThat(roleMappings, emptyIterable());
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/audit/logfile/AuditTrailSettingsUpdateTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/audit/logfile/AuditTrailSettingsUpdateTests.java
index 84a7f752d56a..0e2e6c909fbd 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/audit/logfile/AuditTrailSettingsUpdateTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/audit/logfile/AuditTrailSettingsUpdateTests.java
@@ -103,7 +103,9 @@ public void testInvalidFilterSettings() throws Exception {
         settingsBuilder.put(randomFrom(allSettingsKeys), invalidLuceneRegex);
         final IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
-            () -> clusterAdmin().prepareUpdateSettings().setPersistentSettings(settingsBuilder.build()).get()
+            () -> clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                .setPersistentSettings(settingsBuilder.build())
+                .get()
         );
         assertThat(e.getMessage(), containsString("invalid pattern [/invalid]"));
     }
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java
index 076ac01f1c8f..f164189c6f04 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/ApiKeyIntegTests.java
@@ -305,7 +305,7 @@ public void testCreateApiKey() throws Exception {
             () -> client().filterWithHeader(authorizationHeaders)
                 .admin()
                 .cluster()
-                .prepareUpdateSettings()
+                .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
                 .setPersistentSettings(Settings.builder().put(IPFilter.IP_FILTER_ENABLED_SETTING.getKey(), true))
                 .get()
         );
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
index 3025e3f061fc..66ea1235800e 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/TokenAuthIntegTests.java
@@ -796,7 +796,7 @@ public void wipeSecurityIndex() throws Exception {
     }
 
     public void testMetadataIsNotSentToClient() {
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().setCustoms(true).get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).setCustoms(true).get();
         assertFalse(clusterStateResponse.getState().customs().containsKey(TokenMetadata.TYPE));
     }
 
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/apikey/ApiKeySingleNodeTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/apikey/ApiKeySingleNodeTests.java
index 433f6aac1840..ccdf7704f221 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/apikey/ApiKeySingleNodeTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/apikey/ApiKeySingleNodeTests.java
@@ -315,7 +315,7 @@ public void testGrantApiKeyForUserWithRunAs() throws IOException {
         assertThat(apiKey.getRealmType(), equalTo("native"));
         final Client clientWithGrantedKey = client().filterWithHeader(Map.of("Authorization", "ApiKey " + base64ApiKeyKeyValue));
         // The API key has privileges (inherited from user2) to check cluster health
-        clientWithGrantedKey.execute(TransportClusterHealthAction.TYPE, new ClusterHealthRequest()).actionGet();
+        clientWithGrantedKey.execute(TransportClusterHealthAction.TYPE, new ClusterHealthRequest(TEST_REQUEST_TIMEOUT)).actionGet();
         // If the API key is granted with limiting descriptors, it should not be able to read pipeline
         if (grantApiKeyRequest.getApiKeyRequest().getRoleDescriptors().isEmpty()) {
             clientWithGrantedKey.execute(GetPipelineAction.INSTANCE, new GetPipelineRequest()).actionGet();
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java
index 6a1fd9a15cd2..78146e58e91e 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java
@@ -440,7 +440,7 @@ public void testCreateAndUpdateRole() {
             ClusterHealthResponse response = client().filterWithHeader(Collections.singletonMap("Authorization", token))
                 .admin()
                 .cluster()
-                .prepareHealth()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
                 .get();
             assertFalse(response.isTimedOut());
             preparePutRole("test_role").cluster("none")
@@ -495,12 +495,20 @@ public void testCreateAndUpdateRole() {
     private void assertClusterHealthOnlyAuthorizesWhenAnonymousRoleActive(String token) {
         if (anonymousEnabled && roleExists) {
             assertNoTimeout(
-                client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()
+                client().filterWithHeader(Collections.singletonMap("Authorization", token))
+                    .admin()
+                    .cluster()
+                    .prepareHealth(TEST_REQUEST_TIMEOUT)
+                    .get()
             );
         } else {
             ElasticsearchSecurityException e = expectThrows(
                 ElasticsearchSecurityException.class,
-                () -> client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()
+                () -> client().filterWithHeader(Collections.singletonMap("Authorization", token))
+                    .admin()
+                    .cluster()
+                    .prepareHealth(TEST_REQUEST_TIMEOUT)
+                    .get()
             );
             assertThat(e.status(), is(RestStatus.FORBIDDEN));
         }
@@ -607,7 +615,7 @@ public void testAuthenticateWithDeletedRole() {
         ClusterHealthResponse response = client().filterWithHeader(Collections.singletonMap("Authorization", token))
             .admin()
             .cluster()
-            .prepareHealth()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
             .get();
         assertFalse(response.isTimedOut());
         new DeleteRoleRequestBuilder(client()).name("test_role").get();
@@ -641,7 +649,7 @@ public void testPutUserWithoutPassword() {
         ClusterHealthResponse response = client().filterWithHeader(Collections.singletonMap("Authorization", token))
             .admin()
             .cluster()
-            .prepareHealth()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
             .get();
         assertFalse(response.isTimedOut());
 
@@ -657,12 +665,20 @@ public void testPutUserWithoutPassword() {
         // test that role change took effect if anonymous is disabled as anonymous grants monitoring permissions...
         if (anonymousEnabled && roleExists) {
             assertNoTimeout(
-                client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()
+                client().filterWithHeader(Collections.singletonMap("Authorization", token))
+                    .admin()
+                    .cluster()
+                    .prepareHealth(TEST_REQUEST_TIMEOUT)
+                    .get()
             );
         } else {
             ElasticsearchSecurityException e = expectThrows(
                 ElasticsearchSecurityException.class,
-                () -> client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()
+                () -> client().filterWithHeader(Collections.singletonMap("Authorization", token))
+                    .admin()
+                    .cluster()
+                    .prepareHealth(TEST_REQUEST_TIMEOUT)
+                    .get()
             );
             assertThat(e.status(), is(RestStatus.FORBIDDEN));
             assertThat(e.getMessage(), containsString("authorized"));
@@ -680,7 +696,11 @@ public void testPutUserWithoutPassword() {
 
         // validate that joe cannot auth with the old token
         try {
-            client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get();
+            client().filterWithHeader(Collections.singletonMap("Authorization", token))
+                .admin()
+                .cluster()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
+                .get();
             fail("should not authenticate with old password");
         } catch (ElasticsearchSecurityException e) {
             assertThat(e.getMessage(), containsString("authenticate"));
@@ -689,7 +709,7 @@ public void testPutUserWithoutPassword() {
         // test with new password and role
         response = client().filterWithHeader(
             Collections.singletonMap("Authorization", basicAuthHeaderValue("joe", new SecureString(secondPassword.toCharArray())))
-        ).admin().cluster().prepareHealth().get();
+        ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
         assertFalse(response.isTimedOut());
     }
 
@@ -800,7 +820,7 @@ public void testCreateAndChangePassword() throws Exception {
         ClusterHealthResponse response = client().filterWithHeader(Collections.singletonMap("Authorization", token))
             .admin()
             .cluster()
-            .prepareHealth()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
             .get();
         assertThat(response.isTimedOut(), is(false));
 
@@ -811,13 +831,17 @@ public void testCreateAndChangePassword() throws Exception {
 
         ElasticsearchSecurityException expected = expectThrows(
             ElasticsearchSecurityException.class,
-            () -> client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()
+            () -> client().filterWithHeader(Collections.singletonMap("Authorization", token))
+                .admin()
+                .cluster()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
+                .get()
         );
         assertThat(expected.status(), is(RestStatus.UNAUTHORIZED));
 
         response = client().filterWithHeader(
             Collections.singletonMap("Authorization", basicAuthHeaderValue("joe", SecuritySettingsSourceField.TEST_PASSWORD_SECURE_STRING))
-        ).admin().cluster().prepareHealth().get();
+        ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
         assertThat(response.isTimedOut(), is(false));
     }
 
@@ -942,7 +966,7 @@ public void testSetEnabled() throws Exception {
         ClusterHealthResponse response = client().filterWithHeader(Collections.singletonMap("Authorization", token))
             .admin()
             .cluster()
-            .prepareHealth()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
             .get();
         assertThat(response.isTimedOut(), is(false));
 
@@ -950,13 +974,21 @@ public void testSetEnabled() throws Exception {
 
         ElasticsearchSecurityException expected = expectThrows(
             ElasticsearchSecurityException.class,
-            () -> client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get()
+            () -> client().filterWithHeader(Collections.singletonMap("Authorization", token))
+                .admin()
+                .cluster()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
+                .get()
         );
         assertThat(expected.status(), is(RestStatus.UNAUTHORIZED));
 
         new SetEnabledRequestBuilder(client()).username("joe").enabled(true).get();
 
-        response = client().filterWithHeader(Collections.singletonMap("Authorization", token)).admin().cluster().prepareHealth().get();
+        response = client().filterWithHeader(Collections.singletonMap("Authorization", token))
+            .admin()
+            .cluster()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
+            .get();
         assertThat(response.isTimedOut(), is(false));
 
         IllegalArgumentException e = expectThrows(
@@ -974,14 +1006,14 @@ public void testNegativeLookupsThenCreateRole() throws Exception {
             if (anonymousEnabled && roleExists) {
                 ClusterHealthResponse response = client().filterWithHeader(
                     Collections.singletonMap("Authorization", basicAuthHeaderValue("joe", new SecureString("s3krit-password")))
-                ).admin().cluster().prepareHealth().get();
+                ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
                 assertNoTimeout(response);
             } else {
                 ElasticsearchSecurityException e = expectThrows(
                     ElasticsearchSecurityException.class,
                     () -> client().filterWithHeader(
                         Collections.singletonMap("Authorization", basicAuthHeaderValue("joe", new SecureString("s3krit-password")))
-                    ).admin().cluster().prepareHealth().get()
+                    ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get()
                 );
                 assertThat(e.status(), is(RestStatus.FORBIDDEN));
             }
@@ -990,7 +1022,7 @@ public void testNegativeLookupsThenCreateRole() throws Exception {
         preparePutRole("unknown_role").cluster("all").get();
         ClusterHealthResponse response = client().filterWithHeader(
             Collections.singletonMap("Authorization", basicAuthHeaderValue("joe", new SecureString("s3krit-password")))
-        ).admin().cluster().prepareHealth().get();
+        ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
         assertNoTimeout(response);
     }
 
@@ -1017,7 +1049,7 @@ public void testConcurrentRunAs() throws Exception {
                 try {
                     latch.await();
                     for (int j = 0; j < numberOfIterations; j++) {
-                        ClusterHealthResponse response = client.admin().cluster().prepareHealth().get();
+                        ClusterHealthResponse response = client.admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
                         assertNoTimeout(response);
                     }
                 } catch (InterruptedException e) {
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmElasticAutoconfigIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmElasticAutoconfigIntegTests.java
index ae48d7563494..4d3fa73c8e24 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmElasticAutoconfigIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmElasticAutoconfigIntegTests.java
@@ -92,7 +92,10 @@ private void awaitSecurityMigrationRanOnce() {
     public void testAutoconfigFailedPasswordPromotion() {
         try {
             // prevents the .security index from being created automatically (after elastic user authentication)
-            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             updateSettingsRequest.transientSettings(Settings.builder().put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), true));
             assertAcked(clusterAdmin().updateSettings(updateSettingsRequest).actionGet());
 
@@ -146,7 +149,10 @@ public void testAutoconfigFailedPasswordPromotion() {
             exception = expectThrows(ResponseException.class, () -> getRestClient().performRequest(restRequest2));
             assertThat(exception.getResponse().getStatusLine().getStatusCode(), is(RestStatus.UNAUTHORIZED.getStatus()));
         } finally {
-            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             updateSettingsRequest.transientSettings(
                 Settings.builder().put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), (String) null)
             );
@@ -168,7 +174,10 @@ public void testAutoconfigSucceedsAfterPromotionFailure() throws Exception {
             awaitSecurityMigrationRanOnce();
 
             // but then make the cluster read-only
-            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             updateSettingsRequest.transientSettings(Settings.builder().put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), true));
             assertAcked(clusterAdmin().updateSettings(updateSettingsRequest).actionGet());
 
@@ -190,7 +199,7 @@ public void testAutoconfigSucceedsAfterPromotionFailure() throws Exception {
             ResponseException exception = expectThrows(ResponseException.class, () -> getRestClient().performRequest(restRequest));
             assertThat(exception.getResponse().getStatusLine().getStatusCode(), is(RestStatus.SERVICE_UNAVAILABLE.getStatus()));
             // clear cluster-wide write block
-            updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            updateSettingsRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
             updateSettingsRequest.transientSettings(
                 Settings.builder().put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), (String) null)
             );
@@ -232,7 +241,10 @@ public void testAutoconfigSucceedsAfterPromotionFailure() throws Exception {
             restRequest3.setOptions(options);
             assertThat(getRestClient().performRequest(restRequest3).getStatusLine().getStatusCode(), is(RestStatus.OK.getStatus()));
         } finally {
-            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest updateSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             updateSettingsRequest.transientSettings(
                 Settings.builder().put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), (String) null)
             );
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java
index d9e76195d736..6abb45e62050 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/ReservedRealmIntegTests.java
@@ -64,7 +64,7 @@ public void testAuthenticate() {
         for (String username : usernames) {
             ClusterHealthResponse response = client().filterWithHeader(
                 singletonMap("Authorization", basicAuthHeaderValue(username, getReservedPassword()))
-            ).admin().cluster().prepareHealth().get();
+            ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
 
             assertThat(response.getClusterName(), is(cluster().getClusterName()));
         }
@@ -89,7 +89,7 @@ public void testAuthenticateAfterEnablingUser() throws IOException {
 
             ClusterHealthResponse response = client().filterWithHeader(
                 singletonMap("Authorization", basicAuthHeaderValue(username, getReservedPassword()))
-            ).admin().cluster().prepareHealth().get();
+            ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
 
             assertThat(response.getClusterName(), is(cluster().getClusterName()));
         }
@@ -110,7 +110,7 @@ public void testChangingPassword() throws IOException {
         if (randomBoolean()) {
             ClusterHealthResponse response = client().filterWithHeader(
                 singletonMap("Authorization", basicAuthHeaderValue(username, getReservedPassword()))
-            ).admin().cluster().prepareHealth().get();
+            ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
             assertThat(response.getClusterName(), is(cluster().getClusterName()));
         }
 
@@ -121,14 +121,14 @@ public void testChangingPassword() throws IOException {
             () -> client().filterWithHeader(singletonMap("Authorization", basicAuthHeaderValue(username, getReservedPassword())))
                 .admin()
                 .cluster()
-                .prepareHealth()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
                 .get()
         );
         assertThat(elasticsearchSecurityException.getMessage(), containsString("authenticate"));
 
         ClusterHealthResponse healthResponse = client().filterWithHeader(
             singletonMap("Authorization", basicAuthHeaderValue(username, new SecureString(newPassword)))
-        ).admin().cluster().prepareHealth().get();
+        ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
         assertThat(healthResponse.getClusterName(), is(cluster().getClusterName()));
     }
 
@@ -136,7 +136,7 @@ public void testDisablingUser() throws Exception {
         // validate the user works
         ClusterHealthResponse response = client().filterWithHeader(
             singletonMap("Authorization", basicAuthHeaderValue(ElasticUser.NAME, getReservedPassword()))
-        ).admin().cluster().prepareHealth().get();
+        ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
         assertThat(response.getClusterName(), is(cluster().getClusterName()));
 
         // disable user
@@ -146,7 +146,7 @@ public void testDisablingUser() throws Exception {
             () -> client().filterWithHeader(singletonMap("Authorization", basicAuthHeaderValue(ElasticUser.NAME, getReservedPassword())))
                 .admin()
                 .cluster()
-                .prepareHealth()
+                .prepareHealth(TEST_REQUEST_TIMEOUT)
                 .get()
         );
         assertThat(elasticsearchSecurityException.getMessage(), containsString("authenticate"));
@@ -156,7 +156,7 @@ public void testDisablingUser() throws Exception {
         response = client().filterWithHeader(singletonMap("Authorization", basicAuthHeaderValue(ElasticUser.NAME, getReservedPassword())))
             .admin()
             .cluster()
-            .prepareHealth()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
             .get();
         assertThat(response.getClusterName(), is(cluster().getClusterName()));
     }
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreCacheTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreCacheTests.java
index d11ca70744b7..dddc4e7ba178 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreCacheTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreCacheTests.java
@@ -303,14 +303,14 @@ public void testRolesCacheIsClearedWhenPrivilegesIsChanged() {
                 "Basic " + Base64.getEncoder().encodeToString((testRoleCacheUser + ":longerpassword").getBytes(StandardCharsets.UTF_8))
             )
         );
-        new ClusterHealthRequestBuilder(testRoleCacheUserClient).get();
+        new ClusterHealthRequestBuilder(testRoleCacheUserClient, TEST_REQUEST_TIMEOUT).get();
 
         // Directly deleted the role document
         final DeleteResponse deleteResponse = client.prepareDelete(SECURITY_MAIN_ALIAS, "role-" + testRole).get();
         assertEquals(DocWriteResponse.Result.DELETED, deleteResponse.getResult());
 
         // The cluster health action can still success since the role is cached
-        new ClusterHealthRequestBuilder(testRoleCacheUserClient).get();
+        new ClusterHealthRequestBuilder(testRoleCacheUserClient, TEST_REQUEST_TIMEOUT).get();
 
         // Change an application privilege which triggers role cache invalidation as well
         if (randomBoolean()) {
@@ -319,7 +319,10 @@ public void testRolesCacheIsClearedWhenPrivilegesIsChanged() {
             addApplicationPrivilege("app-3", "read", "r:q:r:s");
         }
         // Since role cache is cleared, the cluster health action is no longer authorized
-        expectThrows(ElasticsearchSecurityException.class, () -> new ClusterHealthRequestBuilder(testRoleCacheUserClient).get());
+        expectThrows(
+            ElasticsearchSecurityException.class,
+            () -> new ClusterHealthRequestBuilder(testRoleCacheUserClient, TEST_REQUEST_TIMEOUT).get()
+        );
     }
 
     private HasPrivilegesResponse checkPrivilege(String applicationName, String privilegeName) {
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreSingleNodeTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreSingleNodeTests.java
index 2503f2fc17d2..1e4682ae1530 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreSingleNodeTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/store/NativePrivilegeStoreSingleNodeTests.java
@@ -77,7 +77,7 @@ public void configureApplicationPrivileges() {
 
     public void testResolvePrivilegesWorkWhenExpensiveQueriesAreDisabled() throws IOException {
         // Disable expensive query
-        new ClusterUpdateSettingsRequestBuilder(client()).setTransientSettings(
+        new ClusterUpdateSettingsRequestBuilder(client(), TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(
             Settings.builder().put(ALLOW_EXPENSIVE_QUERIES.getKey(), false)
         ).get();
 
@@ -184,7 +184,7 @@ public void testResolvePrivilegesWorkWhenExpensiveQueriesAreDisabled() throws IO
             assertThat(authenticateResponse.authentication().getEffectiveSubject().getUser().principal(), equalTo("app_user"));
         } finally {
             // Reset setting since test suite expects things in a clean slate
-            new ClusterUpdateSettingsRequestBuilder(client()).setTransientSettings(
+            new ClusterUpdateSettingsRequestBuilder(client(), TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).setTransientSettings(
                 Settings.builder().putNull(ALLOW_EXPENSIVE_QUERIES.getKey())
             ).get();
         }
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/operator/OperatorPrivilegesSingleNodeTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/operator/OperatorPrivilegesSingleNodeTests.java
index 9593bfa5ab72..30cd1f254d00 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/operator/OperatorPrivilegesSingleNodeTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/operator/OperatorPrivilegesSingleNodeTests.java
@@ -66,7 +66,9 @@ protected Settings nodeSettings() {
     }
 
     public void testNormalSuperuserWillFailToCallOperatorOnlyAction() {
-        final ClearVotingConfigExclusionsRequest clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest();
+        final ClearVotingConfigExclusionsRequest clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest(
+            TEST_REQUEST_TIMEOUT
+        );
         final ElasticsearchSecurityException e = expectThrows(
             ElasticsearchSecurityException.class,
             () -> client().execute(TransportClearVotingConfigExclusionsAction.TYPE, clearVotingConfigExclusionsRequest).actionGet()
@@ -76,7 +78,10 @@ public void testNormalSuperuserWillFailToCallOperatorOnlyAction() {
 
     public void testNormalSuperuserWillFailToSetOperatorOnlySettings() {
         final Settings settings = Settings.builder().put(IPFilter.IP_FILTER_ENABLED_SETTING.getKey(), "null").build();
-        final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest();
+        final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT
+        );
         if (randomBoolean()) {
             clusterUpdateSettingsRequest.transientSettings(settings);
         } else {
@@ -91,13 +96,18 @@ public void testNormalSuperuserWillFailToSetOperatorOnlySettings() {
 
     public void testOperatorUserWillSucceedToCallOperatorOnlyAction() {
         final Client client = createOperatorClient();
-        final ClearVotingConfigExclusionsRequest clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest();
+        final ClearVotingConfigExclusionsRequest clearVotingConfigExclusionsRequest = new ClearVotingConfigExclusionsRequest(
+            TEST_REQUEST_TIMEOUT
+        );
         client.execute(TransportClearVotingConfigExclusionsAction.TYPE, clearVotingConfigExclusionsRequest).actionGet();
     }
 
     public void testOperatorUserWillSucceedToSetOperatorOnlySettings() {
         final Client client = createOperatorClient();
-        final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest();
+        final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = new ClusterUpdateSettingsRequest(
+            TEST_REQUEST_TIMEOUT,
+            TEST_REQUEST_TIMEOUT
+        );
         final Settings settings = Settings.builder().put(IPFilter.IP_FILTER_ENABLED_SETTING.getKey(), false).build();
         final boolean useTransientSetting = randomBoolean();
         try {
@@ -108,7 +118,10 @@ public void testOperatorUserWillSucceedToSetOperatorOnlySettings() {
             }
             client.execute(ClusterUpdateSettingsAction.INSTANCE, clusterUpdateSettingsRequest).actionGet();
         } finally {
-            final ClusterUpdateSettingsRequest clearSettingsRequest = new ClusterUpdateSettingsRequest();
+            final ClusterUpdateSettingsRequest clearSettingsRequest = new ClusterUpdateSettingsRequest(
+                TEST_REQUEST_TIMEOUT,
+                TEST_REQUEST_TIMEOUT
+            );
             final Settings clearSettings = Settings.builder().putNull(IPFilter.IP_FILTER_ENABLED_SETTING.getKey()).build();
             if (useTransientSetting) {
                 clearSettingsRequest.transientSettings(clearSettings);
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/SecurityDomainIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/SecurityDomainIntegTests.java
index f43275c2d8b7..6e95e9e3a74d 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/SecurityDomainIntegTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/SecurityDomainIntegTests.java
@@ -336,7 +336,7 @@ public void testDomainCaptureForApiKey() throws IOException {
                             (createApiKeyResponse.getId() + ":" + createApiKeyResponse.getKey()).getBytes(StandardCharsets.UTF_8)
                         )
             )
-        ).admin().cluster().prepareHealth().get();
+        ).admin().cluster().prepareHealth(TEST_REQUEST_TIMEOUT).get();
     }
 
     public void testDomainCaptureForServiceToken() throws IOException {
@@ -364,7 +364,7 @@ public void testDomainCaptureForServiceToken() throws IOException {
         client().filterWithHeader(Map.of("Authorization", "Bearer " + createServiceTokenResponse.getValue()))
             .admin()
             .cluster()
-            .prepareHealth()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
             .get();
     }
 
@@ -372,7 +372,7 @@ private void assertAccessToken(CreateTokenResponse createTokenResponse) {
         client().filterWithHeader(Map.of("Authorization", "Bearer " + createTokenResponse.getTokenString()))
             .admin()
             .cluster()
-            .prepareHealth()
+            .prepareHealth(TEST_REQUEST_TIMEOUT)
             .get();
         assertResponse(prepareSearch(SecuritySystemIndices.SECURITY_TOKENS_ALIAS), searchResponse -> {
             final String encodedAuthentication;
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java
index 0b1d33cb35c9..4f04f77ef024 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/transport/filter/IpFilteringUpdateTests.java
@@ -87,7 +87,7 @@ public void testThatIpFilterConfigurationCanBeChangedDynamically() throws Except
         assertConnectionRejected("client", "127.0.0.8");
 
         // check that all is in cluster state
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().settings().get("xpack.security.transport.filter.allow"), is("127.0.0.1"));
         assertThat(clusterState.metadata().settings().get("xpack.security.transport.filter.deny"), is("127.0.0.8"));
         assertEquals(Arrays.asList("127.0.0.1"), clusterState.metadata().settings().getAsList("xpack.security.http.filter.allow"));
@@ -105,7 +105,7 @@ public void testThatIpFilterConfigurationCanBeChangedDynamically() throws Except
         assertConnectionAccepted("client", "127.0.0.8");
 
         // disabling should not have any effect on the cluster state settings
-        clusterState = clusterAdmin().prepareState().get().getState();
+        clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         assertThat(clusterState.metadata().settings().get("xpack.security.transport.filter.allow"), is("127.0.0.1"));
         assertThat(clusterState.metadata().settings().get("xpack.security.transport.filter.deny"), is("127.0.0.8"));
         assertEquals(Arrays.asList("127.0.0.1"), clusterState.metadata().settings().getAsList("xpack.security.http.filter.allow"));
@@ -148,7 +148,9 @@ public void testThatInvalidDynamicIpFilterConfigurationIsRejected() {
                     expectThrows(
                         IllegalArgumentException.class,
                         settingName,
-                        () -> clusterAdmin().prepareUpdateSettings().setPersistentSettings(settings).get()
+                        () -> clusterAdmin().prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT)
+                            .setPersistentSettings(settings)
+                            .get()
                     ).getMessage(),
                     allOf(containsString("invalid IP filter"), containsString(invalidValue))
                 );
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/operator/OperatorOnlyRegistry.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/operator/OperatorOnlyRegistry.java
index f0889f1c48c7..ef3070f0bd78 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/operator/OperatorOnlyRegistry.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/operator/OperatorOnlyRegistry.java
@@ -8,7 +8,6 @@
 package org.elasticsearch.xpack.security.operator;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.rest.RestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.transport.TransportRequest;
@@ -23,21 +22,10 @@ public interface OperatorOnlyRegistry {
     OperatorPrivilegesViolation check(String action, TransportRequest request);
 
     /**
-     * Checks to see if a given {@link RestHandler} is subject to operator-only restrictions for the REST API.
-     *
-     * Any REST API may be fully or partially restricted.
-     * A fully restricted REST API mandates that the implementation of this method throw an
-     * {@link org.elasticsearch.ElasticsearchStatusException} with an appropriate status code and error message.
-     *
-     * A partially restricted REST API mandates that the {@link RestRequest} is marked as restricted so that the downstream handler can
-     * behave appropriately.
-     * For example, to restrict the REST response the implementation
-     * should call {@link RestRequest#markPathRestricted(String)} so that the downstream handler can properly restrict the response
-     * before returning to the client. Note - a partial restriction should not throw an exception.
-     *
-     * @param restHandler The {@link RestHandler} to check for any restrictions
-     * @param restRequest The {@link RestRequest} to check for any restrictions and mark any partially restricted REST API's
-     * @throws ElasticsearchStatusException if the request should be denied in its entirety (fully restricted)
+     * This method is only called if the user is not an operator.
+     * Implementations should fail the request if the {@link RestRequest} is not allowed to proceed by throwing an
+     * {@link org.elasticsearch.ElasticsearchException}. If the request should be handled by the associated {@link RestHandler},
+     * then this implementations should do nothing.
      */
     void checkRest(RestHandler restHandler, RestRequest restRequest) throws ElasticsearchException;
 
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/operator/OperatorPrivileges.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/operator/OperatorPrivileges.java
index 79c529eb3d7b..9ef41fad1240 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/operator/OperatorPrivileges.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/operator/OperatorPrivileges.java
@@ -182,6 +182,9 @@ public boolean checkRest(RestHandler restHandler, RestRequest restRequest, RestC
                     );
                     throw e;
                 }
+            } else {
+                restRequest.markAsOperatorRequest();
+                logger.trace("Marked request for uri [{}] as operator request", restRequest.uri());
             }
             return true;
         }
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java
index 5f0657079e69..e0ef46dc73a1 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/privilege/RestGetBuiltinPrivilegesAction.java
@@ -85,9 +85,9 @@ public RestResponse buildResponse(GetBuiltinPrivilegesResponse response, XConten
 
     @Override
     protected Exception innerCheckFeatureAvailable(RestRequest request) {
-        final boolean restrictPath = request.hasParam(RestRequest.PATH_RESTRICTED);
-        assert false == restrictPath || DiscoveryNode.isStateless(settings);
-        if (false == restrictPath) {
+        final boolean shouldRestrictForServerless = shouldRestrictForServerless(request);
+        assert false == shouldRestrictForServerless || DiscoveryNode.isStateless(settings);
+        if (false == shouldRestrictForServerless) {
             return super.innerCheckFeatureAvailable(request);
         }
         // This is a temporary hack: we are re-using the native roles setting as an overall feature flag for custom roles.
@@ -106,4 +106,7 @@ protected Exception innerCheckFeatureAvailable(RestRequest request) {
         }
     }
 
+    private boolean shouldRestrictForServerless(RestRequest request) {
+        return request.isServerlessRequest() && false == request.isOperatorRequest();
+    }
 }
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java
index 232d74d16725..dc9ecbbc63a8 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/action/role/RestGetRolesAction.java
@@ -7,7 +7,6 @@
 package org.elasticsearch.xpack.security.rest.action.role;
 
 import org.elasticsearch.client.internal.node.NodeClient;
-import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.RestApiVersion;
@@ -54,9 +53,9 @@ public String getName() {
     @Override
     public RestChannelConsumer innerPrepareRequest(RestRequest request, NodeClient client) throws IOException {
         final String[] roles = request.paramAsStringArray("name", Strings.EMPTY_ARRAY);
-        final boolean restrictRequest = isPathRestricted(request);
+        final boolean restrictToNativeRolesOnly = request.isServerlessRequest() && false == request.isOperatorRequest();
         return channel -> new GetRolesRequestBuilder(client).names(roles)
-            .nativeOnly(restrictRequest)
+            .nativeOnly(restrictToNativeRolesOnly)
             .execute(new RestBuilderListener<>(channel) {
                 @Override
                 public RestResponse buildResponse(GetRolesResponse response, XContentBuilder builder) throws Exception {
@@ -84,17 +83,10 @@ protected Exception innerCheckFeatureAvailable(RestRequest request) {
         // Note: For non-restricted requests this action handles both reserved roles and native
         // roles, and should still be available even if native role management is disabled.
         // For restricted requests it should only be available if native role management is enabled
-        final boolean restrictPath = isPathRestricted(request);
-        if (false == restrictPath) {
+        if (false == request.isServerlessRequest() || request.isOperatorRequest()) {
             return null;
         } else {
             return super.innerCheckFeatureAvailable(request);
         }
     }
-
-    private boolean isPathRestricted(RestRequest request) {
-        final boolean restrictRequest = request.hasParam(RestRequest.PATH_RESTRICTED);
-        assert false == restrictRequest || DiscoveryNode.isStateless(settings);
-        return restrictRequest;
-    }
 }
diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java
index 9809127080dc..e3cd1d2f123d 100644
--- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java
+++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/CrossClusterAccessServerTransportFilter.java
@@ -41,6 +41,7 @@ final class CrossClusterAccessServerTransportFilter extends ServerTransportFilte
             Set.of(CROSS_CLUSTER_ACCESS_CREDENTIALS_HEADER_KEY, CROSS_CLUSTER_ACCESS_SUBJECT_INFO_HEADER_KEY)
         );
         allowedHeaders.add(AuditUtil.AUDIT_REQUEST_ID);
+        allowedHeaders.add(Task.TRACE_STATE);
         allowedHeaders.addAll(Task.HEADERS_TO_COPY);
         ALLOWED_TRANSPORT_HEADERS = Set.copyOf(allowedHeaders);
     }
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java
index 1ed371229d07..aabfa0593e5f 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java
@@ -387,7 +387,7 @@ public void assertSecurityIndexActive() throws Exception {
     public void assertSecurityIndexActive(TestCluster testCluster) throws Exception {
         for (Client client : testCluster.getClients()) {
             assertBusy(() -> {
-                ClusterState clusterState = client.admin().cluster().prepareState().setLocal(true).get().getState();
+                ClusterState clusterState = client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).setLocal(true).get().getState();
                 assertFalse(clusterState.blocks().hasGlobalBlock(GatewayService.STATE_NOT_RECOVERED_BLOCK));
                 Index securityIndex = resolveSecurityIndex(clusterState.metadata());
                 if (securityIndex != null) {
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheckTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheckTests.java
index 6777c38b809e..01715cde33cf 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheckTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/SecurityImplicitBehaviorBootstrapCheckTests.java
@@ -10,9 +10,9 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.bootstrap.BootstrapCheck;
 import org.elasticsearch.cluster.metadata.Metadata;
-import org.elasticsearch.common.ReferenceDocs;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.env.BuildVersion;
 import org.elasticsearch.env.NodeMetadata;
 import org.elasticsearch.index.IndexVersion;
@@ -25,92 +25,13 @@
 import org.elasticsearch.test.VersionUtils;
 import org.elasticsearch.xpack.core.XPackSettings;
 
-import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class SecurityImplicitBehaviorBootstrapCheckTests extends AbstractBootstrapCheckTestCase {
 
-    public void testFailureUpgradeFrom7xWithImplicitSecuritySettings() throws Exception {
-        final BuildVersion previousVersion = toBuildVersion(
-            randomValueOtherThan(
-                Version.V_8_0_0,
-                () -> VersionUtils.randomVersionBetween(random(), Version.CURRENT.minimumCompatibilityVersion(), Version.V_8_0_0)
-            )
-        );
-        NodeMetadata nodeMetadata = new NodeMetadata(randomAlphaOfLength(10), previousVersion, IndexVersion.current());
-        nodeMetadata = nodeMetadata.upgradeToCurrentVersion();
-        ClusterStateLicenseService licenseService = mock(ClusterStateLicenseService.class);
-        Metadata metadata = createLicensesMetadata(
-            TrialLicenseVersion.fromXContent(previousVersion.toString()),
-            randomFrom("basic", "trial")
-        );
-        License license = mock(License.class);
-        when(licenseService.getLicense(metadata)).thenReturn(license);
-        when(license.operationMode()).thenReturn(randomFrom(License.OperationMode.BASIC, License.OperationMode.TRIAL));
-        BootstrapCheck.BootstrapCheckResult result = new SecurityImplicitBehaviorBootstrapCheck(nodeMetadata, licenseService).check(
-            createTestContext(Settings.EMPTY, metadata)
-        );
-        assertThat(result.isFailure(), is(true));
-        assertThat(
-            result.getMessage(),
-            equalTo(
-                "The default value for ["
-                    + XPackSettings.SECURITY_ENABLED.getKey()
-                    + "] has changed in the current version. "
-                    + " Security features were implicitly disabled for this node but they would now be enabled, possibly"
-                    + " preventing access to the node. "
-                    + "See "
-                    + ReferenceDocs.BOOTSTRAP_CHECK_SECURITY_MINIMAL_SETUP
-                    + " to configure security, or explicitly disable security by "
-                    + "setting [xpack.security.enabled] to \"false\" in elasticsearch.yml before restarting the node."
-            )
-        );
-    }
-
-    public void testUpgradeFrom7xWithImplicitSecuritySettingsOnGoldPlus() throws Exception {
-        final BuildVersion previousVersion = toBuildVersion(
-            randomValueOtherThan(
-                Version.V_8_0_0,
-                () -> VersionUtils.randomVersionBetween(random(), Version.CURRENT.minimumCompatibilityVersion(), Version.V_8_0_0)
-            )
-        );
-        NodeMetadata nodeMetadata = new NodeMetadata(randomAlphaOfLength(10), previousVersion, IndexVersion.current());
-        nodeMetadata = nodeMetadata.upgradeToCurrentVersion();
-        ClusterStateLicenseService licenseService = mock(ClusterStateLicenseService.class);
-        Metadata metadata = createLicensesMetadata(
-            TrialLicenseVersion.fromXContent(previousVersion.toString()),
-            randomFrom("gold", "platinum")
-        );
-        License license = mock(License.class);
-        when(licenseService.getLicense(metadata)).thenReturn(license);
-        when(license.operationMode()).thenReturn(randomFrom(License.OperationMode.GOLD, License.OperationMode.PLATINUM));
-        BootstrapCheck.BootstrapCheckResult result = new SecurityImplicitBehaviorBootstrapCheck(nodeMetadata, licenseService).check(
-            createTestContext(Settings.EMPTY, metadata)
-        );
-        assertThat(result.isSuccess(), is(true));
-    }
-
-    public void testUpgradeFrom7xWithExplicitSecuritySettings() throws Exception {
-        final BuildVersion previousVersion = toBuildVersion(
-            randomValueOtherThan(
-                Version.V_8_0_0,
-                () -> VersionUtils.randomVersionBetween(random(), Version.CURRENT.minimumCompatibilityVersion(), Version.V_8_0_0)
-            )
-        );
-        NodeMetadata nodeMetadata = new NodeMetadata(randomAlphaOfLength(10), previousVersion, IndexVersion.current());
-        nodeMetadata = nodeMetadata.upgradeToCurrentVersion();
-        ClusterStateLicenseService licenseService = mock(ClusterStateLicenseService.class);
-        BootstrapCheck.BootstrapCheckResult result = new SecurityImplicitBehaviorBootstrapCheck(nodeMetadata, licenseService).check(
-            createTestContext(
-                Settings.builder().put(XPackSettings.SECURITY_ENABLED.getKey(), true).build(),
-                createLicensesMetadata(TrialLicenseVersion.fromXContent(previousVersion.toString()), randomFrom("basic", "trial"))
-            )
-        );
-        assertThat(result.isSuccess(), is(true));
-    }
-
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "requires updates for version 9.0 bump")
     public void testUpgradeFrom8xWithImplicitSecuritySettings() throws Exception {
         final BuildVersion previousVersion = toBuildVersion(VersionUtils.randomVersionBetween(random(), Version.V_8_0_0, null));
         NodeMetadata nodeMetadata = new NodeMetadata(randomAlphaOfLength(10), previousVersion, IndexVersion.current());
@@ -125,6 +46,8 @@ public void testUpgradeFrom8xWithImplicitSecuritySettings() throws Exception {
         assertThat(result.isSuccess(), is(true));
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "requires updates for version 9.0 bump")
     public void testUpgradeFrom8xWithExplicitSecuritySettings() throws Exception {
         final BuildVersion previousVersion = toBuildVersion(VersionUtils.randomVersionBetween(random(), Version.V_8_0_0, null));
         NodeMetadata nodeMetadata = new NodeMetadata(randomAlphaOfLength(10), previousVersion, IndexVersion.current());
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java
index 3be0a17d1925..bb46beae8657 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java
@@ -1612,7 +1612,7 @@ public void testDenialErrorMessagesForClusterHealthAction() {
 
         AuditUtil.getOrGenerateRequestId(threadContext);
 
-        TransportRequest request = new ClusterHealthRequest();
+        TransportRequest request = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT);
 
         ElasticsearchSecurityException securityException = expectThrows(
             ElasticsearchSecurityException.class,
@@ -2143,7 +2143,10 @@ public void testGrantAllRestrictedUserCannotExecuteOperationAgainstSecurityIndic
         }
 
         // we should allow waiting for the health of the index or any index if the user has this permission
-        ClusterHealthRequest request = new ClusterHealthRequest(randomFrom(SECURITY_MAIN_ALIAS, INTERNAL_SECURITY_MAIN_INDEX_7));
+        ClusterHealthRequest request = new ClusterHealthRequest(
+            TEST_REQUEST_TIMEOUT,
+            randomFrom(SECURITY_MAIN_ALIAS, INTERNAL_SECURITY_MAIN_INDEX_7)
+        );
         authorize(authentication, TransportClusterHealthAction.NAME, request);
         verify(auditTrail).accessGranted(
             eq(requestId),
@@ -2154,7 +2157,7 @@ public void testGrantAllRestrictedUserCannotExecuteOperationAgainstSecurityIndic
         );
 
         // multiple indices
-        request = new ClusterHealthRequest(SECURITY_MAIN_ALIAS, INTERNAL_SECURITY_MAIN_INDEX_7, "foo", "bar");
+        request = new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, SECURITY_MAIN_ALIAS, INTERNAL_SECURITY_MAIN_INDEX_7, "foo", "bar");
         authorize(authentication, TransportClusterHealthAction.NAME, request);
         verify(auditTrail).accessGranted(
             eq(requestId),
@@ -2283,13 +2286,18 @@ public void testSuperusersCanExecuteReadOperationAgainstSecurityIndex() {
         requests.add(
             new Tuple<>(
                 TransportClusterHealthAction.NAME,
-                new ClusterHealthRequest(randomFrom(SECURITY_MAIN_ALIAS, INTERNAL_SECURITY_MAIN_INDEX_7))
+                new ClusterHealthRequest(TEST_REQUEST_TIMEOUT, randomFrom(SECURITY_MAIN_ALIAS, INTERNAL_SECURITY_MAIN_INDEX_7))
             )
         );
         requests.add(
             new Tuple<>(
                 TransportClusterHealthAction.NAME,
-                new ClusterHealthRequest(randomFrom(SECURITY_MAIN_ALIAS, INTERNAL_SECURITY_MAIN_INDEX_7), "foo", "bar")
+                new ClusterHealthRequest(
+                    TEST_REQUEST_TIMEOUT,
+                    randomFrom(SECURITY_MAIN_ALIAS, INTERNAL_SECURITY_MAIN_INDEX_7),
+                    "foo",
+                    "bar"
+                )
             )
         );
 
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/operator/DefaultOperatorPrivilegesTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/operator/DefaultOperatorPrivilegesTests.java
index aa95ea097413..a5dabe8c2dd8 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/operator/DefaultOperatorPrivilegesTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/operator/DefaultOperatorPrivilegesTests.java
@@ -89,7 +89,7 @@ public void testWillNotCheckWhenLicenseDoesNotSupport() {
         verifyNoMoreInteractions(operatorOnlyRegistry);
     }
 
-    public void testMarkOperatorUser() throws IllegalAccessException {
+    public void testMarkOperatorUser() {
         final Settings settings = Settings.builder().put("xpack.security.operator_privileges.enabled", true).build();
         when(xPackLicenseState.isAllowed(Security.OPERATOR_PRIVILEGES_FEATURE)).thenReturn(true);
         final User operatorUser = new User("operator_user");
@@ -204,7 +204,7 @@ public void testCheckWillPassForInternalUsersBecauseTheyHaveOperatorPrivileges()
         verify(operatorOnlyRegistry, never()).check(anyString(), any());
     }
 
-    public void testMaybeInterceptRequest() throws IllegalAccessException {
+    public void testMaybeInterceptRequest() {
         final boolean licensed = randomBoolean();
         when(xPackLicenseState.isAllowed(Security.OPERATOR_PRIVILEGES_FEATURE)).thenReturn(licensed);
 
@@ -279,11 +279,16 @@ public void testCheckRest() {
         );
         assertThat(ex, instanceOf(ElasticsearchSecurityException.class));
         assertThat(ex, throwableWithMessage("violation!"));
+        verify(restRequest, never()).markAsOperatorRequest();
         Mockito.clearInvocations(operatorOnlyRegistry);
+        Mockito.clearInvocations(restRequest);
 
         // is an operator
         threadContext.putHeader(AuthenticationField.PRIVILEGE_CATEGORY_KEY, AuthenticationField.PRIVILEGE_CATEGORY_VALUE_OPERATOR);
         verifyNoInteractions(operatorOnlyRegistry);
         assertTrue(operatorPrivilegesService.checkRest(restHandler, restRequest, restChannel, threadContext));
+        verify(restRequest, times(1)).markAsOperatorRequest();
+        Mockito.clearInvocations(operatorOnlyRegistry);
+        Mockito.clearInvocations(restRequest);
     }
 }
diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/RestRequestFilterTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/RestRequestFilterTests.java
index 8a8bb19fe179..37a70dccaa40 100644
--- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/RestRequestFilterTests.java
+++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/RestRequestFilterTests.java
@@ -115,7 +115,7 @@ public void testFilterUnknownContentTypeThrows() throws IOException {
         }
         RestRequestFilter filter = () -> Collections.singleton("root.second.third");
         RestRequest filtered = filter.getFilteredRequest(restRequest);
-        IllegalStateException e = expectThrows(IllegalStateException.class, () -> filtered.content());
+        Exception e = expectThrows(IllegalArgumentException.class, () -> filtered.content());
         assertThat(e.getMessage(), containsString("unknown content type"));
     }
 
diff --git a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownDelayedAllocationIT.java b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownDelayedAllocationIT.java
index 7eac3d9c7fd9..8809a799fece 100644
--- a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownDelayedAllocationIT.java
+++ b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownDelayedAllocationIT.java
@@ -64,7 +64,9 @@ public void testShardAllocationIsDelayedForRestartingNode() throws Exception {
         internalCluster().restartNode(nodeToRestartName, new InternalTestCluster.RestartCallback() {
             @Override
             public Settings onNodeStopped(String nodeName) throws Exception {
-                assertBusy(() -> assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(1)));
+                assertBusy(
+                    () -> assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(1))
+                );
                 return super.onNodeStopped(nodeName);
             }
         });
@@ -135,7 +137,9 @@ public void testIndexLevelAllocationDelayWillBeUsedIfLongerThanShutdownDelay() t
         internalCluster().restartNode(nodeToRestartName, new InternalTestCluster.RestartCallback() {
             @Override
             public Settings onNodeStopped(String nodeName) throws Exception {
-                assertBusy(() -> { assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(1)); });
+                assertBusy(
+                    () -> { assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(1)); }
+                );
                 return super.onNodeStopped(nodeName);
             }
         });
@@ -218,7 +222,9 @@ private String setupLongTimeoutTestCase() throws Exception {
         internalCluster().stopNode(nodeToRestartName);
 
         // Verify that the shard's allocation is delayed
-        assertBusy(() -> { assertThat(clusterAdmin().prepareHealth().get().getDelayedUnassignedShards(), equalTo(1)); });
+        assertBusy(
+            () -> { assertThat(clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getDelayedUnassignedShards(), equalTo(1)); }
+        );
 
         return nodeToRestartId;
     }
@@ -233,13 +239,13 @@ private void indexRandomData() throws Exception {
     }
 
     private String findIdOfNodeWithShard() {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<ShardRouting> startedShards = RoutingNodesHelper.shardsWithState(state.getRoutingNodes(), ShardRoutingState.STARTED);
         return randomFrom(startedShards).currentNodeId();
     }
 
     private String findNodeNameFromId(String id) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         return state.nodes().get(id).getName();
     }
 }
diff --git a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java
index 1594f78e0414..d12d093dd5b8 100644
--- a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java
+++ b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java
@@ -426,7 +426,7 @@ private void indexRandomData(String index) throws Exception {
     }
 
     private String findIdOfNodeWithPrimaryShard(String indexName) {
-        ClusterState state = clusterAdmin().prepareState().get().getState();
+        ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         List<ShardRouting> startedShards = RoutingNodesHelper.shardsWithState(state.getRoutingNodes(), ShardRoutingState.STARTED);
         return startedShards.stream()
             .filter(ShardRouting::primary)
@@ -465,7 +465,7 @@ private void assertNodeShutdownStatus(String nodeId, SingleNodeShutdownMetadata.
     }
 
     private void assertIndexPrimaryShardsAreAllocatedOnNode(String indexName, String nodeId) {
-        var state = clusterAdmin().prepareState().clear().setRoutingTable(true).get().getState();
+        var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setRoutingTable(true).get().getState();
         var indexRoutingTable = state.routingTable().index(indexName);
         for (int p = 0; p < indexRoutingTable.size(); p++) {
             var primaryShard = indexRoutingTable.shard(p).primaryShard();
@@ -485,7 +485,7 @@ private void assertIndexPrimaryShardsAreAllocatedOnNode(String indexName, String
     }
 
     private void assertIndexReplicaShardsAreNotAllocated(String indexName) {
-        var state = clusterAdmin().prepareState().clear().setRoutingTable(true).get().getState();
+        var state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).clear().setRoutingTable(true).get().getState();
         var indexRoutingTable = state.routingTable().index(indexName);
         for (int p = 0; p < indexRoutingTable.size(); p++) {
             for (ShardRouting replicaShard : indexRoutingTable.shard(p).replicaShards()) {
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/DeleteShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/DeleteShutdownNodeAction.java
index 6f9621b4bdb2..d9d7a5ddd3da 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/DeleteShutdownNodeAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/DeleteShutdownNodeAction.java
@@ -15,12 +15,9 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 
 import java.io.IOException;
 
-import static org.elasticsearch.xpack.shutdown.ShutdownPlugin.serializesWithParentTaskAndTimeouts;
-
 public class DeleteShutdownNodeAction extends ActionType<AcknowledgedResponse> {
 
     public static final DeleteShutdownNodeAction INSTANCE = new DeleteShutdownNodeAction();
@@ -39,32 +36,14 @@ public Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, String nodeId)
             this.nodeId = nodeId;
         }
 
-        @UpdateForV9 // inline when bwc no longer needed
-        public static Request readFrom(StreamInput in) throws IOException {
-            if (serializesWithParentTaskAndTimeouts(in.getTransportVersion())) {
-                return new Request(in);
-            } else {
-                return new Request(TimeValue.THIRTY_SECONDS, TimeValue.THIRTY_SECONDS, in);
-            }
-        }
-
-        private Request(StreamInput in) throws IOException {
+        public Request(StreamInput in) throws IOException {
             super(in);
-            assert serializesWithParentTaskAndTimeouts(in.getTransportVersion());
             this.nodeId = in.readString();
         }
 
-        @UpdateForV9 // remove when bwc no longer needed
-        private Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, StreamInput in) throws IOException {
-            this(masterNodeTimeout, ackTimeout, in.readString());
-            assert serializesWithParentTaskAndTimeouts(in.getTransportVersion()) == false;
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (serializesWithParentTaskAndTimeouts(out.getTransportVersion())) {
-                super.writeTo(out);
-            }
+            super.writeTo(out);
             out.writeString(this.nodeId);
         }
 
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusAction.java
index 7e5498a7676b..24d58d0d631d 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusAction.java
@@ -7,7 +7,6 @@
 
 package org.elasticsearch.xpack.shutdown;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
@@ -19,7 +18,6 @@
 import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
 import org.elasticsearch.common.xcontent.ChunkedToXContentObject;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.tasks.CancellableTask;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.tasks.TaskId;
@@ -50,33 +48,14 @@ public Request(TimeValue masterNodeTimeout, String... nodeIds) {
             this.nodeIds = nodeIds;
         }
 
-        @UpdateForV9 // only needed for bwc, inline in v9
-        public static Request readFrom(StreamInput in) throws IOException {
-            if (in.getTransportVersion().onOrAfter(TransportVersions.GET_SHUTDOWN_STATUS_TIMEOUT)) {
-                return new Request(in);
-            } else {
-                return new Request(TimeValue.THIRTY_SECONDS, in);
-            }
-        }
-
-        private Request(StreamInput in) throws IOException {
+        public Request(StreamInput in) throws IOException {
             super(in);
-            assert in.getTransportVersion().onOrAfter(TransportVersions.GET_SHUTDOWN_STATUS_TIMEOUT);
-            nodeIds = in.readStringArray();
-        }
-
-        @UpdateForV9 // only needed for bwc, remove in v9
-        private Request(TimeValue masterNodeTimeout, StreamInput in) throws IOException {
-            super(masterNodeTimeout);
-            assert in.getTransportVersion().before(TransportVersions.GET_SHUTDOWN_STATUS_TIMEOUT);
             nodeIds = in.readStringArray();
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (out.getTransportVersion().onOrAfter(TransportVersions.GET_SHUTDOWN_STATUS_TIMEOUT)) {
-                super.writeTo(out);
-            }
+            super.writeTo(out);
             out.writeStringArray(this.nodeIds);
         }
 
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/PutShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/PutShutdownNodeAction.java
index bb489f337d02..88be34d215ed 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/PutShutdownNodeAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/PutShutdownNodeAction.java
@@ -17,17 +17,13 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.xcontent.ConstructingObjectParser;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.XContentParser;
 
 import java.io.IOException;
 
-import static org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata.GRACE_PERIOD_ADDED_VERSION;
-import static org.elasticsearch.cluster.metadata.SingleNodeShutdownMetadata.REPLACE_SHUTDOWN_TYPE_ADDED_VERSION;
 import static org.elasticsearch.core.Strings.format;
-import static org.elasticsearch.xpack.shutdown.ShutdownPlugin.serializesWithParentTaskAndTimeouts;
 
 public class PutShutdownNodeAction extends ActionType<AcknowledgedResponse> {
 
@@ -112,18 +108,8 @@ public Request(
             this.gracePeriod = gracePeriod;
         }
 
-        @UpdateForV9 // inline when bwc no longer needed
-        public static Request readFrom(StreamInput in) throws IOException {
-            if (serializesWithParentTaskAndTimeouts(in.getTransportVersion())) {
-                return new Request(in);
-            } else {
-                return new Request(TimeValue.THIRTY_SECONDS, TimeValue.THIRTY_SECONDS, in);
-            }
-        }
-
-        private Request(StreamInput in) throws IOException {
+        public Request(StreamInput in) throws IOException {
             super(in);
-            assert serializesWithParentTaskAndTimeouts(in.getTransportVersion());
             this.nodeId = in.readString();
             this.type = in.readEnum(SingleNodeShutdownMetadata.Type.class);
             this.reason = in.readString();
@@ -132,46 +118,15 @@ private Request(StreamInput in) throws IOException {
             this.gracePeriod = in.readOptionalTimeValue();
         }
 
-        @UpdateForV9 // remove when bwc no longer needed
-        private Request(TimeValue masterNodeTimeout, TimeValue ackTimeout, StreamInput in) throws IOException {
-            super(masterNodeTimeout, ackTimeout);
-            assert serializesWithParentTaskAndTimeouts(in.getTransportVersion()) == false;
-            this.nodeId = in.readString();
-            this.type = in.readEnum(SingleNodeShutdownMetadata.Type.class);
-            this.reason = in.readString();
-            this.allocationDelay = in.readOptionalTimeValue();
-            if (in.getTransportVersion().onOrAfter(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION)) {
-                this.targetNodeName = in.readOptionalString();
-            } else {
-                this.targetNodeName = null;
-            }
-            if (in.getTransportVersion().onOrAfter(GRACE_PERIOD_ADDED_VERSION)) {
-                this.gracePeriod = in.readOptionalTimeValue();
-            } else {
-                this.gracePeriod = null;
-            }
-        }
-
         @Override
         public void writeTo(StreamOutput out) throws IOException {
-            if (serializesWithParentTaskAndTimeouts(out.getTransportVersion())) {
-                super.writeTo(out);
-            }
+            super.writeTo(out);
             out.writeString(nodeId);
-            if (out.getTransportVersion().before(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION)
-                && this.type == SingleNodeShutdownMetadata.Type.REPLACE) {
-                out.writeEnum(SingleNodeShutdownMetadata.Type.REMOVE);
-            } else {
-                out.writeEnum(type);
-            }
+            out.writeEnum(type);
             out.writeString(reason);
             out.writeOptionalTimeValue(allocationDelay);
-            if (out.getTransportVersion().onOrAfter(REPLACE_SHUTDOWN_TYPE_ADDED_VERSION)) {
-                out.writeOptionalString(targetNodeName);
-            }
-            if (out.getTransportVersion().onOrAfter(GRACE_PERIOD_ADDED_VERSION)) {
-                out.writeOptionalTimeValue(gracePeriod);
-            }
+            out.writeOptionalString(targetNodeName);
+            out.writeOptionalTimeValue(gracePeriod);
         }
 
         public String getNodeId() {
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/ShutdownPlugin.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/ShutdownPlugin.java
index 621836cea9f8..25c6f431e57c 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/ShutdownPlugin.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/ShutdownPlugin.java
@@ -6,8 +6,6 @@
  */
 package org.elasticsearch.xpack.shutdown;
 
-import org.elasticsearch.TransportVersion;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
@@ -18,7 +16,6 @@
 import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
@@ -72,11 +69,4 @@ public List<RestHandler> getRestHandlers(
     ) {
         return Arrays.asList(new RestPutShutdownNodeAction(), new RestDeleteShutdownNodeAction(), new RestGetShutdownStatusAction());
     }
-
-    @UpdateForV9 // always true in v9 so can be removed
-    static boolean serializesWithParentTaskAndTimeouts(TransportVersion transportVersion) {
-        return transportVersion.isPatchFrom(TransportVersions.V_8_13_4)
-            || transportVersion.isPatchFrom(TransportVersions.V_8_14_0)
-            || transportVersion.onOrAfter(TransportVersions.SHUTDOWN_REQUEST_TIMEOUTS_FIX);
-    }
 }
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java
index d66f2cbddd18..50742c1c573f 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportDeleteShutdownNodeAction.java
@@ -120,7 +120,7 @@ public TransportDeleteShutdownNodeAction(
             clusterService,
             threadPool,
             actionFilters,
-            Request::readFrom,
+            Request::new,
             indexNameExpressionResolver,
             EsExecutors.DIRECT_EXECUTOR_SERVICE
         );
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java
index 33a285128e08..4f2a738873ff 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportGetShutdownStatusAction.java
@@ -88,7 +88,7 @@ public TransportGetShutdownStatusAction(
             clusterService,
             threadPool,
             actionFilters,
-            GetShutdownStatusAction.Request::readFrom,
+            GetShutdownStatusAction.Request::new,
             indexNameExpressionResolver,
             GetShutdownStatusAction.Response::new,
             threadPool.executor(ThreadPool.Names.MANAGEMENT)
diff --git a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java
index 4e1b8c3cf3b9..4c163bc1a936 100644
--- a/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java
+++ b/x-pack/plugin/shutdown/src/main/java/org/elasticsearch/xpack/shutdown/TransportPutShutdownNodeAction.java
@@ -156,7 +156,7 @@ public TransportPutShutdownNodeAction(
             clusterService,
             threadPool,
             actionFilters,
-            Request::readFrom,
+            Request::new,
             indexNameExpressionResolver,
             EsExecutors.DIRECT_EXECUTOR_SERVICE
         );
diff --git a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/DeleteShutdownRequestTests.java b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/DeleteShutdownRequestTests.java
index 573b4077c263..cb2b8b5a706c 100644
--- a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/DeleteShutdownRequestTests.java
+++ b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/DeleteShutdownRequestTests.java
@@ -33,7 +33,7 @@ public void writeTo(StreamOutput out) throws IOException {
     @Override
     protected Writeable.Reader<RequestWrapper> instanceReader() {
         return in -> {
-            final var request = DeleteShutdownNodeAction.Request.readFrom(in);
+            final var request = new DeleteShutdownNodeAction.Request(in);
             return new RequestWrapper(request.getNodeId(), request.getParentTask(), request.masterNodeTimeout(), request.ackTimeout());
         };
     }
diff --git a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusRequestTests.java b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusRequestTests.java
index 166bec9ec5f6..db7a132a68f4 100644
--- a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusRequestTests.java
+++ b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/GetShutdownStatusRequestTests.java
@@ -19,7 +19,7 @@ public class GetShutdownStatusRequestTests extends AbstractWireSerializingTestCa
 
     @Override
     protected Writeable.Reader<GetShutdownStatusAction.Request> instanceReader() {
-        return GetShutdownStatusAction.Request::readFrom;
+        return GetShutdownStatusAction.Request::new;
     }
 
     @Override
diff --git a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/PutShutdownRequestTests.java b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/PutShutdownRequestTests.java
index 806c1ae83295..c4ad0608328c 100644
--- a/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/PutShutdownRequestTests.java
+++ b/x-pack/plugin/shutdown/src/test/java/org/elasticsearch/xpack/shutdown/PutShutdownRequestTests.java
@@ -53,7 +53,7 @@ public void writeTo(StreamOutput out) throws IOException {
     @Override
     protected Writeable.Reader<RequestWrapper> instanceReader() {
         return in -> {
-            final var request = PutShutdownNodeAction.Request.readFrom(in);
+            final var request = new PutShutdownNodeAction.Request(in);
             return new RequestWrapper(
                 request.getNodeId(),
                 request.getType(),
diff --git a/x-pack/plugin/slm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/slm/SnapshotLifecycleRestIT.java b/x-pack/plugin/slm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/slm/SnapshotLifecycleRestIT.java
index d42c8ec9655e..6ee35086baf7 100644
--- a/x-pack/plugin/slm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/slm/SnapshotLifecycleRestIT.java
+++ b/x-pack/plugin/slm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/slm/SnapshotLifecycleRestIT.java
@@ -432,7 +432,7 @@ public void testBasicTimeBasedRetention() throws Exception {
         }, 60, TimeUnit.SECONDS);
 
         // Run retention every second
-        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest();
+        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         req.persistentSettings(Settings.builder().put(LifecycleSettings.SLM_RETENTION_SCHEDULE, "*/1 * * * * ?"));
         try (XContentBuilder builder = jsonBuilder()) {
             req.toXContent(builder, ToXContent.EMPTY_PARAMS);
@@ -474,7 +474,7 @@ public void testBasicTimeBasedRetention() throws Exception {
 
         } finally {
             // Unset retention
-            ClusterUpdateSettingsRequest unsetRequest = new ClusterUpdateSettingsRequest();
+            ClusterUpdateSettingsRequest unsetRequest = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
             unsetRequest.persistentSettings(Settings.builder().put(LifecycleSettings.SLM_RETENTION_SCHEDULE, (String) null));
             try (XContentBuilder builder = jsonBuilder()) {
                 unsetRequest.toXContent(builder, ToXContent.EMPTY_PARAMS);
@@ -895,7 +895,7 @@ private void createSnapshotPolicy(
     }
 
     private void disableSLMMinimumIntervalValidation() throws IOException {
-        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest();
+        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT);
         req.persistentSettings(Settings.builder().put(LifecycleSettings.SLM_MINIMUM_INTERVAL, "0s"));
         try (XContentBuilder builder = jsonBuilder()) {
             req.toXContent(builder, ToXContent.EMPTY_PARAMS);
diff --git a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java
index d93f40f7c0a8..30dcd339b43b 100644
--- a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java
+++ b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMFileSettingsIT.java
@@ -150,7 +150,10 @@ protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
     }
 
     private void assertMasterNode(Client client, String node) {
-        assertThat(client.admin().cluster().prepareState().get().getState().nodes().getMasterNode().getName(), equalTo(node));
+        assertThat(
+            client.admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNode().getName(),
+            equalTo(node)
+        );
     }
 
     private void writeJSONFile(String node, String json) throws Exception {
@@ -192,7 +195,7 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).get();
 
         var reservedState = clusterStateResponse.getState().metadata().reservedStateMetadata().get(FileSettingsService.NAMESPACE);
@@ -205,7 +208,7 @@ private void assertClusterStateSaveOK(CountDownLatch savedClusterState, AtomicLo
             equalTo("50mb")
         );
 
-        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest().persistentSettings(
+        ClusterUpdateSettingsRequest req = new ClusterUpdateSettingsRequest(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT).persistentSettings(
             Settings.builder().put(INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey(), "1234kb")
         );
         assertEquals(
@@ -306,7 +309,7 @@ private void assertClusterStateNotSaved(CountDownLatch savedClusterState, Atomic
         assertTrue(awaitSuccessful);
 
         final ClusterStateResponse clusterStateResponse = clusterAdmin().state(
-            new ClusterStateRequest().waitForMetadataVersion(metadataVersion.get())
+            new ClusterStateRequest(TEST_REQUEST_TIMEOUT).waitForMetadataVersion(metadataVersion.get())
         ).actionGet();
 
         assertThat(clusterStateResponse.getState().metadata().persistentSettings().get("search.allow_expensive_queries"), nullValue());
diff --git a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java
index 1d797095c1f6..d42d45e43062 100644
--- a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java
+++ b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java
@@ -355,7 +355,7 @@ private void testUnsuccessfulSnapshotRetention(boolean partialSuccess) throws Ex
                 logger.info("-->  stopping random data node, which should cause shards to go missing");
                 internalCluster().stopRandomDataNode();
                 assertBusy(
-                    () -> assertEquals(ClusterHealthStatus.RED, clusterAdmin().prepareHealth().get().getStatus()),
+                    () -> assertEquals(ClusterHealthStatus.RED, clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).get().getStatus()),
                     30,
                     TimeUnit.SECONDS
                 );
diff --git a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMStatDisruptionIT.java b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMStatDisruptionIT.java
index d8b1f36c25e5..14e40a9fe0e5 100644
--- a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMStatDisruptionIT.java
+++ b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMStatDisruptionIT.java
@@ -578,13 +578,19 @@ private void assertMetadata(String policyName, long taken, long failure, long in
     }
 
     private SnapshotLifecycleMetadata getSnapshotLifecycleMetadata() {
-        final ClusterStateResponse clusterStateResponse = client().admin().cluster().state(new ClusterStateRequest()).actionGet();
+        final ClusterStateResponse clusterStateResponse = client().admin()
+            .cluster()
+            .state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT))
+            .actionGet();
         ClusterState state = clusterStateResponse.getState();
         return state.metadata().custom(SnapshotLifecycleMetadata.TYPE);
     }
 
     private RegisteredPolicySnapshots getRegisteredSnapshots() {
-        final ClusterStateResponse clusterStateResponse = client().admin().cluster().state(new ClusterStateRequest()).actionGet();
+        final ClusterStateResponse clusterStateResponse = client().admin()
+            .cluster()
+            .state(new ClusterStateRequest(TEST_REQUEST_TIMEOUT))
+            .actionGet();
         ClusterState state = clusterStateResponse.getState();
         return state.metadata().custom(RegisteredPolicySnapshots.TYPE, RegisteredPolicySnapshots.EMPTY);
     }
diff --git a/x-pack/plugin/snapshot-based-recoveries/src/internalClusterTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java b/x-pack/plugin/snapshot-based-recoveries/src/internalClusterTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java
index d2e5896a4cf7..d1eaff1bef1b 100644
--- a/x-pack/plugin/snapshot-based-recoveries/src/internalClusterTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java
+++ b/x-pack/plugin/snapshot-based-recoveries/src/internalClusterTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java
@@ -566,7 +566,7 @@ public void testRecoveryIsCancelledAfterDeletingTheIndex() throws Exception {
 
             final String targetNode;
             if (seqNoRecovery) {
-                ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+                ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
                 IndexShardRoutingTable shardRoutingTable = clusterState.routingTable().index(indexName).shard(0);
                 String primaryNodeName = clusterState.nodes().resolveNode(shardRoutingTable.primaryShard().currentNodeId()).getName();
                 String replicaNodeName = clusterState.nodes()
@@ -597,7 +597,7 @@ public void testRecoveryIsCancelledAfterDeletingTheIndex() throws Exception {
                 );
 
             if (seqNoRecovery) {
-                ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+                ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
                 IndexShardRoutingTable shardRoutingTable = clusterState.routingTable().index(indexName).shard(0);
                 String primaryNodeName = clusterState.nodes().resolveNode(shardRoutingTable.primaryShard().currentNodeId()).getName();
 
@@ -996,7 +996,7 @@ public void testSeqNoBasedRecoveryIsUsedAfterPrimaryFailOver() throws Exception
         createRepo(repoName, repoType);
         createSnapshot(repoName, "snap", Collections.singletonList(indexName));
 
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         String primaryNodeId = clusterState.routingTable().index(indexName).shard(0).primaryShard().currentNodeId();
         String primaryNodeName = clusterState.nodes().resolveNode(primaryNodeId).getName();
 
@@ -1006,7 +1006,7 @@ public void testSeqNoBasedRecoveryIsUsedAfterPrimaryFailOver() throws Exception
 
         ensureGreen(indexName);
 
-        ClusterState clusterStateAfterPrimaryFailOver = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterStateAfterPrimaryFailOver = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         IndexShardRoutingTable shardRoutingTableAfterFailOver = clusterStateAfterPrimaryFailOver.routingTable().index(indexName).shard(0);
 
         String primaryNodeIdAfterFailOver = shardRoutingTableAfterFailOver.primaryShard().currentNodeId();
@@ -1316,7 +1316,7 @@ public void testNodeDisconnectsDoNotOverAccountRecoveredBytes() throws Exception
         createRepo(repoName, TestRepositoryPlugin.FILTER_TYPE);
         createSnapshot(repoName, "snap", Collections.singletonList(indexName));
 
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         String primaryNodeId = clusterState.routingTable().index(indexName).shard(0).primaryShard().currentNodeId();
         String primaryNodeName = clusterState.nodes().resolveNode(primaryNodeId).getName();
         String replicaNodeId = clusterState.routingTable().index(indexName).shard(0).replicaShards().get(0).currentNodeId();
@@ -1527,7 +1527,7 @@ private void assertPeerRecoveryDidNotUseSnapshots(String indexName, String sourc
     }
 
     private Store.MetadataSnapshot getMetadataSnapshot(String nodeName, String indexName) throws IOException {
-        ClusterState clusterState = clusterAdmin().prepareState().get().getState();
+        ClusterState clusterState = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
         IndicesService indicesService = internalCluster().getInstance(IndicesService.class, nodeName);
         IndexService indexService = indicesService.indexService(clusterState.metadata().index(indexName).getIndex());
         IndexShard shard = indexService.getShard(0);
@@ -1561,7 +1561,7 @@ private void indexDocs(String indexName, int docIdOffset, int docCount) throws E
 
         // Ensure that the safe commit == latest commit
         assertBusy(() -> {
-            ClusterState clusterState = client().admin().cluster().prepareState().get().getState();
+            ClusterState clusterState = client().admin().cluster().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             var indexShardRoutingTable = clusterState.routingTable().index(indexName).shard(0);
             assertThat(indexShardRoutingTable, is(notNullValue()));
 
diff --git a/x-pack/plugin/snapshot-based-recoveries/src/test/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerServiceTests.java b/x-pack/plugin/snapshot-based-recoveries/src/test/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerServiceTests.java
index 851d5f8f02b2..449edd8f40ee 100644
--- a/x-pack/plugin/snapshot-based-recoveries/src/test/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerServiceTests.java
+++ b/x-pack/plugin/snapshot-based-recoveries/src/test/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/plan/SnapshotsRecoveryPlannerServiceTests.java
@@ -26,6 +26,7 @@
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.core.CheckedConsumer;
 import org.elasticsearch.core.IOUtils;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -202,6 +203,8 @@ public void fetchLatestSnapshotsForShard(ShardId shardId, ActionListener<Optiona
         });
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this is testing pre-7.0 upgrade behavior so probably needs some updating")
     public void testLogicallyEquivalentSnapshotIsUsedEvenIfFilesAreDifferent() throws Exception {
         createStore(store -> {
             boolean shareFilesWithSource = randomBoolean();
@@ -387,6 +390,8 @@ public void fetchLatestSnapshotsForShard(ShardId shardId, ActionListener<Optiona
         });
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this is testing v7.14 compat functionality so can probably be removed")
     public void testFallbacksToSourceOnlyPlanIfTargetNodeIsInUnsupportedVersion() throws Exception {
         createStore(store -> {
             Store.MetadataSnapshot targetMetadataSnapshot = generateRandomTargetState(store);
diff --git a/x-pack/plugin/snapshot-repo-test-kit/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/20_verify_integrity.yml b/x-pack/plugin/snapshot-repo-test-kit/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/20_verify_integrity.yml
new file mode 100644
index 000000000000..be6929a15ff4
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/20_verify_integrity.yml
@@ -0,0 +1,39 @@
+---
+setup:
+  - requires:
+      cluster_features: "snapshot.repository_verify_integrity"
+      reason: "required feature"
+
+  - do:
+      snapshot.create_repository:
+        repository: test_repo
+        body:
+          type: fs
+          settings:
+            location: "test_repo_loc"
+
+  - do:
+      bulk:
+        index: test
+        refresh: true
+        body:
+          - '{"index":{}}'
+          - '{}'
+
+  - do:
+      snapshot.create:
+        repository: test_repo
+        snapshot: snap
+        wait_for_completion: true
+
+---
+"Integrity verification":
+  - do:
+      snapshot.repository_verify_integrity:
+        repository: test_repo
+
+  - match: {results.result: pass}
+  - match: {results.status.snapshots.total: 1}
+  - match: {results.status.snapshots.verified: 1}
+  - match: {results.status.indices.total: 1}
+  - match: {results.status.indices.verified: 1}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityIT.java b/x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityIT.java
new file mode 100644
index 000000000000..5725b065aeb0
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityIT.java
@@ -0,0 +1,813 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.Version;
+import org.elasticsearch.action.support.ActionTestUtils;
+import org.elasticsearch.action.support.ActiveShardCount;
+import org.elasticsearch.action.support.SubscribableListener;
+import org.elasticsearch.client.Request;
+import org.elasticsearch.client.Response;
+import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.unit.ByteSizeValue;
+import org.elasticsearch.common.util.CollectionUtils;
+import org.elasticsearch.common.util.concurrent.EsExecutors;
+import org.elasticsearch.core.IOUtils;
+import org.elasticsearch.index.IndexVersion;
+import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot;
+import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshots;
+import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshotsIntegritySuppressor;
+import org.elasticsearch.index.snapshots.blobstore.SnapshotFiles;
+import org.elasticsearch.index.store.StoreFileMetadata;
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.repositories.RepositoriesService;
+import org.elasticsearch.repositories.RepositoryData;
+import org.elasticsearch.repositories.ShardGenerations;
+import org.elasticsearch.repositories.blobstore.BlobStoreCorruptionUtils;
+import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
+import org.elasticsearch.repositories.blobstore.RepositoryFileType;
+import org.elasticsearch.repositories.blobstore.testkit.SnapshotRepositoryTestKit;
+import org.elasticsearch.repositories.fs.FsRepository;
+import org.elasticsearch.snapshots.AbstractSnapshotIntegTestCase;
+import org.elasticsearch.snapshots.SnapshotId;
+import org.elasticsearch.snapshots.SnapshotInfo;
+import org.elasticsearch.snapshots.SnapshotState;
+import org.elasticsearch.tasks.Task;
+import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.rest.ObjectPath;
+import org.elasticsearch.test.transport.MockTransportService;
+import org.elasticsearch.test.transport.StubbableTransport;
+import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.TransportChannel;
+import org.elasticsearch.transport.TransportRequest;
+import org.elasticsearch.transport.TransportRequestHandler;
+import org.elasticsearch.transport.TransportResponse;
+import org.elasticsearch.xcontent.XContentFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import java.util.stream.StreamSupport;
+
+import static org.elasticsearch.cluster.metadata.IndexMetadata.INDEX_ROUTING_INCLUDE_GROUP_SETTING;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.INDEX_SHARD_SNAPSHOTS_FORMAT;
+import static org.elasticsearch.repositories.blobstore.BlobStoreRepository.SNAPSHOT_FORMAT;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+
+public class RepositoryVerifyIntegrityIT extends AbstractSnapshotIntegTestCase {
+
+    @Override
+    protected boolean addMockHttpTransport() {
+        return false; // enable HTTP
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected Collection<Class<? extends Plugin>> nodePlugins() {
+        return CollectionUtils.appendToCopyNoNullElements(
+            super.nodePlugins(),
+            SnapshotRepositoryTestKit.class,
+            MockTransportService.TestPlugin.class
+        );
+    }
+
+    private static long getCurrentTime(Function<LongStream, OptionalLong> summarizer) {
+        return summarizer.apply(
+            StreamSupport.stream(internalCluster().getInstances(ThreadPool.class).spliterator(), false)
+                .mapToLong(ThreadPool::absoluteTimeInMillis)
+        ).orElseThrow(AssertionError::new);
+    }
+
+    public void testSuccess() throws IOException {
+        final var minStartTimeMillis = getCurrentTime(LongStream::min);
+        final var testContext = createTestContext();
+        final var request = testContext.getVerifyIntegrityRequest();
+        if (randomBoolean()) {
+            request.addParameter("verify_blob_contents", null);
+        }
+        final var response = getRestClient().performRequest(request);
+        final var maxEndTimeMillis = getCurrentTime(LongStream::max);
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        final var responseObjectPath = ObjectPath.createFromResponse(response);
+        final var logEntryCount = responseObjectPath.evaluateArraySize("log");
+        final var seenSnapshotNames = new HashSet<String>();
+        final var seenIndexNames = new HashSet<String>();
+        for (int i = 0; i < logEntryCount; i++) {
+            assertThat(
+                responseObjectPath.evaluate("log." + i + ".timestamp_in_millis"),
+                allOf(greaterThanOrEqualTo(minStartTimeMillis), lessThanOrEqualTo(maxEndTimeMillis))
+            );
+            assertThat(
+                responseObjectPath.evaluate("log." + i + ".timestamp"),
+                request.getParameters().containsKey("human") ? instanceOf(String.class) : nullValue()
+            );
+            final String maybeSnapshotName = responseObjectPath.evaluate("log." + i + ".snapshot.snapshot");
+            if (maybeSnapshotName != null) {
+                assertTrue(seenSnapshotNames.add(maybeSnapshotName));
+            } else {
+                final String indexName = responseObjectPath.evaluate("log." + i + ".index.name");
+                assertNotNull(indexName);
+                assertTrue(seenIndexNames.add(indexName));
+                assertEquals(
+                    testContext.snapshotNames().size(),
+                    (int) responseObjectPath.evaluate("log." + i + ".snapshot_restorability.total_snapshot_count")
+                );
+                assertEquals(
+                    testContext.snapshotNames().size(),
+                    (int) responseObjectPath.evaluate("log." + i + ".snapshot_restorability.restorable_snapshot_count")
+                );
+            }
+        }
+        assertEquals(Set.copyOf(testContext.snapshotNames()), seenSnapshotNames);
+        assertEquals(Set.copyOf(testContext.indexNames()), seenIndexNames);
+
+        assertEquals(0, (int) responseObjectPath.evaluate("results.total_anomalies"));
+        assertEquals("pass", responseObjectPath.evaluate("results.result"));
+    }
+
+    public void testTaskStatus() throws IOException {
+        final var testContext = createTestContext();
+
+        // use non-master node to coordinate the request so that we can capture chunks being sent back
+        final var coordNodeName = getCoordinatingNodeName();
+        final var coordNodeTransportService = MockTransportService.getInstance(coordNodeName);
+        final var masterTaskManager = MockTransportService.getInstance(internalCluster().getMasterName()).getTaskManager();
+
+        final SubscribableListener<RepositoryVerifyIntegrityTask.Status> snapshotsCompleteStatusListener = new SubscribableListener<>();
+        final AtomicInteger chunksSeenCounter = new AtomicInteger();
+
+        coordNodeTransportService.<TransportRepositoryVerifyIntegrityResponseChunkAction.Request>addRequestHandlingBehavior(
+            TransportRepositoryVerifyIntegrityResponseChunkAction.ACTION_NAME,
+            (handler, request, channel, task) -> {
+                final SubscribableListener<Void> unblockChunkHandlingListener = switch (request.chunkContents().type()) {
+                    case START_RESPONSE -> {
+                        final var status = asInstanceOf(
+                            RepositoryVerifyIntegrityTask.Status.class,
+                            randomBoolean()
+                                ? masterTaskManager.getTask(task.getParentTaskId().getId()).getStatus()
+                                : client().admin()
+                                    .cluster()
+                                    .prepareGetTask(task.getParentTaskId())
+                                    .get(SAFE_AWAIT_TIMEOUT)
+                                    .getTask()
+                                    .getTask()
+                                    .status()
+                        );
+                        assertEquals(testContext.repositoryName(), status.repositoryName());
+                        assertEquals(testContext.snapshotNames().size(), status.snapshotCount());
+                        assertEquals(0L, status.snapshotsVerified());
+                        assertEquals(testContext.indexNames().size(), status.indexCount());
+                        assertEquals(0L, status.indicesVerified());
+                        assertEquals(testContext.indexNames().size() * testContext.snapshotNames().size(), status.indexSnapshotCount());
+                        assertEquals(0L, status.indexSnapshotsVerified());
+                        assertEquals(0L, status.blobsVerified());
+                        assertEquals(0L, status.blobBytesVerified());
+                        yield SubscribableListener.newSucceeded(null);
+                    }
+                    case INDEX_RESTORABILITY -> {
+                        // several of these chunks might arrive concurrently; we want to verify the task status before processing any of
+                        // them, so use SubscribableListener to pick out the first status
+                        snapshotsCompleteStatusListener.onResponse(
+                            asInstanceOf(
+                                RepositoryVerifyIntegrityTask.Status.class,
+                                masterTaskManager.getTask(task.getParentTaskId().getId()).getStatus()
+                            )
+                        );
+                        yield snapshotsCompleteStatusListener.andThenAccept(status -> {
+                            assertEquals(testContext.repositoryName(), status.repositoryName());
+                            assertEquals(testContext.snapshotNames().size(), status.snapshotCount());
+                            assertEquals(testContext.snapshotNames().size(), status.snapshotsVerified());
+                            assertEquals(testContext.indexNames().size(), status.indexCount());
+                            assertEquals(0L, status.indicesVerified());
+                        });
+                    }
+                    case SNAPSHOT_INFO -> SubscribableListener.newSucceeded(null);
+                    case ANOMALY -> fail(null, "should not see anomalies");
+                };
+
+                unblockChunkHandlingListener.addListener(ActionTestUtils.assertNoFailureListener(ignored -> {
+                    chunksSeenCounter.incrementAndGet();
+                    handler.messageReceived(request, channel, task);
+                }));
+            }
+        );
+
+        try (var client = createRestClient(coordNodeName)) {
+            final var response = client.performRequest(testContext.getVerifyIntegrityRequest());
+            assertEquals(1 + testContext.indexNames().size() + testContext.snapshotNames().size(), chunksSeenCounter.get());
+            assertEquals(200, response.getStatusLine().getStatusCode());
+            final var responseObjectPath = ObjectPath.createFromResponse(response);
+            assertEquals(0, (int) responseObjectPath.evaluate("results.total_anomalies"));
+            assertEquals("pass", responseObjectPath.evaluate("results.result"));
+        } finally {
+            coordNodeTransportService.clearAllRules();
+        }
+    }
+
+    public void testShardSnapshotFailed() throws IOException {
+        final var testContext = createTestContext();
+
+        final var newIndex = randomIdentifier();
+        assertAcked(
+            client().admin()
+                .indices()
+                .prepareCreate(newIndex)
+                .setWaitForActiveShards(ActiveShardCount.NONE)
+                .setSettings(indexSettings(1, 0).put(INDEX_ROUTING_INCLUDE_GROUP_SETTING.getKey() + "_id", "not-a-node-id"))
+        );
+
+        final var createSnapshotResponse = client().admin()
+            .cluster()
+            .prepareCreateSnapshot(TEST_REQUEST_TIMEOUT, testContext.repositoryName(), randomIdentifier())
+            .setWaitForCompletion(true)
+            .setPartial(true)
+            .get();
+
+        assertEquals(SnapshotState.PARTIAL, createSnapshotResponse.getSnapshotInfo().state());
+
+        final var takeGoodSnapshot = randomBoolean();
+        if (takeGoodSnapshot) {
+            updateIndexSettings(Settings.builder().putNull(INDEX_ROUTING_INCLUDE_GROUP_SETTING.getKey() + "_id"), newIndex);
+            ensureGreen(newIndex);
+            createSnapshot(testContext.repositoryName(), randomIdentifier(), List.of(newIndex));
+        }
+
+        final Response response;
+        try (var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor()) {
+            response = getRestClient().performRequest(testContext.getVerifyIntegrityRequest());
+        } finally {
+            assertAcked(
+                client().admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+            );
+        }
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        final var responseObjectPath = ObjectPath.createFromResponse(response);
+        assertThat(getAnomalies(responseObjectPath), equalTo(Set.of()));
+        assertEquals(0, (int) responseObjectPath.evaluate("results.total_anomalies"));
+        assertEquals("pass", responseObjectPath.evaluate("results.result"));
+
+        final var logEntryCount = responseObjectPath.evaluateArraySize("log");
+        for (int i = 0; i < logEntryCount; i++) {
+            if (newIndex.equals(responseObjectPath.evaluate("log." + i + ".index.name"))) {
+                assertEquals(
+                    takeGoodSnapshot ? 2 : 1,
+                    (int) responseObjectPath.evaluate("log." + i + ".snapshot_restorability.total_snapshot_count")
+                );
+                assertEquals(
+                    takeGoodSnapshot ? 1 : 0,
+                    (int) responseObjectPath.evaluate("log." + i + ".snapshot_restorability.restorable_snapshot_count")
+                );
+            }
+        }
+    }
+
+    public void testCorruption() throws IOException {
+        final var testContext = createTestContext();
+
+        final Response response;
+        final Path corruptedFile;
+        final RepositoryFileType corruptedFileType;
+        try (var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor()) {
+            corruptedFile = BlobStoreCorruptionUtils.corruptRandomFile(testContext.repositoryRootPath());
+            corruptedFileType = RepositoryFileType.getRepositoryFileType(testContext.repositoryRootPath(), corruptedFile);
+            logger.info("--> corrupted file: {}", corruptedFile);
+            logger.info("--> corrupted file type: {}", corruptedFileType);
+
+            final var request = testContext.getVerifyIntegrityRequest();
+            if (corruptedFileType == RepositoryFileType.SHARD_DATA || randomBoolean()) {
+                request.addParameter("verify_blob_contents", null);
+            }
+            response = getRestClient().performRequest(request);
+        } finally {
+            assertAcked(
+                client().admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+            );
+        }
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        final var responseObjectPath = ObjectPath.createFromResponse(response);
+        final var logEntryCount = responseObjectPath.evaluateArraySize("log");
+        final var anomalies = new HashSet<String>();
+        final var seenIndexNames = new HashSet<String>();
+        int fullyRestorableIndices = 0;
+        for (int i = 0; i < logEntryCount; i++) {
+            final String maybeAnomaly = responseObjectPath.evaluate("log." + i + ".anomaly");
+            if (maybeAnomaly != null) {
+                anomalies.add(maybeAnomaly);
+            } else {
+                final String indexName = responseObjectPath.evaluate("log." + i + ".index.name");
+                if (indexName != null) {
+                    assertTrue(seenIndexNames.add(indexName));
+                    assertThat(testContext.indexNames(), hasItem(indexName));
+                    final int totalSnapshots = responseObjectPath.evaluate("log." + i + ".snapshot_restorability.total_snapshot_count");
+                    final int restorableSnapshots = responseObjectPath.evaluate(
+                        "log." + i + ".snapshot_restorability.restorable_snapshot_count"
+                    );
+                    if (totalSnapshots == restorableSnapshots) {
+                        fullyRestorableIndices += 1;
+                    }
+                }
+            }
+        }
+
+        assertThat(
+            fullyRestorableIndices,
+            corruptedFileType == RepositoryFileType.SHARD_GENERATION || corruptedFileType.equals(RepositoryFileType.GLOBAL_METADATA)
+                ? equalTo(testContext.indexNames().size())
+                : lessThan(testContext.indexNames().size())
+        );
+        // Missing shard generation file is automatically repaired based on the shard snapshot files.
+        // See also BlobStoreRepository#buildBlobStoreIndexShardSnapshots
+        final boolean deletedShardGen = corruptedFileType == RepositoryFileType.SHARD_GENERATION && Files.exists(corruptedFile) == false;
+        assertThat(anomalies, deletedShardGen ? empty() : not(empty()));
+        assertThat(responseObjectPath.evaluate("results.total_anomalies"), greaterThanOrEqualTo(anomalies.size()));
+        assertEquals(deletedShardGen ? "pass" : "fail", responseObjectPath.evaluate("results.result"));
+
+        // remove permitted/expected anomalies to verify that no unexpected ones were seen
+        switch (corruptedFileType) {
+            case SNAPSHOT_INFO -> anomalies.remove("failed to load snapshot info");
+            case GLOBAL_METADATA -> anomalies.remove("failed to load global metadata");
+            case INDEX_METADATA -> anomalies.remove("failed to load index metadata");
+            case SHARD_GENERATION -> {
+                if (deletedShardGen == false) {
+                    anomalies.remove("failed to load shard generation");
+                }
+            }
+            case SHARD_SNAPSHOT_INFO -> anomalies.remove("failed to load shard snapshot");
+            case SHARD_DATA -> {
+                anomalies.remove("missing blob");
+                anomalies.remove("mismatched blob length");
+                anomalies.remove("corrupt data blob");
+            }
+        }
+        assertThat(anomalies, empty());
+    }
+
+    public void testTransportException() throws IOException {
+        final var testContext = createTestContext();
+
+        // use non-master node to coordinate the request so that we can capture chunks being sent back
+        final var coordNodeName = getCoordinatingNodeName();
+        final var coordNodeTransportService = MockTransportService.getInstance(coordNodeName);
+        final var masterTransportService = MockTransportService.getInstance(internalCluster().getMasterName());
+
+        final var messageCount = 2 // request & response
+            * (1 // forward to master
+                + 1 // start response
+                + testContext.indexNames().size() + testContext.snapshotNames().size());
+        final var failureStep = between(1, messageCount);
+
+        final var failTransportMessageBehaviour = new StubbableTransport.RequestHandlingBehavior<>() {
+            final AtomicInteger currentStep = new AtomicInteger();
+
+            @Override
+            public void messageReceived(
+                TransportRequestHandler<TransportRequest> handler,
+                TransportRequest request,
+                TransportChannel channel,
+                Task task
+            ) throws Exception {
+                if (currentStep.incrementAndGet() == failureStep) {
+                    throw new ElasticsearchException("simulated");
+                } else {
+                    handler.messageReceived(request, new TransportChannel() {
+                        @Override
+                        public String getProfileName() {
+                            return "test";
+                        }
+
+                        @Override
+                        public void sendResponse(TransportResponse response) {
+                            if (currentStep.incrementAndGet() == failureStep) {
+                                channel.sendResponse(new ElasticsearchException("simulated"));
+                            } else {
+                                channel.sendResponse(response);
+                            }
+                        }
+
+                        @Override
+                        public void sendResponse(Exception exception) {
+                            if (currentStep.incrementAndGet() == failureStep) {
+                                throw new AssertionError("shouldn't have failed yet");
+                            } else {
+                                channel.sendResponse(exception);
+                            }
+                        }
+                    }, task);
+                }
+            }
+        };
+
+        masterTransportService.addRequestHandlingBehavior(
+            TransportRepositoryVerifyIntegrityAction.ACTION_NAME,
+            failTransportMessageBehaviour
+        );
+
+        coordNodeTransportService.addRequestHandlingBehavior(
+            TransportRepositoryVerifyIntegrityResponseChunkAction.ACTION_NAME,
+            failTransportMessageBehaviour
+        );
+
+        final var request = testContext.getVerifyIntegrityRequest();
+        if (failureStep <= 2) {
+            request.addParameter("ignore", "500");
+        }
+        final Response response;
+        try (var restClient = createRestClient(coordNodeName)) {
+            response = restClient.performRequest(request);
+        }
+        final var responseObjectPath = ObjectPath.createFromResponse(response);
+        if (failureStep <= 2) {
+            assertEquals(500, response.getStatusLine().getStatusCode());
+            assertNotNull(responseObjectPath.evaluate("error"));
+            assertEquals(500, (int) responseObjectPath.evaluate("status"));
+        } else {
+            assertEquals(200, response.getStatusLine().getStatusCode());
+            assertNotNull(responseObjectPath.evaluate("log"));
+            assertNotNull(responseObjectPath.evaluate("exception"));
+        }
+
+        assertNull(responseObjectPath.evaluate("results"));
+    }
+
+    public void testBadSnapshotInfo() throws IOException {
+        final var testContext = createTestContext();
+
+        final var snapshotInfoBlob = BlobStoreCorruptionUtils.getRandomFileToCorrupt(
+            testContext.repositoryRootPath(),
+            RepositoryFileType.SNAPSHOT_INFO
+        );
+
+        final SnapshotInfo snapshotInfo;
+        try (var inputStream = Files.newInputStream(snapshotInfoBlob)) {
+            snapshotInfo = SNAPSHOT_FORMAT.deserialize(testContext.repositoryName(), xContentRegistry(), inputStream);
+        }
+
+        final var newIndices = new ArrayList<>(snapshotInfo.indices());
+        newIndices.remove(between(0, newIndices.size() - 1));
+
+        final Response response;
+        try (var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor()) {
+            try (var outputStream = Files.newOutputStream(snapshotInfoBlob)) {
+                SNAPSHOT_FORMAT.serialize(
+                    new SnapshotInfo(
+                        snapshotInfo.snapshot(),
+                        newIndices,
+                        snapshotInfo.dataStreams(),
+                        snapshotInfo.featureStates(),
+                        snapshotInfo.reason(),
+                        snapshotInfo.version(),
+                        snapshotInfo.startTime(),
+                        snapshotInfo.endTime(),
+                        snapshotInfo.totalShards(),
+                        snapshotInfo.successfulShards(),
+                        snapshotInfo.shardFailures(),
+                        snapshotInfo.includeGlobalState(),
+                        snapshotInfo.userMetadata(),
+                        snapshotInfo.state(),
+                        snapshotInfo.indexSnapshotDetails()
+                    ),
+                    snapshotInfoBlob.toString(),
+                    randomBoolean(),
+                    outputStream
+                );
+            }
+
+            response = getRestClient().performRequest(testContext.getVerifyIntegrityRequest());
+        } finally {
+            assertAcked(
+                client().admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+            );
+        }
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        assertThat(getAnomalies(ObjectPath.createFromResponse(response)), equalTo(Set.of("snapshot contents mismatch")));
+    }
+
+    public void testShardPathEmpty() throws IOException {
+        final var testContext = createTestContext();
+
+        final var shardPath = BlobStoreCorruptionUtils.getRandomFileToCorrupt(
+            testContext.repositoryRootPath(),
+            RepositoryFileType.SHARD_GENERATION
+        ).getParent();
+
+        final Response response;
+        try (var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor()) {
+            IOUtils.rm(shardPath);
+            response = getRestClient().performRequest(testContext.getVerifyIntegrityRequest());
+        } finally {
+            assertAcked(
+                client().admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+            );
+        }
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        assertThat(getAnomalies(ObjectPath.createFromResponse(response)), equalTo(Set.of("failed to load shard snapshot")));
+    }
+
+    public void testShardPathUnreadable() throws IOException {
+        final var testContext = createTestContext();
+
+        final var shardPath = BlobStoreCorruptionUtils.getRandomFileToCorrupt(
+            testContext.repositoryRootPath(),
+            RepositoryFileType.SHARD_GENERATION
+        ).getParent();
+
+        final Response response;
+        try (var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor()) {
+            IOUtils.rm(shardPath);
+            Files.write(shardPath, new byte[0], StandardOpenOption.CREATE_NEW);
+            response = getRestClient().performRequest(testContext.getVerifyIntegrityRequest());
+        } finally {
+            assertAcked(
+                client().admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+            );
+        }
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        assertThat(getAnomalies(ObjectPath.createFromResponse(response)), equalTo(Set.of("failed to list shard container contents")));
+    }
+
+    public void testShardGenerationMissing() throws IOException {
+        final var testContext = createTestContext();
+
+        final var repository = asInstanceOf(
+            BlobStoreRepository.class,
+            internalCluster().getCurrentMasterNodeInstance(RepositoriesService.class).repository(testContext.repositoryName())
+        );
+        final var repoSettings = repository.getMetadata().settings();
+
+        final RepositoryData repositoryData = safeAwait(l -> repository.getRepositoryData(EsExecutors.DIRECT_EXECUTOR_SERVICE, l));
+
+        assertAcked(
+            client().admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+        );
+
+        final var rootBlob = BlobStoreCorruptionUtils.getRandomFileToCorrupt(
+            testContext.repositoryRootPath(),
+            RepositoryFileType.ROOT_INDEX_N
+        );
+
+        final var indexToBreak = randomFrom(testContext.indexNames());
+        final var newShardGenerations = ShardGenerations.builder();
+        for (final var index : repositoryData.shardGenerations().indices()) {
+            final var indexShardGenerations = repositoryData.shardGenerations().getGens(index);
+            for (int i = 0; i < indexShardGenerations.size(); i++) {
+                if (i > 0 || index.getName().equals(indexToBreak) == false) {
+                    newShardGenerations.put(index, i, indexShardGenerations.get(i));
+                }
+            }
+        }
+
+        final var brokenRepositoryData = new RepositoryData(
+            repositoryData.getUuid(),
+            repositoryData.getGenId(),
+            repositoryData.getSnapshotIds().stream().collect(Collectors.toMap(SnapshotId::getUUID, Function.identity())),
+            repositoryData.getSnapshotIds().stream().collect(Collectors.toMap(SnapshotId::getUUID, repositoryData::getSnapshotDetails)),
+            repositoryData.getIndices().values().stream().collect(Collectors.toMap(Function.identity(), repositoryData::getSnapshots)),
+            newShardGenerations.build(),
+            repositoryData.indexMetaDataGenerations(),
+            repositoryData.getClusterUUID()
+        );
+
+        final Response response;
+        try (var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor()) {
+
+            Files.write(
+                rootBlob,
+                BytesReference.toBytes(
+                    BytesReference.bytes(brokenRepositoryData.snapshotsToXContent(XContentFactory.jsonBuilder(), IndexVersion.current()))
+                ),
+                StandardOpenOption.TRUNCATE_EXISTING
+            );
+
+            assertAcked(
+                client().admin()
+                    .cluster()
+                    .preparePutRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+                    .setType(FsRepository.TYPE)
+                    .setSettings(repoSettings)
+            );
+
+            response = getRestClient().performRequest(testContext.getVerifyIntegrityRequest());
+        } finally {
+            assertAcked(
+                client().admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+            );
+        }
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        assertThat(getAnomalies(ObjectPath.createFromResponse(response)), equalTo(Set.of("shard generation not defined")));
+    }
+
+    public void testSnapshotNotInShardGeneration() throws IOException {
+        final var testContext = createTestContext();
+        runInconsistentShardGenerationBlobTest(
+            testContext,
+            blobStoreIndexShardSnapshots -> blobStoreIndexShardSnapshots.withRetainedSnapshots(
+                testContext.snapshotNames().stream().skip(1).map(n -> new SnapshotId(n, "_na_")).collect(Collectors.toSet())
+            ),
+            "snapshot not in shard generation"
+        );
+    }
+
+    public void testBlobInShardGenerationButNotSnapshot() throws IOException {
+        final var testContext = createTestContext();
+        final var snapshotToUpdate = randomFrom(testContext.snapshotNames());
+        runInconsistentShardGenerationBlobTest(testContext, blobStoreIndexShardSnapshots -> {
+            BlobStoreIndexShardSnapshots result = BlobStoreIndexShardSnapshots.EMPTY;
+            for (final var snapshotFiles : blobStoreIndexShardSnapshots.snapshots()) {
+                if (snapshotFiles.snapshot().equals(snapshotToUpdate)) {
+                    result = result.withAddedSnapshot(
+                        new SnapshotFiles(
+                            snapshotToUpdate,
+                            CollectionUtils.appendToCopy(
+                                snapshotFiles.indexFiles(),
+                                new BlobStoreIndexShardSnapshot.FileInfo(
+                                    "extra",
+                                    new StoreFileMetadata("extra", 1L, "checksum", Version.CURRENT.toString()),
+                                    ByteSizeValue.ONE
+                                )
+                            ),
+                            snapshotFiles.shardStateIdentifier()
+                        )
+                    );
+                } else {
+                    result = result.withAddedSnapshot(snapshotFiles);
+                }
+            }
+            return result;
+        }, "blob in shard generation but not snapshot");
+    }
+
+    public void testSnapshotShardGenerationMismatch() throws IOException {
+        final var testContext = createTestContext();
+        runInconsistentShardGenerationBlobTest(testContext, blobStoreIndexShardSnapshots -> {
+            final var fileToUpdate = randomFrom(blobStoreIndexShardSnapshots.iterator().next().indexFiles());
+            final var updatedFile = new BlobStoreIndexShardSnapshot.FileInfo(
+                fileToUpdate.name(),
+                fileToUpdate.metadata(),
+                ByteSizeValue.ONE
+            );
+            assertFalse(fileToUpdate.isSame(updatedFile));
+
+            BlobStoreIndexShardSnapshots result = BlobStoreIndexShardSnapshots.EMPTY;
+            for (final var snapshotFiles : blobStoreIndexShardSnapshots.snapshots()) {
+                result = result.withAddedSnapshot(
+                    new SnapshotFiles(
+                        snapshotFiles.snapshot(),
+                        snapshotFiles.indexFiles()
+                            .stream()
+                            .map(fileInfo -> fileInfo.name().equals(fileToUpdate.name()) ? updatedFile : fileInfo)
+                            .toList(),
+                        snapshotFiles.shardStateIdentifier()
+                    )
+                );
+            }
+            return result;
+        }, "snapshot shard generation mismatch");
+    }
+
+    public void testBlobInSnapshotNotShardGeneration() throws IOException {
+        final var testContext = createTestContext();
+        final var snapshotToUpdate = randomFrom(testContext.snapshotNames());
+        runInconsistentShardGenerationBlobTest(testContext, blobStoreIndexShardSnapshots -> {
+            BlobStoreIndexShardSnapshots result = BlobStoreIndexShardSnapshots.EMPTY;
+            for (final var snapshotFiles : blobStoreIndexShardSnapshots.snapshots()) {
+                if (snapshotFiles.snapshot().equals(snapshotToUpdate)) {
+                    final var indexFilesCopy = new ArrayList<>(snapshotFiles.indexFiles());
+                    indexFilesCopy.remove(between(0, indexFilesCopy.size() - 1));
+                    result = result.withAddedSnapshot(
+                        new SnapshotFiles(snapshotToUpdate, indexFilesCopy, snapshotFiles.shardStateIdentifier())
+                    );
+                } else {
+                    result = result.withAddedSnapshot(snapshotFiles);
+                }
+            }
+            return result;
+        }, "blob in snapshot but not shard generation");
+    }
+
+    private void runInconsistentShardGenerationBlobTest(
+        TestContext testContext,
+        UnaryOperator<BlobStoreIndexShardSnapshots> shardGenerationUpdater,
+        String expectedAnomaly
+    ) throws IOException {
+
+        final var shardGenerationBlob = BlobStoreCorruptionUtils.getRandomFileToCorrupt(
+            testContext.repositoryRootPath(),
+            RepositoryFileType.SHARD_GENERATION
+        );
+
+        final BlobStoreIndexShardSnapshots blobStoreIndexShardSnapshots;
+        try (var inputStream = Files.newInputStream(shardGenerationBlob)) {
+            blobStoreIndexShardSnapshots = INDEX_SHARD_SNAPSHOTS_FORMAT.deserialize(
+                testContext.repositoryName(),
+                xContentRegistry(),
+                inputStream
+            );
+        }
+
+        final Response response;
+        try (var ignored = new BlobStoreIndexShardSnapshotsIntegritySuppressor()) {
+            try (var outputStream = Files.newOutputStream(shardGenerationBlob)) {
+                INDEX_SHARD_SNAPSHOTS_FORMAT.serialize(
+                    shardGenerationUpdater.apply(blobStoreIndexShardSnapshots),
+                    shardGenerationBlob.toString(),
+                    randomBoolean(),
+                    outputStream
+                );
+            }
+            response = getRestClient().performRequest(testContext.getVerifyIntegrityRequest());
+        } finally {
+            assertAcked(
+                client().admin().cluster().prepareDeleteRepository(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT, testContext.repositoryName())
+            );
+        }
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        assertThat(getAnomalies(ObjectPath.createFromResponse(response)), equalTo(Set.of(expectedAnomaly)));
+    }
+
+    private Set<String> getAnomalies(ObjectPath responseObjectPath) throws IOException {
+        final var logEntryCount = responseObjectPath.evaluateArraySize("log");
+        final var anomalies = new HashSet<String>();
+        for (int i = 0; i < logEntryCount; i++) {
+            final String maybeAnomaly = responseObjectPath.evaluate("log." + i + ".anomaly");
+            if (maybeAnomaly != null) {
+                anomalies.add(maybeAnomaly);
+            }
+        }
+
+        assertThat(responseObjectPath.evaluate("results.total_anomalies"), greaterThanOrEqualTo(anomalies.size()));
+        if (anomalies.size() > 0) {
+            assertEquals("fail", responseObjectPath.evaluate("results.result"));
+        }
+
+        return anomalies;
+    }
+
+    private record TestContext(String repositoryName, Path repositoryRootPath, List<String> indexNames, List<String> snapshotNames) {
+        Request getVerifyIntegrityRequest() {
+            final var request = new Request("POST", "/_snapshot/" + repositoryName + "/_verify_integrity");
+            if (randomBoolean()) {
+                request.addParameter("human", null);
+            }
+            if (randomBoolean()) {
+                request.addParameter("pretty", null);
+            }
+            return request;
+        }
+    }
+
+    private TestContext createTestContext() {
+        final var repositoryName = randomIdentifier();
+        final var repositoryRootPath = randomRepoPath();
+
+        createRepository(repositoryName, FsRepository.TYPE, repositoryRootPath);
+
+        final var indexNames = randomList(1, 3, ESTestCase::randomIdentifier);
+        for (var indexName : indexNames) {
+            createIndexWithRandomDocs(indexName, between(1, 100));
+            flushAndRefresh(indexName);
+        }
+
+        final var snapshotNames = randomList(1, 3, ESTestCase::randomIdentifier);
+        for (var snapshotName : snapshotNames) {
+            createSnapshot(repositoryName, snapshotName, indexNames);
+        }
+
+        return new TestContext(repositoryName, repositoryRootPath, indexNames, snapshotNames);
+    }
+
+    private static String getCoordinatingNodeName() {
+        if (internalCluster().size() == 1) {
+            internalCluster().startNode();
+        }
+        return randomValueOtherThan(internalCluster().getMasterName(), () -> internalCluster().getRandomNodeName());
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/module-info.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/module-info.java
new file mode 100644
index 000000000000..70385cdc4cf0
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/module-info.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+module org.elasticsearch.repositories.blobstore.testkit {
+    requires org.elasticsearch.base;
+    requires org.elasticsearch.server;
+    requires org.elasticsearch.xcontent;
+    requires org.elasticsearch.xcore;
+
+    requires org.apache.logging.log4j;
+    requires org.apache.lucene.core;
+    requires org.elasticsearch.logging;
+
+    exports org.elasticsearch.repositories.blobstore.testkit.analyze;
+    exports org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+    provides org.elasticsearch.features.FeatureSpecification
+        with
+            org.elasticsearch.repositories.blobstore.testkit.SnapshotRepositoryTestKitFeatures;
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/SnapshotRepositoryTestKit.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/SnapshotRepositoryTestKit.java
index 04d59906e6db..b0ae1b0752b7 100644
--- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/SnapshotRepositoryTestKit.java
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/SnapshotRepositoryTestKit.java
@@ -22,8 +22,12 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.repositories.blobstore.testkit.analyze.RepositoryAnalyzeAction;
 import org.elasticsearch.repositories.blobstore.testkit.analyze.RestRepositoryAnalyzeAction;
+import org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityTask;
+import org.elasticsearch.repositories.blobstore.testkit.integrity.RestRepositoryVerifyIntegrityAction;
+import org.elasticsearch.repositories.blobstore.testkit.integrity.TransportRepositoryVerifyIntegrityCoordinationAction;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestHandler;
+import org.elasticsearch.tasks.Task;
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
@@ -35,7 +39,13 @@ public class SnapshotRepositoryTestKit extends Plugin implements ActionPlugin {
 
     @Override
     public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
-        return List.of(new ActionHandler<>(RepositoryAnalyzeAction.INSTANCE, RepositoryAnalyzeAction.class));
+        return List.of(
+            new ActionHandler<>(RepositoryAnalyzeAction.INSTANCE, RepositoryAnalyzeAction.class),
+            new ActionHandler<>(
+                TransportRepositoryVerifyIntegrityCoordinationAction.INSTANCE,
+                TransportRepositoryVerifyIntegrityCoordinationAction.class
+            )
+        );
     }
 
     @Override
@@ -50,7 +60,7 @@ public List<RestHandler> getRestHandlers(
         Supplier<DiscoveryNodes> nodesInCluster,
         Predicate<NodeFeature> clusterSupportsFeature
     ) {
-        return List.of(new RestRepositoryAnalyzeAction());
+        return List.of(new RestRepositoryAnalyzeAction(), new RestRepositoryVerifyIntegrityAction());
     }
 
     public static void humanReadableNanos(XContentBuilder builder, String rawFieldName, String readableFieldName, long nanos)
@@ -63,4 +73,15 @@ public static void humanReadableNanos(XContentBuilder builder, String rawFieldNa
 
         builder.field(rawFieldName, nanos);
     }
+
+    @Override
+    public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
+        return List.of(
+            new NamedWriteableRegistry.Entry(
+                Task.Status.class,
+                RepositoryVerifyIntegrityTask.Status.NAME,
+                RepositoryVerifyIntegrityTask.Status::new
+            )
+        );
+    }
 }
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/SnapshotRepositoryTestKitFeatures.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/SnapshotRepositoryTestKitFeatures.java
new file mode 100644
index 000000000000..cc513a948519
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/SnapshotRepositoryTestKitFeatures.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit;
+
+import org.elasticsearch.features.FeatureSpecification;
+import org.elasticsearch.features.NodeFeature;
+
+import java.util.Set;
+
+import static org.elasticsearch.repositories.blobstore.testkit.integrity.RestRepositoryVerifyIntegrityAction.REPOSITORY_VERIFY_INTEGRITY_FEATURE;
+
+public class SnapshotRepositoryTestKitFeatures implements FeatureSpecification {
+    @Override
+    public Set<NodeFeature> getFeatures() {
+        return Set.of(REPOSITORY_VERIFY_INTEGRITY_FEATURE);
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/ActiveRepositoryVerifyIntegrityTasks.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/ActiveRepositoryVerifyIntegrityTasks.java
new file mode 100644
index 000000000000..ac410465c3de
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/ActiveRepositoryVerifyIntegrityTasks.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.ResourceNotFoundException;
+import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
+import org.elasticsearch.core.Releasable;
+import org.elasticsearch.core.Releasables;
+
+import java.util.Map;
+
+/**
+ * The repository-verify-integrity tasks that this node is currently coordinating.
+ */
+class ActiveRepositoryVerifyIntegrityTasks {
+
+    private final Map<Long, RepositoryVerifyIntegrityResponseStream> responseStreamsByCoordinatingTaskId = ConcurrentCollections
+        .newConcurrentMap();
+
+    Releasable registerResponseBuilder(long coordinatingTaskId, RepositoryVerifyIntegrityResponseStream responseStream) {
+        assert responseStream.hasReferences(); // ref held until the REST-layer listener is completed
+
+        final var previous = responseStreamsByCoordinatingTaskId.putIfAbsent(coordinatingTaskId, responseStream);
+        if (previous != null) {
+            final var exception = new IllegalStateException("already executing verify task [" + coordinatingTaskId + "]");
+            assert false : exception;
+            throw exception;
+        }
+
+        return Releasables.assertOnce(() -> {
+            final var removed = responseStreamsByCoordinatingTaskId.remove(coordinatingTaskId, responseStream);
+            if (removed == false) {
+                final var exception = new IllegalStateException("already completed verify task [" + coordinatingTaskId + "]");
+                assert false : exception;
+                throw exception;
+            }
+        });
+    }
+
+    /**
+     * Obtain the response stream for the given coordinating-node task ID, and increment its refcount.
+     * @throws ResourceNotFoundException if the task is not running or its refcount already reached zero (likely because it completed)
+     */
+    RepositoryVerifyIntegrityResponseStream acquireResponseStream(long taskId) {
+        final var outerRequest = responseStreamsByCoordinatingTaskId.get(taskId);
+        if (outerRequest == null || outerRequest.tryIncRef() == false) {
+            throw new ResourceNotFoundException("verify task [" + taskId + "] not found");
+        }
+        return outerRequest;
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/IndexDescription.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/IndexDescription.java
new file mode 100644
index 000000000000..e13d97034686
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/IndexDescription.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.repositories.IndexId;
+import org.elasticsearch.xcontent.ToXContentObject;
+import org.elasticsearch.xcontent.XContentBuilder;
+
+import java.io.IOException;
+
+/**
+ * Details of an index in a specific snapshot, identifying its corresponding {@link org.elasticsearch.cluster.metadata.IndexMetadata} blob
+ * and the number of shards.
+ */
+public record IndexDescription(IndexId indexId, @Nullable String indexMetadataBlob, int shardCount) implements Writeable, ToXContentObject {
+
+    public IndexDescription {
+        if (indexId == null || shardCount < 0) {
+            throw new IllegalArgumentException("invalid IndexDescription");
+        }
+    }
+
+    public IndexDescription(StreamInput in) throws IOException {
+        this(new IndexId(in), in.readOptionalString(), in.readVInt());
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        indexId.writeTo(out);
+        out.writeOptionalString(indexMetadataBlob);
+        out.writeVInt(shardCount);
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.startObject();
+        builder.field("name", indexId.getName());
+        builder.field("uuid", indexId.getId());
+        if (indexMetadataBlob != null) {
+            builder.field("metadata_blob", indexMetadataBlob);
+        }
+        if (shardCount > 0) {
+            builder.field("shards", shardCount);
+        }
+        return builder.endObject();
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryIntegrityVerifier.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryIntegrityVerifier.java
new file mode 100644
index 000000000000..e10fe2b756f7
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryIntegrityVerifier.java
@@ -0,0 +1,953 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.lucene.codecs.CodecUtil;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.RateLimiter;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionRunnable;
+import org.elasticsearch.action.support.RefCountingListener;
+import org.elasticsearch.action.support.SubscribableListener;
+import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.common.blobstore.OperationPurpose;
+import org.elasticsearch.common.blobstore.support.BlobMetadata;
+import org.elasticsearch.common.collect.Iterators;
+import org.elasticsearch.common.unit.ByteSizeValue;
+import org.elasticsearch.common.util.CancellableThreads;
+import org.elasticsearch.common.util.Maps;
+import org.elasticsearch.common.util.concurrent.AbstractRunnable;
+import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
+import org.elasticsearch.common.util.concurrent.ThrottledIterator;
+import org.elasticsearch.common.util.concurrent.ThrottledTaskRunner;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.core.Releasable;
+import org.elasticsearch.core.Strings;
+import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot;
+import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshots;
+import org.elasticsearch.index.snapshots.blobstore.RateLimitingInputStream;
+import org.elasticsearch.index.snapshots.blobstore.SlicedInputStream;
+import org.elasticsearch.repositories.IndexId;
+import org.elasticsearch.repositories.RepositoryData;
+import org.elasticsearch.repositories.RepositoryVerificationException;
+import org.elasticsearch.repositories.ShardGeneration;
+import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
+import org.elasticsearch.snapshots.SnapshotId;
+import org.elasticsearch.snapshots.SnapshotInfo;
+import org.elasticsearch.tasks.TaskCancelledException;
+import org.elasticsearch.threadpool.ThreadPool;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BiConsumer;
+import java.util.function.BooleanSupplier;
+import java.util.function.LongSupplier;
+
+import static org.elasticsearch.common.util.concurrent.ConcurrentCollections.newConcurrentMap;
+
+class RepositoryIntegrityVerifier {
+    private static final Logger logger = LogManager.getLogger(RepositoryIntegrityVerifier.class);
+
+    private final LongSupplier currentTimeMillisSupplier;
+    private final BlobStoreRepository blobStoreRepository;
+    private final RepositoryVerifyIntegrityResponseChunk.Writer responseChunkWriter;
+    private final String repositoryName;
+    private final RepositoryVerifyIntegrityParams requestParams;
+    private final RepositoryData repositoryData;
+    private final BooleanSupplier isCancelledSupplier;
+    private final CancellableRunner metadataTaskRunner;
+    private final CancellableRunner snapshotTaskRunner;
+    private final RateLimiter rateLimiter;
+
+    private final Set<String> unreadableSnapshotInfoUuids = ConcurrentCollections.newConcurrentSet();
+    private final long snapshotCount;
+    private final AtomicLong snapshotProgress = new AtomicLong();
+    private final long indexCount;
+    private final AtomicLong indexProgress = new AtomicLong();
+    private final long indexSnapshotCount;
+    private final AtomicLong indexSnapshotProgress = new AtomicLong();
+    private final AtomicLong blobsVerified = new AtomicLong();
+    private final AtomicLong blobBytesVerified = new AtomicLong();
+    private final AtomicLong throttledNanos;
+    private final AtomicLong failedShardSnapshotsCount = new AtomicLong();
+    private final Set<String> failedShardSnapshotDescriptions = ConcurrentCollections.newConcurrentSet();
+
+    RepositoryIntegrityVerifier(
+        LongSupplier currentTimeMillisSupplier,
+        BlobStoreRepository blobStoreRepository,
+        RepositoryVerifyIntegrityResponseChunk.Writer responseChunkWriter,
+        RepositoryVerifyIntegrityParams requestParams,
+        RepositoryData repositoryData,
+        CancellableThreads cancellableThreads
+    ) {
+        this.currentTimeMillisSupplier = currentTimeMillisSupplier;
+        this.blobStoreRepository = blobStoreRepository;
+        this.repositoryName = blobStoreRepository.getMetadata().name();
+        this.responseChunkWriter = responseChunkWriter;
+        this.requestParams = requestParams;
+        this.repositoryData = repositoryData;
+        this.isCancelledSupplier = cancellableThreads::isCancelled;
+        this.snapshotTaskRunner = new CancellableRunner(
+            new ThrottledTaskRunner(
+                "verify-blob",
+                requestParams.blobThreadPoolConcurrency(),
+                blobStoreRepository.threadPool().executor(ThreadPool.Names.SNAPSHOT)
+            ),
+            cancellableThreads
+        );
+        this.metadataTaskRunner = new CancellableRunner(
+            new ThrottledTaskRunner(
+                "verify-metadata",
+                requestParams.metaThreadPoolConcurrency(),
+                blobStoreRepository.threadPool().executor(ThreadPool.Names.SNAPSHOT_META)
+            ),
+            cancellableThreads
+        );
+
+        this.snapshotCount = repositoryData.getSnapshotIds().size();
+        this.indexCount = repositoryData.getIndices().size();
+        this.indexSnapshotCount = repositoryData.getIndexSnapshotCount();
+        this.rateLimiter = new RateLimiter.SimpleRateLimiter(requestParams.maxBytesPerSec().getMbFrac());
+
+        this.throttledNanos = new AtomicLong(requestParams.verifyBlobContents() ? 1 : 0); // nonzero if verifying so status reported
+    }
+
+    RepositoryVerifyIntegrityTask.Status getStatus() {
+        return new RepositoryVerifyIntegrityTask.Status(
+            repositoryName,
+            repositoryData.getGenId(),
+            repositoryData.getUuid(),
+            snapshotCount,
+            snapshotProgress.get(),
+            indexCount,
+            indexProgress.get(),
+            indexSnapshotCount,
+            indexSnapshotProgress.get(),
+            blobsVerified.get(),
+            blobBytesVerified.get(),
+            throttledNanos.get()
+        );
+    }
+
+    void start(ActionListener<RepositoryVerifyIntegrityResponse> listener) {
+        logger.info(
+            """
+                [{}] verifying metadata integrity for index generation [{}]: \
+                repo UUID [{}], cluster UUID [{}], snapshots [{}], indices [{}], index snapshots [{}]""",
+            repositoryName,
+            repositoryData.getGenId(),
+            repositoryData.getUuid(),
+            repositoryData.getClusterUUID(),
+            getSnapshotCount(),
+            getIndexCount(),
+            getIndexSnapshotCount()
+        );
+
+        SubscribableListener
+            // first verify the top-level properties of the snapshots
+            .newForked(this::verifySnapshots)
+            .andThen(this::checkFailedShardSnapshotCount)
+            // then verify the restorability of each index
+            .andThen(this::verifyIndices)
+            .andThenAccept(v -> this.ensureNotCancelled())
+            // see if the repository data has changed
+            .<RepositoryData>andThen(
+                l -> blobStoreRepository.getRepositoryData(blobStoreRepository.threadPool().executor(ThreadPool.Names.MANAGEMENT), l)
+            )
+            // log the completion and return the result
+            .addListener(new ActionListener<>() {
+                @Override
+                public void onResponse(RepositoryData finalRepositoryData) {
+                    logger.info(
+                        "[{}] completed verifying metadata integrity for index generation [{}]: repo UUID [{}], cluster UUID [{}]",
+                        repositoryName,
+                        repositoryData.getGenId(),
+                        repositoryData.getUuid(),
+                        repositoryData.getClusterUUID()
+                    );
+                    listener.onResponse(new RepositoryVerifyIntegrityResponse(getStatus(), finalRepositoryData.getGenId()));
+                }
+
+                @Override
+                public void onFailure(Exception e) {
+                    logger.warn(
+                        () -> Strings.format(
+                            "[%s] failed verifying metadata integrity for index generation [%d]: repo UUID [%s], cluster UUID [%s]",
+                            repositoryName,
+                            repositoryData.getGenId(),
+                            repositoryData.getUuid(),
+                            repositoryData.getClusterUUID()
+                        ),
+                        e
+                    );
+                    listener.onFailure(e);
+                }
+            });
+    }
+
+    private void ensureNotCancelled() {
+        if (isCancelledSupplier.getAsBoolean()) {
+            throw new TaskCancelledException("task cancelled");
+        }
+    }
+
+    private void verifySnapshots(ActionListener<Void> listener) {
+        new SnapshotsVerifier().run(listener);
+    }
+
+    /**
+     * Verifies the top-level snapshot metadata in the repo, including {@link SnapshotInfo} and optional {@link Metadata} blobs.
+     */
+    private class SnapshotsVerifier {
+        final Map<String, Set<String>> indexNamesBySnapshotName;
+
+        SnapshotsVerifier() {
+            indexNamesBySnapshotName = Maps.newHashMapWithExpectedSize(repositoryData.getIndices().size());
+            for (final var indexId : repositoryData.getIndices().values()) {
+                for (final var snapshotId : repositoryData.getSnapshots(indexId)) {
+                    indexNamesBySnapshotName.computeIfAbsent(snapshotId.getName(), ignored -> new HashSet<>()).add(indexId.getName());
+                }
+            }
+        }
+
+        void run(ActionListener<Void> listener) {
+            var listeners = new RefCountingListener(listener);
+            runThrottled(
+                Iterators.failFast(
+                    repositoryData.getSnapshotIds().iterator(),
+                    () -> isCancelledSupplier.getAsBoolean() || listeners.isFailing()
+                ),
+                (releasable, snapshotId) -> new SnapshotVerifier(snapshotId).run(
+                    ActionListener.assertOnce(ActionListener.releaseAfter(listeners.acquire(), releasable))
+                ),
+                requestParams.snapshotVerificationConcurrency(),
+                snapshotProgress,
+                listeners
+            );
+        }
+
+        /**
+         * Verifies a single snapshot's metadata, including its {@link SnapshotInfo} and optional {@link Metadata} blobs.
+         */
+        private class SnapshotVerifier {
+            private final SnapshotId snapshotId;
+
+            SnapshotVerifier(SnapshotId snapshotId) {
+                this.snapshotId = snapshotId;
+            }
+
+            void run(ActionListener<Void> listener) {
+                if (isCancelledSupplier.getAsBoolean()) {
+                    // getSnapshotInfo does its own forking, so we must check for cancellation here
+                    listener.onResponse(null);
+                    return;
+                }
+
+                blobStoreRepository.getSnapshotInfo(snapshotId, new ActionListener<>() {
+                    @Override
+                    public void onResponse(SnapshotInfo snapshotInfo) {
+                        verifySnapshotInfo(snapshotInfo, listener);
+                    }
+
+                    @Override
+                    public void onFailure(Exception e) {
+                        unreadableSnapshotInfoUuids.add(snapshotId.getUUID());
+                        anomaly("failed to load snapshot info").snapshotId(snapshotId).exception(e).write(listener);
+                    }
+                });
+            }
+
+            void verifySnapshotInfo(SnapshotInfo snapshotInfo, ActionListener<Void> listener) {
+                final var chunkBuilder = new RepositoryVerifyIntegrityResponseChunk.Builder(
+                    responseChunkWriter,
+                    RepositoryVerifyIntegrityResponseChunk.Type.SNAPSHOT_INFO,
+                    currentTimeMillisSupplier.getAsLong()
+                ).snapshotInfo(snapshotInfo);
+
+                // record the SnapshotInfo in the response
+                final var chunkWrittenStep = SubscribableListener.newForked(chunkBuilder::write);
+
+                if (failedShardSnapshotsCount.get() < requestParams.maxFailedShardSnapshots()) {
+                    for (final var shardFailure : snapshotInfo.shardFailures()) {
+                        if (failedShardSnapshotsCount.getAndIncrement() < requestParams.maxFailedShardSnapshots()) {
+                            failedShardSnapshotDescriptions.add(
+                                getShardSnapshotDescription(snapshotId, shardFailure.index(), shardFailure.shardId())
+                            );
+                        }
+                    }
+                } else {
+                    failedShardSnapshotsCount.addAndGet(snapshotInfo.shardFailures().size());
+                }
+
+                // check the indices in the SnapshotInfo match those in RepositoryData
+                final var snapshotContentsOkStep = chunkWrittenStep.<Void>andThen(l -> {
+                    if (Set.copyOf(snapshotInfo.indices()).equals(indexNamesBySnapshotName.get(snapshotId.getName()))) {
+                        l.onResponse(null);
+                    } else {
+                        anomaly("snapshot contents mismatch").snapshotId(snapshotId).write(l);
+                    }
+                });
+
+                // check the global metadata is readable if present
+                final var globalMetadataOkStep = Boolean.TRUE.equals(snapshotInfo.includeGlobalState())
+                    ? snapshotContentsOkStep.<Void>andThen(this::verifySnapshotGlobalMetadata)
+                    : snapshotContentsOkStep;
+
+                globalMetadataOkStep.addListener(listener);
+            }
+
+            private void verifySnapshotGlobalMetadata(ActionListener<Void> listener) {
+                metadataTaskRunner.run(ActionRunnable.wrap(listener, l -> {
+                    try {
+                        blobStoreRepository.getSnapshotGlobalMetadata(snapshotId);
+                        // no checks here, loading it is enough
+                        l.onResponse(null);
+                    } catch (Exception e) {
+                        anomaly("failed to load global metadata").snapshotId(snapshotId).exception(e).write(l);
+                    }
+                }));
+            }
+        }
+    }
+
+    private void checkFailedShardSnapshotCount(ActionListener<Void> listener) {
+        if (failedShardSnapshotDescriptions.size() < failedShardSnapshotsCount.get()) {
+            listener.onFailure(
+                new RepositoryVerificationException(
+                    repositoryName,
+                    Strings.format(
+                        """
+                            Cannot verify the integrity of all index snapshots because this repository contains too many shard snapshot \
+                            failures: there are [%d] shard snapshot failures but [?%s] is set to [%d]. \
+                            Please increase this limit if it is safe to do so.""",
+                        failedShardSnapshotsCount.get(),
+                        RepositoryVerifyIntegrityParams.MAX_FAILED_SHARD_SNAPSHOTS,
+                        requestParams.maxFailedShardSnapshots()
+                    )
+                )
+            );
+        } else {
+            listener.onResponse(null);
+        }
+    }
+
+    private void verifyIndices(ActionListener<Void> listener) {
+        var listeners = new RefCountingListener(listener);
+        runThrottled(
+            Iterators.failFast(
+                repositoryData.getIndices().values().iterator(),
+                () -> isCancelledSupplier.getAsBoolean() || listeners.isFailing()
+            ),
+            (releasable, indexId) -> new IndexVerifier(indexId).run(ActionListener.releaseAfter(listeners.acquire(), releasable)),
+            requestParams.indexVerificationConcurrency(),
+            indexProgress,
+            listeners
+        );
+    }
+
+    /**
+     * Verifies the integrity of the snapshots of a specific index
+     */
+    private class IndexVerifier {
+        private final IndexId indexId;
+        private final ShardContainerContentsDeduplicator shardContainerContentsDeduplicator = new ShardContainerContentsDeduplicator();
+        private final IndexDescriptionsDeduplicator indexDescriptionsDeduplicator = new IndexDescriptionsDeduplicator();
+        private final AtomicInteger totalSnapshotCounter = new AtomicInteger();
+        private final AtomicInteger restorableSnapshotCounter = new AtomicInteger();
+
+        IndexVerifier(IndexId indexId) {
+            this.indexId = indexId;
+        }
+
+        void run(ActionListener<Void> listener) {
+            SubscribableListener
+
+                .<Void>newForked(l -> {
+                    var listeners = new RefCountingListener(1, l);
+                    runThrottled(
+                        Iterators.failFast(
+                            repositoryData.getSnapshots(indexId).iterator(),
+                            () -> isCancelledSupplier.getAsBoolean() || listeners.isFailing()
+                        ),
+                        (releasable, snapshotId) -> verifyIndexSnapshot(
+                            snapshotId,
+                            ActionListener.releaseAfter(listeners.acquire(), releasable)
+                        ),
+                        requestParams.indexSnapshotVerificationConcurrency(),
+                        indexSnapshotProgress,
+                        listeners
+                    );
+                })
+                .<Void>andThen(l -> {
+                    ensureNotCancelled();
+                    new RepositoryVerifyIntegrityResponseChunk.Builder(
+                        responseChunkWriter,
+                        RepositoryVerifyIntegrityResponseChunk.Type.INDEX_RESTORABILITY,
+                        currentTimeMillisSupplier.getAsLong()
+                    ).indexRestorability(indexId, totalSnapshotCounter.get(), restorableSnapshotCounter.get()).write(l);
+                })
+                .addListener(listener);
+        }
+
+        private void verifyIndexSnapshot(SnapshotId snapshotId, ActionListener<Void> listener) {
+            totalSnapshotCounter.incrementAndGet();
+            indexDescriptionsDeduplicator.get(snapshotId).<Void>andThen((l, indexDescription) -> {
+                if (indexDescription == null) {
+                    // index metadata was unreadable; anomaly already reported, skip further verification of this index snapshot
+                    l.onResponse(null);
+                } else {
+                    new ShardSnapshotsVerifier(snapshotId, indexDescription).run(l);
+                }
+            }).addListener(listener);
+        }
+
+        /**
+         * Information about the contents of the {@code ${REPO}/indices/${INDEX}/${SHARD}/} container, shared across the verifications of
+         * each snapshot of this shard.
+         *
+         * @param shardId the numeric shard ID.
+         * @param blobsByName the {@link BlobMetadata} for every blob in the container, keyed by blob name.
+         * @param shardGeneration the current {@link ShardGeneration} for this shard, identifying the current {@code index-${UUID}} blob.
+         * @param filesByPhysicalNameBySnapshotName a {@link BlobStoreIndexShardSnapshot.FileInfo} for every tracked file, keyed by snapshot
+         *                                          name and then by the file's physical name.
+         * @param blobContentsListeners a threadsafe mutable map, keyed by file name, for every tracked file that the verification process
+         *                              encounters. Used to avoid double-counting the size of any files, and also to deduplicate work to
+         *                              verify their contents if {@code ?verify_blob_contents} is set.
+         */
+        private record ShardContainerContents(
+            int shardId,
+            Map<String, BlobMetadata> blobsByName,
+            @Nullable /* if shard gen is not defined */
+            ShardGeneration shardGeneration,
+            @Nullable /* if shard gen blob could not be read */
+            Map<String, Map<String, BlobStoreIndexShardSnapshot.FileInfo>> filesByPhysicalNameBySnapshotName,
+            Map<String, SubscribableListener<Void>> blobContentsListeners
+        ) {}
+
+        /**
+         * Verifies the integrity of the shard snapshots of a specific index snapshot
+         */
+        private class ShardSnapshotsVerifier {
+            private final SnapshotId snapshotId;
+            private final IndexDescription indexDescription;
+            private final AtomicInteger restorableShardCount = new AtomicInteger();
+
+            ShardSnapshotsVerifier(SnapshotId snapshotId, IndexDescription indexDescription) {
+                this.snapshotId = snapshotId;
+                this.indexDescription = indexDescription;
+            }
+
+            void run(ActionListener<Void> listener) {
+                try (var listeners = new RefCountingListener(1, listener.map(v -> {
+                    if (unreadableSnapshotInfoUuids.contains(snapshotId.getUUID()) == false
+                        && indexDescription.shardCount() == restorableShardCount.get()) {
+                        restorableSnapshotCounter.incrementAndGet();
+                    }
+                    return v;
+                }))) {
+                    for (int shardId = 0; shardId < indexDescription.shardCount(); shardId++) {
+                        if (failedShardSnapshotDescriptions.contains(getShardSnapshotDescription(snapshotId, indexId.getName(), shardId))) {
+                            continue;
+                        }
+
+                        shardContainerContentsDeduplicator.get(shardId)
+                            // deduplicating reads of shard container contents
+                            .<Void>andThen((l, shardContainerContents) -> {
+                                if (shardContainerContents == null) {
+                                    // shard container contents was unreadable; anomaly already reported, skip further verification
+                                    l.onResponse(null);
+                                } else {
+                                    new ShardSnapshotVerifier(shardContainerContents).run(l);
+                                }
+                            })
+                            .addListener(listeners.acquire());
+                    }
+                }
+            }
+
+            /**
+             * Verifies the integrity of a specific shard snapshot
+             */
+            private class ShardSnapshotVerifier {
+                private final ShardContainerContents shardContainerContents;
+                private volatile boolean isRestorable = true;
+
+                ShardSnapshotVerifier(ShardContainerContents shardContainerContents) {
+                    this.shardContainerContents = shardContainerContents;
+                }
+
+                void run(ActionListener<Void> listener) {
+                    metadataTaskRunner.run(ActionRunnable.wrap(listener, this::verifyShardSnapshot));
+                }
+
+                private void verifyShardSnapshot(ActionListener<Void> listener) {
+                    final var shardId = shardContainerContents.shardId();
+                    final BlobStoreIndexShardSnapshot blobStoreIndexShardSnapshot;
+                    try {
+                        blobStoreIndexShardSnapshot = blobStoreRepository.loadShardSnapshot(
+                            blobStoreRepository.shardContainer(indexId, shardId),
+                            snapshotId
+                        );
+                    } catch (Exception e) {
+                        anomaly("failed to load shard snapshot").snapshotId(snapshotId)
+                            .shardDescription(indexDescription, shardId)
+                            .exception(e)
+                            .write(listener);
+                        return;
+                    }
+
+                    final var listeners = new RefCountingListener(1, listener.map(v -> {
+                        if (isRestorable) {
+                            restorableShardCount.incrementAndGet();
+                        }
+                        return v;
+                    }));
+                    final var shardGenerationConsistencyListener = listeners.acquire();
+
+                    runThrottled(
+                        Iterators.failFast(
+                            blobStoreIndexShardSnapshot.indexFiles().iterator(),
+                            () -> isCancelledSupplier.getAsBoolean() || listeners.isFailing()
+                        ),
+                        (releasable, fileInfo) -> verifyFileInfo(fileInfo, ActionListener.releaseAfter(listeners.acquire(), releasable)),
+                        1,
+                        blobsVerified,
+                        listeners
+                    );
+
+                    // NB this next step doesn't matter for restorability, it is just verifying that the shard gen blob matches the shard
+                    // snapshot blob
+                    verifyShardGenerationConsistency(blobStoreIndexShardSnapshot, shardGenerationConsistencyListener);
+                }
+
+                /**
+                 * Checks that the given {@link org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo} matches
+                 * the actual blob in the repository.
+                 */
+                private void verifyFileInfo(BlobStoreIndexShardSnapshot.FileInfo fileInfo, ActionListener<Void> listener) {
+                    if (fileInfo.metadata().hashEqualsContents()) {
+                        listener.onResponse(null);
+                        return;
+                    }
+
+                    for (int partIndex = 0; partIndex < fileInfo.numberOfParts(); partIndex++) {
+                        final var blobName = fileInfo.partName(partIndex);
+                        final var blobInfo = shardContainerContents.blobsByName().get(blobName);
+                        if (blobInfo == null) {
+                            isRestorable = false;
+                            String physicalFileName = fileInfo.physicalName();
+                            anomaly("missing blob").snapshotId(snapshotId)
+                                .shardDescription(indexDescription, shardContainerContents.shardId())
+                                .blobName(blobName, physicalFileName)
+                                .part(partIndex, fileInfo.numberOfParts())
+                                .fileLength(ByteSizeValue.ofBytes(fileInfo.length()))
+                                .partLength(ByteSizeValue.ofBytes(fileInfo.partBytes(partIndex)))
+                                .write(listener);
+                            return;
+                        } else if (blobInfo.length() != fileInfo.partBytes(partIndex)) {
+                            isRestorable = false;
+                            String physicalFileName = fileInfo.physicalName();
+                            ByteSizeValue blobLength = ByteSizeValue.ofBytes(blobInfo.length());
+                            anomaly("mismatched blob length").snapshotId(snapshotId)
+                                .shardDescription(indexDescription, shardContainerContents.shardId())
+                                .blobName(blobName, physicalFileName)
+                                .part(partIndex, fileInfo.numberOfParts())
+                                .fileLength(ByteSizeValue.ofBytes(fileInfo.length()))
+                                .partLength(ByteSizeValue.ofBytes(fileInfo.partBytes(partIndex)))
+                                .blobLength(blobLength)
+                                .write(listener);
+                            return;
+                        }
+                    }
+
+                    // NB adding a listener whether ?verify_blob_contents is set or not - we want to track the blob sizes either way
+                    blobContentsListeners(indexDescription, shardContainerContents, fileInfo).addListener(
+                        listener.delegateResponse((l, e) -> {
+                            isRestorable = false;
+                            String physicalFileName = fileInfo.physicalName();
+                            anomaly("corrupt data blob").snapshotId(snapshotId)
+                                .shardDescription(indexDescription, shardContainerContents.shardId())
+                                .blobName(fileInfo.name(), physicalFileName)
+                                .part(-1, fileInfo.numberOfParts())
+                                .fileLength(ByteSizeValue.ofBytes(fileInfo.length()))
+                                .exception(e)
+                                .write(l);
+                        })
+                    );
+                }
+
+                /**
+                 * Checks that the shard generation blob has the right content for this shard snapshot.
+                 */
+                private void verifyShardGenerationConsistency(
+                    BlobStoreIndexShardSnapshot blobStoreIndexShardSnapshot,
+                    ActionListener<Void> listener
+                ) {
+                    final var summaryFilesByPhysicalNameBySnapshotName = shardContainerContents.filesByPhysicalNameBySnapshotName();
+                    if (summaryFilesByPhysicalNameBySnapshotName == null) {
+                        // couldn't read shard gen blob at all - already reported, nothing more to do here
+                        listener.onResponse(null);
+                        return;
+                    }
+
+                    final var shardId = shardContainerContents.shardId();
+
+                    final var summaryFilesByPhysicalName = summaryFilesByPhysicalNameBySnapshotName.get(snapshotId.getName());
+                    if (summaryFilesByPhysicalName == null) {
+                        anomaly("snapshot not in shard generation").snapshotId(snapshotId)
+                            .shardDescription(indexDescription, shardId)
+                            .shardGeneration(shardContainerContents.shardGeneration())
+                            .write(listener);
+                        return;
+                    }
+
+                    final var snapshotFiles = getFilesByPhysicalName(blobStoreIndexShardSnapshot.indexFiles());
+
+                    for (final var summaryFile : summaryFilesByPhysicalName.values()) {
+                        final var snapshotFile = snapshotFiles.get(summaryFile.physicalName());
+                        if (snapshotFile == null) {
+                            anomaly("blob in shard generation but not snapshot").snapshotId(snapshotId)
+                                .shardDescription(indexDescription, shardId)
+                                .shardGeneration(shardContainerContents.shardGeneration())
+                                .physicalFileName(summaryFile.physicalName())
+                                .write(listener);
+                            return;
+                        } else if (summaryFile.isSame(snapshotFile) == false) {
+                            anomaly("snapshot shard generation mismatch").snapshotId(snapshotId)
+                                .shardDescription(indexDescription, shardId)
+                                .shardGeneration(shardContainerContents.shardGeneration())
+                                .physicalFileName(summaryFile.physicalName())
+                                .write(listener);
+                            return;
+                        }
+                    }
+
+                    for (final var snapshotFile : blobStoreIndexShardSnapshot.indexFiles()) {
+                        if (summaryFilesByPhysicalName.get(snapshotFile.physicalName()) == null) {
+                            anomaly("blob in snapshot but not shard generation").snapshotId(snapshotId)
+                                .shardDescription(indexDescription, shardId)
+                                .shardGeneration(shardContainerContents.shardGeneration())
+                                .physicalFileName(snapshotFile.physicalName())
+                                .write(listener);
+                            return;
+                        }
+                    }
+
+                    listener.onResponse(null);
+                }
+            }
+        }
+
+        /**
+         * Exposes {@link IndexDescription} per index-metadata-blob (particularly the shard count), caching the value on first read
+         * to avoid duplicate work.
+         */
+        private class IndexDescriptionsDeduplicator {
+            private final Map<String, SubscribableListener<IndexDescription>> listenersByBlobId = newConcurrentMap();
+
+            SubscribableListener<IndexDescription> get(SnapshotId snapshotId) {
+                final var indexMetaBlobId = repositoryData.indexMetaDataGenerations().indexMetaBlobId(snapshotId, indexId);
+                return listenersByBlobId.computeIfAbsent(
+                    indexMetaBlobId,
+                    ignored -> SubscribableListener.newForked(
+                        indexDescriptionListener -> metadataTaskRunner.run(
+                            ActionRunnable.wrap(indexDescriptionListener, l -> load(snapshotId, indexMetaBlobId, l))
+                        )
+                    )
+                );
+            }
+
+            private void load(SnapshotId snapshotId, String indexMetaBlobId, ActionListener<IndexDescription> listener) {
+                try {
+                    listener.onResponse(
+                        new IndexDescription(
+                            indexId,
+                            indexMetaBlobId,
+                            blobStoreRepository.getSnapshotIndexMetaData(repositoryData, snapshotId, indexId).getNumberOfShards()
+                        )
+                    );
+                } catch (Exception e) {
+                    anomaly("failed to load index metadata").indexDescription(new IndexDescription(indexId, indexMetaBlobId, 0))
+                        .exception(e)
+                        .write(listener.map(v -> null));
+                }
+            }
+        }
+
+        /**
+         * Exposes {@link ShardContainerContents} per shard, caching the value on the first read to avoid duplicate work.
+         */
+        private class ShardContainerContentsDeduplicator {
+            private final Map<Integer, SubscribableListener<ShardContainerContents>> listenersByShardId = newConcurrentMap();
+
+            SubscribableListener<ShardContainerContents> get(int shardId) {
+                return listenersByShardId.computeIfAbsent(
+                    shardId,
+                    ignored -> SubscribableListener.newForked(
+                        shardContainerContentsListener -> metadataTaskRunner.run(
+                            ActionRunnable.wrap(shardContainerContentsListener, l -> load(shardId, l))
+                        )
+                    )
+                );
+            }
+
+            private void load(int shardId, ActionListener<ShardContainerContents> listener) {
+                final var indexDescription = new IndexDescription(indexId, null, 0);
+
+                final Map<String, BlobMetadata> blobsByName;
+                try {
+                    blobsByName = blobStoreRepository.shardContainer(indexId, shardId).listBlobs(OperationPurpose.REPOSITORY_ANALYSIS);
+                } catch (Exception e) {
+                    anomaly("failed to list shard container contents").shardDescription(new IndexDescription(indexId, null, 0), shardId)
+                        .exception(e)
+                        .write(listener.map(v -> null));
+                    return;
+                }
+
+                final var shardGen = repositoryData.shardGenerations().getShardGen(indexId, shardId);
+                if (shardGen == null) {
+                    anomaly("shard generation not defined").shardDescription(indexDescription, shardId)
+                        .write(
+                            listener.map(
+                                // NB we don't need the shard gen to do most of the rest of the verification, so we set it to null and
+                                // carry on:
+                                v -> new ShardContainerContents(shardId, blobsByName, null, null, ConcurrentCollections.newConcurrentMap())
+                            )
+                        );
+                    return;
+                }
+
+                SubscribableListener
+                    // try and load the shard gen blob
+                    .<BlobStoreIndexShardSnapshots>newForked(l -> {
+                        try {
+                            l.onResponse(blobStoreRepository.getBlobStoreIndexShardSnapshots(indexId, shardId, shardGen));
+                        } catch (Exception e) {
+                            // failing here is not fatal to snapshot restores, only to creating/deleting snapshots, so we can return null
+                            // and carry on with the analysis
+                            anomaly("failed to load shard generation").shardDescription(indexDescription, shardId)
+                                .shardGeneration(shardGen)
+                                .exception(e)
+                                .write(l.map(v -> null));
+                        }
+                    })
+                    .andThenApply(
+                        blobStoreIndexShardSnapshots -> new ShardContainerContents(
+                            shardId,
+                            blobsByName,
+                            shardGen,
+                            getFilesByPhysicalNameBySnapshotName(blobStoreIndexShardSnapshots),
+                            ConcurrentCollections.newConcurrentMap()
+                        )
+                    )
+                    .addListener(listener);
+            }
+
+            private static Map<String, Map<String, BlobStoreIndexShardSnapshot.FileInfo>> getFilesByPhysicalNameBySnapshotName(
+                BlobStoreIndexShardSnapshots blobStoreIndexShardSnapshots
+            ) {
+                if (blobStoreIndexShardSnapshots == null) {
+                    return null;
+                }
+
+                final Map<String, Map<String, BlobStoreIndexShardSnapshot.FileInfo>> filesByPhysicalNameBySnapshotName = Maps
+                    .newHashMapWithExpectedSize(blobStoreIndexShardSnapshots.snapshots().size());
+                for (final var snapshotFiles : blobStoreIndexShardSnapshots.snapshots()) {
+                    filesByPhysicalNameBySnapshotName.put(snapshotFiles.snapshot(), getFilesByPhysicalName(snapshotFiles.indexFiles()));
+                }
+                return filesByPhysicalNameBySnapshotName;
+            }
+        }
+
+        private SubscribableListener<Void> blobContentsListeners(
+            IndexDescription indexDescription,
+            ShardContainerContents shardContainerContents,
+            BlobStoreIndexShardSnapshot.FileInfo fileInfo
+        ) {
+            return shardContainerContents.blobContentsListeners().computeIfAbsent(fileInfo.name(), ignored -> {
+                if (requestParams.verifyBlobContents()) {
+                    return SubscribableListener.newForked(listener -> snapshotTaskRunner.run(ActionRunnable.run(listener, () -> {
+                        try (var slicedStream = new SlicedInputStream(fileInfo.numberOfParts()) {
+                            @Override
+                            protected InputStream openSlice(int slice) throws IOException {
+                                return blobStoreRepository.shardContainer(indexDescription.indexId(), shardContainerContents.shardId())
+                                    .readBlob(OperationPurpose.REPOSITORY_ANALYSIS, fileInfo.partName(slice));
+                            }
+                        };
+                            var rateLimitedStream = new RateLimitingInputStream(slicedStream, () -> rateLimiter, throttledNanos::addAndGet);
+                            var indexInput = new IndexInputWrapper(rateLimitedStream, fileInfo.length())
+                        ) {
+                            CodecUtil.checksumEntireFile(indexInput);
+                        }
+                    })));
+                } else {
+                    blobBytesVerified.addAndGet(fileInfo.length());
+                    return SubscribableListener.newSucceeded(null);
+                }
+            });
+        }
+    }
+
+    private static String getShardSnapshotDescription(SnapshotId snapshotId, String index, int shardId) {
+        return snapshotId.getUUID() + "/" + index + "/" + shardId;
+    }
+
+    private static Map<String, BlobStoreIndexShardSnapshot.FileInfo> getFilesByPhysicalName(
+        List<BlobStoreIndexShardSnapshot.FileInfo> fileInfos
+    ) {
+        final Map<String, BlobStoreIndexShardSnapshot.FileInfo> filesByPhysicalName = Maps.newHashMapWithExpectedSize(fileInfos.size());
+        for (final var fileInfo : fileInfos) {
+            filesByPhysicalName.put(fileInfo.physicalName(), fileInfo);
+        }
+        return filesByPhysicalName;
+    }
+
+    private static <T> void runThrottled(
+        Iterator<T> iterator,
+        BiConsumer<Releasable, T> itemConsumer,
+        int maxConcurrency,
+        AtomicLong progressCounter,
+        Releasable onCompletion
+    ) {
+        ThrottledIterator.run(iterator, itemConsumer, maxConcurrency, progressCounter::incrementAndGet, onCompletion::close);
+    }
+
+    private RepositoryVerifyIntegrityResponseChunk.Builder anomaly(String anomaly) {
+        return new RepositoryVerifyIntegrityResponseChunk.Builder(
+            responseChunkWriter,
+            RepositoryVerifyIntegrityResponseChunk.Type.ANOMALY,
+            currentTimeMillisSupplier.getAsLong()
+        ).anomaly(anomaly);
+    }
+
+    public long getSnapshotCount() {
+        return snapshotCount;
+    }
+
+    public long getIndexCount() {
+        return indexCount;
+    }
+
+    public long getIndexSnapshotCount() {
+        return indexSnapshotCount;
+    }
+
+    private class IndexInputWrapper extends IndexInput {
+        private final InputStream inputStream;
+        private final long length;
+        long filePointer = 0L;
+
+        IndexInputWrapper(InputStream inputStream, long length) {
+            super("");
+            this.inputStream = inputStream;
+            this.length = length;
+        }
+
+        @Override
+        public byte readByte() throws IOException {
+            if (isCancelledSupplier.getAsBoolean()) {
+                throw new TaskCancelledException("task cancelled");
+            }
+            final var read = inputStream.read();
+            if (read == -1) {
+                throw new EOFException();
+            }
+            filePointer += 1;
+            blobBytesVerified.incrementAndGet();
+            return (byte) read;
+        }
+
+        @Override
+        public void readBytes(byte[] b, int offset, int len) throws IOException {
+            while (len > 0) {
+                if (isCancelledSupplier.getAsBoolean()) {
+                    throw new TaskCancelledException("task cancelled");
+                }
+                final var read = inputStream.read(b, offset, len);
+                if (read == -1) {
+                    throw new EOFException();
+                }
+                filePointer += read;
+                blobBytesVerified.addAndGet(read);
+                len -= read;
+                offset += read;
+            }
+        }
+
+        @Override
+        public void close() {}
+
+        @Override
+        public long getFilePointer() {
+            return filePointer;
+        }
+
+        @Override
+        public void seek(long pos) {
+            if (filePointer != pos) {
+                assert false : "cannot seek";
+                throw new UnsupportedOperationException("seek");
+            }
+        }
+
+        @Override
+        public long length() {
+            return length;
+        }
+
+        @Override
+        public IndexInput slice(String sliceDescription, long offset, long length) {
+            assert false;
+            throw new UnsupportedOperationException("slice");
+        }
+    }
+
+    private static class CancellableRunner {
+        private final ThrottledTaskRunner delegate;
+        private final CancellableThreads cancellableThreads;
+
+        CancellableRunner(ThrottledTaskRunner delegate, CancellableThreads cancellableThreads) {
+            this.delegate = delegate;
+            this.cancellableThreads = cancellableThreads;
+        }
+
+        void run(AbstractRunnable runnable) {
+            delegate.enqueueTask(new ActionListener<>() {
+                @Override
+                public void onResponse(Releasable releasable) {
+                    try (releasable) {
+                        if (cancellableThreads.isCancelled()) {
+                            runnable.onFailure(new TaskCancelledException("task cancelled"));
+                        } else {
+                            try {
+                                cancellableThreads.execute(runnable::run);
+                            } catch (RuntimeException e) {
+                                runnable.onFailure(e);
+                            }
+                        }
+                    }
+                }
+
+                @Override
+                public void onFailure(Exception e) {
+                    runnable.onFailure(e);
+                }
+            });
+        }
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityParams.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityParams.java
new file mode 100644
index 000000000000..61a58c0da8df
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityParams.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.unit.ByteSizeValue;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.threadpool.ThreadPool;
+
+import java.io.IOException;
+import java.util.Objects;
+
+/**
+ * Parameters of a repository-verity-integrity request.
+ *
+ * @param repository the name of the repository whose integrity to verify.
+ * @param metaThreadPoolConcurrency the number of concurrent tasks to execute on the {@link ThreadPool.Names#SNAPSHOT_META} pool, or
+ *                                  {@code 0} to use a sensible default.
+ * @param blobThreadPoolConcurrency the number of concurrent tasks to execute on the {@link ThreadPool.Names#SNAPSHOT} pool, or {@code 0}
+ *                                  to use a sensible default.
+ * @param snapshotVerificationConcurrency the number of snapshots to verify concurrently, or {@code 0} to use a sensible default.
+ * @param indexVerificationConcurrency the number of indices to verify concurrently, or {@code 0} to use a sensible default.
+ * @param indexSnapshotVerificationConcurrency the number of snapshots to verify concurrently for each index, or {@code 0} to use a sensible
+ *                                             default.
+ * @param maxFailedShardSnapshots the maximum number of shard snapshots failures to track - we must build a list of all of them in memory
+ *                                to avoid reporting spurious anomalies, and this can be overwhelming in a very broken repository.
+ * @param verifyBlobContents whether to verify the contents of each data blob (which is very expensive).
+ * @param maxBytesPerSec rate limit to use for blob contents verification.
+ */
+public record RepositoryVerifyIntegrityParams(
+    String repository,
+    int metaThreadPoolConcurrency,
+    int blobThreadPoolConcurrency,
+    int snapshotVerificationConcurrency,
+    int indexVerificationConcurrency,
+    int indexSnapshotVerificationConcurrency,
+    int maxFailedShardSnapshots,
+    boolean verifyBlobContents,
+    ByteSizeValue maxBytesPerSec
+) implements Writeable {
+
+    public static final String MAX_FAILED_SHARD_SNAPSHOTS = "max_failed_shard_snapshots";
+
+    public RepositoryVerifyIntegrityParams {
+        Objects.requireNonNull(repository, "repository");
+        requireNonNegative("meta_thread_pool_concurrency", metaThreadPoolConcurrency);
+        requireNonNegative("blob_thread_pool_concurrency", blobThreadPoolConcurrency);
+        requireNonNegative("snapshot_verification_concurrency", snapshotVerificationConcurrency);
+        requireNonNegative("index_verification_concurrency", indexVerificationConcurrency);
+        requireNonNegative("index_snapshot_verification_concurrency", indexSnapshotVerificationConcurrency);
+        requireNonNegative(MAX_FAILED_SHARD_SNAPSHOTS, maxFailedShardSnapshots);
+        if (maxBytesPerSec.getBytes() < 1) {
+            throw new IllegalArgumentException("invalid rate limit");
+        }
+    }
+
+    private static void requireNonNegative(String name, int value) {
+        if (value < 0) {
+            throw new IllegalArgumentException("argument [" + name + "] must be at least [0]");
+        }
+    }
+
+    RepositoryVerifyIntegrityParams(RestRequest restRequest) {
+        this(
+            restRequest.param("repository"),
+            restRequest.paramAsInt("meta_thread_pool_concurrency", 0),
+            restRequest.paramAsInt("blob_thread_pool_concurrency", 0),
+            restRequest.paramAsInt("snapshot_verification_concurrency", 0),
+            restRequest.paramAsInt("index_verification_concurrency", 0),
+            restRequest.paramAsInt("index_snapshot_verification_concurrency", 0),
+            restRequest.paramAsInt(MAX_FAILED_SHARD_SNAPSHOTS, 0),
+            restRequest.paramAsBoolean("verify_blob_contents", false),
+            restRequest.paramAsSize("max_bytes_per_sec", ByteSizeValue.ofMb(40))
+        );
+    }
+
+    RepositoryVerifyIntegrityParams(StreamInput in) throws IOException {
+        this(
+            in.readString(),
+            in.readVInt(),
+            in.readVInt(),
+            in.readVInt(),
+            in.readVInt(),
+            in.readVInt(),
+            in.readVInt(),
+            in.readBoolean(),
+            ByteSizeValue.readFrom(in)
+        );
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeString(repository);
+        out.writeVInt(metaThreadPoolConcurrency);
+        out.writeVInt(blobThreadPoolConcurrency);
+        out.writeVInt(snapshotVerificationConcurrency);
+        out.writeVInt(indexVerificationConcurrency);
+        out.writeVInt(indexSnapshotVerificationConcurrency);
+        out.writeVInt(maxFailedShardSnapshots);
+        out.writeBoolean(verifyBlobContents);
+        maxBytesPerSec.writeTo(out);
+    }
+
+    public RepositoryVerifyIntegrityParams withResolvedDefaults(ThreadPool.Info metadataThreadPoolInfo) {
+        if (metaThreadPoolConcurrency > 0
+            && blobThreadPoolConcurrency > 0
+            && snapshotVerificationConcurrency > 0
+            && indexVerificationConcurrency > 0
+            && indexSnapshotVerificationConcurrency > 0
+            && maxFailedShardSnapshots > 0) {
+            return this;
+        }
+
+        final var maxThreads = Math.max(1, metadataThreadPoolInfo.getMax());
+        final var halfMaxThreads = Math.max(1, maxThreads / 2);
+        return new RepositoryVerifyIntegrityParams(
+            repository,
+            metaThreadPoolConcurrency > 0 ? metaThreadPoolConcurrency : halfMaxThreads,
+            blobThreadPoolConcurrency > 0 ? blobThreadPoolConcurrency : 1,
+            snapshotVerificationConcurrency > 0 ? snapshotVerificationConcurrency : halfMaxThreads,
+            indexVerificationConcurrency > 0 ? indexVerificationConcurrency : maxThreads,
+            indexSnapshotVerificationConcurrency > 0 ? indexSnapshotVerificationConcurrency : 1,
+            maxFailedShardSnapshots > 0 ? maxFailedShardSnapshots : 10000,
+            verifyBlobContents,
+            maxBytesPerSec
+        );
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponse.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponse.java
new file mode 100644
index 000000000000..eff6ed7eb465
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponse.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+
+import java.io.IOException;
+
+public class RepositoryVerifyIntegrityResponse extends ActionResponse {
+    private final RepositoryVerifyIntegrityTask.Status finalTaskStatus;
+    private final long finalRepositoryGeneration;
+
+    RepositoryVerifyIntegrityResponse(RepositoryVerifyIntegrityTask.Status finalTaskStatus, long finalRepositoryGeneration) {
+        this.finalTaskStatus = finalTaskStatus;
+        this.finalRepositoryGeneration = finalRepositoryGeneration;
+    }
+
+    RepositoryVerifyIntegrityResponse(StreamInput in) throws IOException {
+        finalRepositoryGeneration = in.readLong();
+        finalTaskStatus = new RepositoryVerifyIntegrityTask.Status(in);
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeLong(finalRepositoryGeneration);
+        finalTaskStatus.writeTo(out);
+    }
+
+    public long finalRepositoryGeneration() {
+        return finalRepositoryGeneration;
+    }
+
+    public RepositoryVerifyIntegrityTask.Status finalTaskStatus() {
+        return finalTaskStatus;
+    }
+
+    public long originalRepositoryGeneration() {
+        return finalTaskStatus.repositoryGeneration();
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponseChunk.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponseChunk.java
new file mode 100644
index 000000000000..90130811c121
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponseChunk.java
@@ -0,0 +1,355 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
+import org.elasticsearch.common.unit.ByteSizeValue;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.repositories.IndexId;
+import org.elasticsearch.repositories.ShardGeneration;
+import org.elasticsearch.snapshots.SnapshotId;
+import org.elasticsearch.snapshots.SnapshotInfo;
+import org.elasticsearch.xcontent.ToXContentFragment;
+import org.elasticsearch.xcontent.XContentBuilder;
+
+import java.io.IOException;
+import java.util.Objects;
+
+/**
+ * A chunk of response to be streamed to the waiting client.
+ *
+ * @param type indicates the type of this chunk.
+ * @param anomaly a textual description of the anomaly found, or {@code null} if this chunk does not describe an anomaly.
+ * @param snapshotId the ID of the snapshot to which this chunk pertains, or {@code null} if this chunk does not pertain to a particular
+ *                  snapshot.
+ * @param snapshotInfo the raw {@link SnapshotInfo} for the snapshot, or {@code null}.
+ * @param indexDescription information about the index to which this chunk pertains, or {@code null} if this chunk does not pertain to
+ *                         a particular index.
+ * @param shardId the ID of the shard to which this chunk pertains, or {@code -1} if this chunk does not pertain to a particular shard.
+ * @param shardGeneration the {@link ShardGeneration} for the given shard, or {@code null} if not relevant.
+ * @param blobName the name of the blob to which this chunk pertains, or {@code null} if this chunk does not pertain to a particular blob.
+ * @param physicalFileName the name of the Lucene file to which this chunk pertains, or {@code null} if this chunk does not pertain to a
+ *                         particular Lucene file.
+ * @param partIndex the index of the part of the file represented by the blob to which this chunk pertains, or {@code -1} if this chunk does
+ *                  not pertain to a particular part.
+ * @param partCount the number of parts into which the file to which this chunk pertains is divided, or {@code -1} if not applicable.
+ * @param fileLength the length of the Lucene file to which this chunk pertains, or {@link ByteSizeValue#MINUS_ONE} if not applicable.
+ * @param partLength the length of the file part to which this chunk pertains, or {@link ByteSizeValue#MINUS_ONE} if not applicable.
+ * @param blobLength the length of the blob to which this chunk pertains, or {@link ByteSizeValue#MINUS_ONE} if not applicable.
+ * @param totalSnapshotCount the total number of snapshots which involve the index to which this chunk pertains, or {@code -1} if not
+ *                           applicable.
+ * @param restorableSnapshotCount the number of restorable snapshots which involve the index to which this chunk pertains, or {@code -1} if
+ *                                not applicable.
+ * @param exception an exception which relates to the failure described by this chunk, or {@code null} if not applicable.
+ */
+public record RepositoryVerifyIntegrityResponseChunk(
+    long timestampMillis,
+    Type type,
+    @Nullable String anomaly,
+    @Nullable SnapshotId snapshotId,
+    @Nullable SnapshotInfo snapshotInfo,
+    @Nullable IndexDescription indexDescription,
+    int shardId,
+    @Nullable ShardGeneration shardGeneration,
+    @Nullable String blobName,
+    @Nullable String physicalFileName,
+    int partIndex,
+    int partCount,
+    ByteSizeValue fileLength,
+    ByteSizeValue partLength,
+    ByteSizeValue blobLength,
+    int totalSnapshotCount,
+    int restorableSnapshotCount,
+    @Nullable Exception exception
+) implements Writeable, ToXContentFragment {
+
+    public enum Type {
+        /**
+         * The first chunk sent. Used to indicate that the verification has successfully started, and therefore we should start to send a
+         * 200 OK response to the client.
+         */
+        START_RESPONSE,
+
+        /**
+         * This chunk contains the raw {@link SnapshotInfo} for a snapshot.
+         */
+        SNAPSHOT_INFO,
+
+        /**
+         * This chunk contains information about the restorability of an index.
+         */
+        INDEX_RESTORABILITY,
+
+        /**
+         * This chunk describes an anomaly found during verification.
+         */
+        ANOMALY,
+    }
+
+    public RepositoryVerifyIntegrityResponseChunk {
+        if (fileLength == null
+            || partLength == null
+            || blobLength == null
+            || shardId < -1
+            || partIndex < -1
+            || partCount < -1
+            || totalSnapshotCount < -1
+            || restorableSnapshotCount < -1
+            || (totalSnapshotCount >= 0 != restorableSnapshotCount >= 0)) {
+            throw new IllegalArgumentException("invalid: " + this);
+        }
+    }
+
+    public RepositoryVerifyIntegrityResponseChunk(StreamInput in) throws IOException {
+        this(
+            in.readVLong(),
+            // TODO enum serialization tests
+            in.readEnum(Type.class),
+            in.readOptionalString(),
+            in.readOptionalWriteable(SnapshotId::new),
+            in.readOptionalWriteable(SnapshotInfo::readFrom),
+            in.readOptionalWriteable(IndexDescription::new),
+            in.readInt(),
+            in.readOptionalWriteable(ShardGeneration::new),
+            in.readOptionalString(),
+            in.readOptionalString(),
+            in.readInt(),
+            in.readInt(),
+            ByteSizeValue.readFrom(in),
+            ByteSizeValue.readFrom(in),
+            ByteSizeValue.readFrom(in),
+            in.readInt(),
+            in.readInt(),
+            in.readOptional(StreamInput::readException)
+        );
+    }
+
+    @Override
+    public void writeTo(StreamOutput out) throws IOException {
+        out.writeVLong(timestampMillis);
+        out.writeEnum(type);
+        out.writeOptionalString(anomaly);
+        out.writeOptionalWriteable(snapshotId);
+        out.writeOptionalWriteable(snapshotInfo);
+        out.writeOptionalWriteable(indexDescription);
+        out.writeInt(shardId);
+        out.writeOptionalWriteable(shardGeneration);
+        out.writeOptionalString(blobName);
+        out.writeOptionalString(physicalFileName);
+        out.writeInt(partIndex);
+        out.writeInt(partCount);
+        fileLength.writeTo(out);
+        partLength.writeTo(out);
+        blobLength.writeTo(out);
+        out.writeInt(totalSnapshotCount);
+        out.writeInt(restorableSnapshotCount);
+        out.writeOptional(StreamOutput::writeException, exception);
+    }
+
+    @Override
+    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+        builder.timeField("timestamp_in_millis", "timestamp", timestampMillis);
+
+        if (anomaly() != null) {
+            builder.field("anomaly", anomaly());
+        }
+
+        if (snapshotInfo() != null) {
+            builder.field("snapshot");
+            snapshotInfo().toXContentExternal(builder, params);
+        } else if (snapshotId() != null) {
+            builder.startObject("snapshot");
+            builder.field("snapshot", snapshotId().getName());
+            builder.field("uuid", snapshotId().getUUID());
+            builder.endObject();
+        }
+
+        if (indexDescription() != null) {
+            builder.field("index", indexDescription(), params);
+        }
+        if (shardId() >= 0) {
+            builder.field("shard_id", shardId());
+        }
+        if (shardGeneration() != null) {
+            builder.field("shard_generation", shardGeneration(), params);
+        }
+        if (blobName() != null) {
+            builder.field("blob_name", blobName());
+        }
+        if (physicalFileName() != null) {
+            builder.field("physical_file_name", physicalFileName());
+        }
+        if (partIndex() >= 0) {
+            builder.field("part_index", partIndex());
+        }
+        if (partCount() >= 0) {
+            builder.field("part_count", partCount());
+        }
+        if (fileLength() != ByteSizeValue.MINUS_ONE) {
+            builder.humanReadableField("file_length_in_bytes", "file_length", fileLength());
+        }
+        if (partLength() != ByteSizeValue.MINUS_ONE) {
+            builder.humanReadableField("part_length_in_bytes", "part_length", partLength());
+        }
+        if (blobLength() != ByteSizeValue.MINUS_ONE) {
+            builder.humanReadableField("blob_length_in_bytes", "blob_length", blobLength());
+        }
+        if (totalSnapshotCount() >= 0 && restorableSnapshotCount() >= 0) {
+            builder.startObject("snapshot_restorability");
+            builder.field("total_snapshot_count", totalSnapshotCount());
+            builder.field("restorable_snapshot_count", restorableSnapshotCount());
+            builder.endObject();
+        }
+        if (exception() != null) {
+            builder.startObject("exception")
+                .value((bb, pp) -> ElasticsearchException.generateFailureXContent(bb, pp, exception(), true))
+                .field("status", ExceptionsHelper.status(exception()))
+                .endObject();
+        }
+        return builder;
+    }
+
+    static class Builder {
+        private final Writer responseWriter;
+        private final Type type;
+        private final long timestampMillis;
+
+        private String anomaly;
+        private SnapshotId snapshotId;
+        private SnapshotInfo snapshotInfo;
+        private IndexDescription indexDescription;
+        private int shardId = -1;
+        private ShardGeneration shardGeneration;
+        private String blobName;
+        private String physicalFileName;
+        private int partIndex = -1;
+        private int partCount = -1;
+        private ByteSizeValue fileLength = ByteSizeValue.MINUS_ONE;
+        private ByteSizeValue partLength = ByteSizeValue.MINUS_ONE;
+        private ByteSizeValue blobLength = ByteSizeValue.MINUS_ONE;
+        private int totalSnapshotCount = -1;
+        private int restorableSnapshotCount = -1;
+        private Exception exception;
+
+        Builder(Writer responseWriter, Type type, long timestampMillis) {
+            this.responseWriter = responseWriter;
+            this.type = type;
+            this.timestampMillis = timestampMillis;
+        }
+
+        Builder anomaly(String anomaly) {
+            this.anomaly = anomaly;
+            return this;
+        }
+
+        Builder snapshotId(SnapshotId snapshotId) {
+            this.snapshotId = snapshotId;
+            return this;
+        }
+
+        Builder snapshotInfo(SnapshotInfo snapshotInfo) {
+            this.snapshotInfo = snapshotInfo;
+            return this;
+        }
+
+        Builder indexDescription(IndexDescription indexDescription) {
+            this.indexDescription = indexDescription;
+            return this;
+        }
+
+        Builder shardDescription(IndexDescription indexDescription, int shardId) {
+            this.indexDescription = indexDescription;
+            this.shardId = shardId;
+            return this;
+        }
+
+        Builder shardGeneration(ShardGeneration shardGeneration) {
+            this.shardGeneration = shardGeneration;
+            return this;
+        }
+
+        Builder blobName(String blobName, String physicalFileName) {
+            this.blobName = blobName;
+            this.physicalFileName = physicalFileName;
+            return this;
+        }
+
+        Builder physicalFileName(String physicalFileName) {
+            this.physicalFileName = physicalFileName;
+            return this;
+        }
+
+        Builder part(int partIndex, int partCount) {
+            this.partIndex = partIndex;
+            this.partCount = partCount;
+            return this;
+        }
+
+        Builder fileLength(ByteSizeValue fileLength) {
+            this.fileLength = Objects.requireNonNull(fileLength);
+            return this;
+        }
+
+        Builder partLength(ByteSizeValue partLength) {
+            this.partLength = Objects.requireNonNull(partLength);
+            return this;
+        }
+
+        Builder blobLength(ByteSizeValue blobLength) {
+            this.blobLength = Objects.requireNonNull(blobLength);
+            return this;
+        }
+
+        Builder indexRestorability(IndexId indexId, int totalSnapshotCount, int restorableSnapshotCount) {
+            this.indexDescription = new IndexDescription(indexId, null, 0);
+            this.totalSnapshotCount = totalSnapshotCount;
+            this.restorableSnapshotCount = restorableSnapshotCount;
+            return this;
+        }
+
+        Builder exception(Exception exception) {
+            this.exception = exception;
+            return this;
+        }
+
+        void write(ActionListener<Void> listener) {
+            responseWriter.writeResponseChunk(
+                new RepositoryVerifyIntegrityResponseChunk(
+                    timestampMillis,
+                    type,
+                    anomaly,
+                    snapshotId,
+                    snapshotInfo,
+                    indexDescription,
+                    shardId,
+                    shardGeneration,
+                    blobName,
+                    physicalFileName,
+                    partIndex,
+                    partCount,
+                    fileLength,
+                    partLength,
+                    blobLength,
+                    totalSnapshotCount,
+                    restorableSnapshotCount,
+                    exception
+                ),
+                ActionListener.assertOnce(listener)
+            );
+        }
+    }
+
+    interface Writer {
+        void writeResponseChunk(RepositoryVerifyIntegrityResponseChunk responseChunk, ActionListener<Void> listener);
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponseStream.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponseStream.java
new file mode 100644
index 000000000000..7ea9bfe6f2b2
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityResponseStream.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.support.SubscribableListener;
+import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
+import org.elasticsearch.core.AbstractRefCounted;
+import org.elasticsearch.core.Nullable;
+import org.elasticsearch.core.Releasable;
+import org.elasticsearch.core.Releasables;
+import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.logging.Logger;
+import org.elasticsearch.rest.RestChannel;
+import org.elasticsearch.rest.RestResponse;
+import org.elasticsearch.rest.StreamingXContentResponse;
+
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Represents a (possibly-streaming) response to the repository-verify-integrity API.
+ */
+class RepositoryVerifyIntegrityResponseStream extends AbstractRefCounted {
+    // ref-counting discipline:
+    // - one ref added at creation in the REST layer and released there by the listener returned from getCompletionListener()
+    // - one ref held for every response chunk while it is being added to the fragment queue
+    // thus when all refs are released the transport-layer coordinating action is complete and no more trailing fragments can be added,
+    // so we can send the last response fragment.
+
+    private static final Logger logger = LogManager.getLogger(RepositoryVerifyIntegrityResponseStream.class);
+
+    private final RestChannel restChannel;
+
+    private final SubscribableListener<RepositoryVerifyIntegrityResponse> finalResultListener = new SubscribableListener<>();
+
+    // the listener exposed to the transport response handler
+    private final ActionListener<RepositoryVerifyIntegrityResponse> completionListener = ActionListener.assertOnce(
+        ActionListener.releaseAfter(finalResultListener, this::decRef)
+    );
+
+    // set in startResponse() which completes before any calls to writeChunk() or closeInternal() so no need to be volatile
+    @Nullable // if not yet started
+    private StreamingXContentResponse streamingXContentResponse;
+
+    private final AtomicLong anomalyCount = new AtomicLong();
+
+    RepositoryVerifyIntegrityResponseStream(RestChannel restChannel) {
+        this.restChannel = restChannel;
+    }
+
+    void startResponse(Releasable releasable) throws IOException {
+        assert hasReferences();
+        assert streamingXContentResponse == null;
+        streamingXContentResponse = new StreamingXContentResponse(restChannel, restChannel.request(), () -> {});
+        streamingXContentResponse.writeFragment(
+            p0 -> ChunkedToXContentHelper.singleChunk((b, p) -> b.startObject().startArray("log")),
+            releasable
+        );
+    }
+
+    void writeChunk(RepositoryVerifyIntegrityResponseChunk chunk, Releasable releasable) {
+        assert hasReferences();
+        assert streamingXContentResponse != null;
+
+        if (chunk.type() == RepositoryVerifyIntegrityResponseChunk.Type.ANOMALY) {
+            anomalyCount.incrementAndGet();
+        }
+        streamingXContentResponse.writeFragment(
+            p0 -> ChunkedToXContentHelper.singleChunk((b, p) -> b.startObject().value(chunk, p).endObject()),
+            releasable
+        );
+    }
+
+    @Override
+    protected void closeInternal() {
+        try {
+            assert finalResultListener.isDone();
+            finalResultListener.addListener(new ActionListener<>() {
+                @Override
+                public void onResponse(RepositoryVerifyIntegrityResponse repositoryVerifyIntegrityResponse) {
+                    // success - finish the response with the final results
+                    assert streamingXContentResponse != null;
+                    streamingXContentResponse.writeFragment(
+                        p0 -> ChunkedToXContentHelper.singleChunk(
+                            (b, p) -> b.endArray()
+                                .startObject("results")
+                                .field("status", repositoryVerifyIntegrityResponse.finalTaskStatus())
+                                .field("final_repository_generation", repositoryVerifyIntegrityResponse.finalRepositoryGeneration())
+                                .field("total_anomalies", anomalyCount.get())
+                                .field(
+                                    "result",
+                                    anomalyCount.get() == 0
+                                        ? repositoryVerifyIntegrityResponse
+                                            .originalRepositoryGeneration() == repositoryVerifyIntegrityResponse.finalRepositoryGeneration()
+                                                ? "pass"
+                                                : "inconclusive due to concurrent writes"
+                                        : "fail"
+                                )
+                                .endObject()
+                                .endObject()
+                        ),
+                        () -> {}
+                    );
+                }
+
+                @Override
+                public void onFailure(Exception e) {
+                    if (streamingXContentResponse != null) {
+                        // failure after starting the response - finish the response with a rendering of the final exception
+                        streamingXContentResponse.writeFragment(
+                            p0 -> ChunkedToXContentHelper.singleChunk(
+                                (b, p) -> b.endArray()
+                                    .startObject("exception")
+                                    .value((bb, pp) -> ElasticsearchException.generateFailureXContent(bb, pp, e, true))
+                                    .field("status", ExceptionsHelper.status(e))
+                                    .endObject()
+                                    .endObject()
+                            ),
+                            () -> {}
+                        );
+                    } else {
+                        // didn't even get as far as starting to stream the response, must have hit an early exception (e.g. repo not found)
+                        // so we can return this exception directly.
+                        try {
+                            restChannel.sendResponse(new RestResponse(restChannel, e));
+                        } catch (IOException e2) {
+                            e.addSuppressed(e2);
+                            logger.error("error building error response", e);
+                            assert false : e; // shouldn't actually throw anything here
+                            restChannel.request().getHttpChannel().close();
+                        }
+                    }
+                }
+            });
+        } finally {
+            Releasables.closeExpectNoException(streamingXContentResponse);
+        }
+    }
+
+    public ActionListener<RepositoryVerifyIntegrityResponse> getCompletionListener() {
+        return completionListener;
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityTask.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityTask.java
new file mode 100644
index 000000000000..eaae913fe9c6
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryVerifyIntegrityTask.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.unit.ByteSizeValue;
+import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.tasks.CancellableTask;
+import org.elasticsearch.tasks.TaskId;
+import org.elasticsearch.xcontent.XContentBuilder;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+public class RepositoryVerifyIntegrityTask extends CancellableTask {
+
+    private volatile Supplier<Status> statusSupplier;
+
+    public RepositoryVerifyIntegrityTask(
+        long id,
+        String type,
+        String action,
+        String description,
+        TaskId parentTaskId,
+        Map<String, String> headers
+    ) {
+        super(id, type, action, description, parentTaskId, headers);
+    }
+
+    public void setStatusSupplier(Supplier<Status> statusSupplier) {
+        this.statusSupplier = statusSupplier;
+    }
+
+    @Override
+    public Status getStatus() {
+        return Optional.ofNullable(statusSupplier).map(Supplier::get).orElse(null);
+    }
+
+    public record Status(
+        String repositoryName,
+        long repositoryGeneration,
+        String repositoryUUID,
+        long snapshotCount,
+        long snapshotsVerified,
+        long indexCount,
+        long indicesVerified,
+        long indexSnapshotCount,
+        long indexSnapshotsVerified,
+        long blobsVerified,
+        long blobBytesVerified,
+        long throttledNanos
+    ) implements org.elasticsearch.tasks.Task.Status {
+
+        public static String NAME = "verify_repository_integrity_status";
+
+        public Status(StreamInput in) throws IOException {
+            this(
+                in.readString(),
+                in.readVLong(),
+                in.readString(),
+                in.readVLong(),
+                in.readVLong(),
+                in.readVLong(),
+                in.readVLong(),
+                in.readVLong(),
+                in.readVLong(),
+                in.readVLong(),
+                in.readVLong(),
+                in.readVLong()
+            );
+        }
+
+        @Override
+        public void writeTo(StreamOutput out) throws IOException {
+            out.writeString(repositoryName);
+            out.writeVLong(repositoryGeneration);
+            out.writeString(repositoryUUID);
+            out.writeVLong(snapshotCount);
+            out.writeVLong(snapshotsVerified);
+            out.writeVLong(indexCount);
+            out.writeVLong(indicesVerified);
+            out.writeVLong(indexSnapshotCount);
+            out.writeVLong(indexSnapshotsVerified);
+            out.writeVLong(blobsVerified);
+            out.writeVLong(blobBytesVerified);
+            out.writeVLong(throttledNanos);
+        }
+
+        @Override
+        public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+            builder.startObject();
+            builder.startObject("repository");
+            builder.field("name", repositoryName);
+            builder.field("uuid", repositoryUUID);
+            builder.field("generation", repositoryGeneration);
+            builder.endObject();
+            builder.startObject("snapshots");
+            builder.field("verified", snapshotsVerified);
+            builder.field("total", snapshotCount);
+            builder.endObject();
+            builder.startObject("indices");
+            builder.field("verified", indicesVerified);
+            builder.field("total", indexCount);
+            builder.endObject();
+            builder.startObject("index_snapshots");
+            builder.field("verified", indexSnapshotsVerified);
+            builder.field("total", indexSnapshotCount);
+            builder.endObject();
+            builder.startObject("blobs");
+            builder.field("verified", blobsVerified);
+            if (throttledNanos > 0) {
+                builder.humanReadableField("verified_size_in_bytes", "verified_size", ByteSizeValue.ofBytes(blobBytesVerified));
+                builder.humanReadableField("throttled_time_in_millis", "throttled_time", TimeValue.timeValueNanos(throttledNanos));
+            }
+            builder.endObject();
+            builder.endObject();
+            return builder;
+        }
+
+        @Override
+        public String getWriteableName() {
+            return NAME;
+        }
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RestRepositoryVerifyIntegrityAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RestRepositoryVerifyIntegrityAction.java
new file mode 100644
index 000000000000..16cdb9140411
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RestRepositoryVerifyIntegrityAction.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.client.internal.node.NodeClient;
+import org.elasticsearch.features.NodeFeature;
+import org.elasticsearch.rest.BaseRestHandler;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.Scope;
+import org.elasticsearch.rest.ServerlessScope;
+import org.elasticsearch.rest.action.RestCancellableNodeClient;
+
+import java.util.List;
+
+import static org.elasticsearch.rest.RestRequest.Method.POST;
+
+@ServerlessScope(Scope.INTERNAL)
+public class RestRepositoryVerifyIntegrityAction extends BaseRestHandler {
+
+    public static final NodeFeature REPOSITORY_VERIFY_INTEGRITY_FEATURE = new NodeFeature("snapshot.repository_verify_integrity");
+
+    @Override
+    public List<Route> routes() {
+        return List.of(new Route(POST, "/_snapshot/{repository}/_verify_integrity"));
+    }
+
+    @Override
+    public String getName() {
+        return "repository_verify_integrity";
+    }
+
+    @Override
+    public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) {
+        final var requestParams = new RepositoryVerifyIntegrityParams(request);
+        return channel -> {
+            final var responseStream = new RepositoryVerifyIntegrityResponseStream(channel);
+            new RestCancellableNodeClient(client, request.getHttpChannel()).execute(
+                TransportRepositoryVerifyIntegrityCoordinationAction.INSTANCE,
+                new TransportRepositoryVerifyIntegrityCoordinationAction.Request(requestParams, responseStream),
+                responseStream.getCompletionListener()
+            );
+        };
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityAction.java
new file mode 100644
index 000000000000..aa29f8334131
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityAction.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionListenerResponseHandler;
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.support.ActionFilters;
+import org.elasticsearch.action.support.HandledTransportAction;
+import org.elasticsearch.action.support.SubscribableListener;
+import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.util.CancellableThreads;
+import org.elasticsearch.repositories.RepositoriesService;
+import org.elasticsearch.repositories.RepositoryData;
+import org.elasticsearch.repositories.blobstore.BlobStoreRepository;
+import org.elasticsearch.tasks.Task;
+import org.elasticsearch.tasks.TaskId;
+import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.Transport;
+import org.elasticsearch.transport.TransportRequestOptions;
+import org.elasticsearch.transport.TransportResponse;
+import org.elasticsearch.transport.TransportService;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Executor;
+import java.util.function.LongSupplier;
+
+/**
+ * Transport action that actually runs the {@link RepositoryIntegrityVerifier} and sends response chunks back to the coordinating node.
+ */
+class TransportRepositoryVerifyIntegrityAction extends HandledTransportAction<
+    TransportRepositoryVerifyIntegrityAction.Request,
+    RepositoryVerifyIntegrityResponse> {
+
+    // NB runs on the master because that's the expected place to read metadata blobs from the repository, but not an actual
+    // TransportMasterNodeAction since we don't want to retry on a master failover
+
+    static final String ACTION_NAME = TransportRepositoryVerifyIntegrityCoordinationAction.INSTANCE.name() + "[m]";
+    private final RepositoriesService repositoriesService;
+    private final TransportService transportService;
+    private final Executor executor;
+
+    TransportRepositoryVerifyIntegrityAction(
+        TransportService transportService,
+        RepositoriesService repositoriesService,
+        ActionFilters actionFilters,
+        Executor executor
+    ) {
+        super(ACTION_NAME, transportService, actionFilters, TransportRepositoryVerifyIntegrityAction.Request::new, executor);
+        this.repositoriesService = repositoriesService;
+        this.transportService = transportService;
+        this.executor = executor;
+    }
+
+    static class Request extends ActionRequest {
+        private final DiscoveryNode coordinatingNode;
+        private final long coordinatingTaskId;
+        private final RepositoryVerifyIntegrityParams requestParams;
+
+        Request(DiscoveryNode coordinatingNode, long coordinatingTaskId, RepositoryVerifyIntegrityParams requestParams) {
+            this.coordinatingNode = coordinatingNode;
+            this.coordinatingTaskId = coordinatingTaskId;
+            this.requestParams = Objects.requireNonNull(requestParams);
+        }
+
+        Request(StreamInput in) throws IOException {
+            super(in);
+            coordinatingNode = new DiscoveryNode(in);
+            coordinatingTaskId = in.readVLong();
+            requestParams = new RepositoryVerifyIntegrityParams(in);
+        }
+
+        @Override
+        public void writeTo(StreamOutput out) throws IOException {
+            super.writeTo(out);
+            coordinatingNode.writeTo(out);
+            out.writeVLong(coordinatingTaskId);
+            requestParams.writeTo(out);
+        }
+
+        @Override
+        public ActionRequestValidationException validate() {
+            return null;
+        }
+
+        @Override
+        public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
+            return new RepositoryVerifyIntegrityTask(id, type, action, getDescription(), parentTaskId, headers);
+        }
+    }
+
+    @Override
+    protected void doExecute(Task rawTask, Request request, ActionListener<RepositoryVerifyIntegrityResponse> listener) {
+        final var responseWriter = new RepositoryVerifyIntegrityResponseChunk.Writer() {
+
+            // no need to obtain a fresh connection each time - this connection shouldn't close, so if it does we can fail the verification
+            final Transport.Connection responseConnection = transportService.getConnection(request.coordinatingNode);
+
+            @Override
+            public void writeResponseChunk(RepositoryVerifyIntegrityResponseChunk responseChunk, ActionListener<Void> listener) {
+                transportService.sendChildRequest(
+                    responseConnection,
+                    TransportRepositoryVerifyIntegrityResponseChunkAction.ACTION_NAME,
+                    new TransportRepositoryVerifyIntegrityResponseChunkAction.Request(request.coordinatingTaskId, responseChunk),
+                    rawTask,
+                    TransportRequestOptions.EMPTY,
+                    new ActionListenerResponseHandler<TransportResponse>(
+                        listener.map(ignored -> null),
+                        in -> ActionResponse.Empty.INSTANCE,
+                        executor
+                    )
+                );
+            }
+        };
+
+        final LongSupplier currentTimeMillisSupplier = transportService.getThreadPool()::absoluteTimeInMillis;
+        final var repository = (BlobStoreRepository) repositoriesService.repository(request.requestParams.repository());
+        final var task = (RepositoryVerifyIntegrityTask) rawTask;
+
+        SubscribableListener
+
+            .<RepositoryData>newForked(l -> repository.getRepositoryData(executor, l))
+            .andThenApply(repositoryData -> {
+                final var cancellableThreads = new CancellableThreads();
+                task.addListener(() -> cancellableThreads.cancel("task cancelled"));
+                final var verifier = new RepositoryIntegrityVerifier(
+                    currentTimeMillisSupplier,
+                    repository,
+                    responseWriter,
+                    request.requestParams.withResolvedDefaults(repository.threadPool().info(ThreadPool.Names.SNAPSHOT_META)),
+                    repositoryData,
+                    cancellableThreads
+                );
+                task.setStatusSupplier(verifier::getStatus);
+                return verifier;
+            })
+            .<RepositoryIntegrityVerifier>andThen(
+                (l, repositoryIntegrityVerifier) -> new RepositoryVerifyIntegrityResponseChunk.Builder(
+                    responseWriter,
+                    RepositoryVerifyIntegrityResponseChunk.Type.START_RESPONSE,
+                    currentTimeMillisSupplier.getAsLong()
+                ).write(l.map(ignored -> repositoryIntegrityVerifier))
+            )
+            .<RepositoryVerifyIntegrityResponse>andThen((l, repositoryIntegrityVerifier) -> repositoryIntegrityVerifier.start(l))
+            .addListener(listener);
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityCoordinationAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityCoordinationAction.java
new file mode 100644
index 000000000000..d5a5749997d8
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityCoordinationAction.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionListenerResponseHandler;
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.ActionType;
+import org.elasticsearch.action.support.ActionFilters;
+import org.elasticsearch.action.support.TransportAction;
+import org.elasticsearch.cluster.service.ClusterService;
+import org.elasticsearch.discovery.MasterNotDiscoveredException;
+import org.elasticsearch.injection.guice.Inject;
+import org.elasticsearch.repositories.RepositoriesService;
+import org.elasticsearch.tasks.CancellableTask;
+import org.elasticsearch.tasks.Task;
+import org.elasticsearch.tasks.TaskId;
+import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.TransportRequestOptions;
+import org.elasticsearch.transport.TransportService;
+
+import java.util.Map;
+import java.util.concurrent.Executor;
+
+/**
+ * Transport action that coordinates the integrity verification, dispatching a request to run the verification on the master and setting up
+ * the machinery needed to send the response chunks back to the client.
+ */
+public class TransportRepositoryVerifyIntegrityCoordinationAction extends TransportAction<
+    TransportRepositoryVerifyIntegrityCoordinationAction.Request,
+    RepositoryVerifyIntegrityResponse> {
+
+    /*
+     * Message flow: the coordinating node (the one running this action) forwards the request on to a master node which actually runs the
+     * verification. The master node in turn sends requests back to this node containing chunks of response, either information about the
+     * snapshots processed, or about the restorability of the indices in the repository, or details of any verification anomalies found.
+     * When the process is complete the master responds to the original transport request with the final results:
+     *
+     * +---------+                         +-------------+                              +--------+
+     * | Client  |                         | Coordinator |                              | Master |
+     * +---------+                         +-------------+                              +--------+
+     *      |                                     |                                          |
+     *      |-[REST request]--------------------->|                                          |
+     *      |                                     |---[master node request]----------------->| ----------------------\
+     *      |                                     |                                          |-| Initialize verifier |
+     *      |                                     |                                          | |---------------------|
+     *      |                                     |<--[START_RESPONSE chunk request]---------|
+     *      |<---[headers & initial JSON body]----|                                          |
+     *      |                                     |---[START_RESPONSE chunk response]------->| ------------------\
+     *      |                                     |                                          |-| Verify snapshot |
+     *      |                                     |                                          | |-----------------|
+     *      |                                     |<--[SNAPSHOT_INFO chunk request]----------|
+     *      |<---[more JSON body]-----------------|                                          |
+     *      |                                     |---[SNAPSHOT_INFO chunk response]-------->| ------------------\
+     *      |                                     |                                          |-| Verify snapshot |
+     *      |                                     |                                          | |-----------------|
+     *      |                                     |<--[SNAPSHOT_INFO chunk request]----------|
+     *      |<---[more JSON body]-----------------|                                          |
+     *      |                                     |---[SNAPSHOT_INFO chunk response]-------->| ...
+     *      .                                     .                                          .
+     *      .                                     .                                          .
+     *      |                                     |                                          | -----------------------------\
+     *      |                                     |                                          |-| Verify index restorability |
+     *      |                                     |                                          | |----------------------------|
+     *      |                                     |<--[INDEX_RESTORABILITY chunk request]----|
+     *      |<---[more JSON body]-----------------|                                          |
+     *      |                                     |---[INDEX_RESTORABILITY chunk response]-->| -----------------------------\
+     *      |                                     |                                          |-| Verify index restorability |
+     *      |                                     |                                          | |----------------------------|
+     *      |                                     |<--[INDEX_RESTORABILITY chunk request]----|
+     *      |<---[more JSON body]-----------------|                                          |
+     *      |                                     |---[INDEX_RESTORABILITY chunk response]-->| ...
+     *      .                                     .                                          .
+     *      .                                     .                                          .
+     *      |                                     |<--[response to master node request]------|
+     *      |<--[final JSON to complete body]-----|                                          |
+     *
+     * This message flow ties the lifecycle of the verification process to that of the transport request sent from coordinator to master,
+     * which means it integrates well with the tasks framework and handles network issues properly. An alternative would be for the
+     * coordinator to repeatedly request chunks from the master, but that would mean that there's no one task representing the whole
+     * process, and it'd be a little tricky for the master node to know if the coordinator has failed and the verification should be
+     * cancelled.
+     */
+
+    public static final ActionType<RepositoryVerifyIntegrityResponse> INSTANCE = new ActionType<>(
+        "cluster:admin/repository/verify_integrity"
+    );
+
+    private final ActiveRepositoryVerifyIntegrityTasks activeRepositoryVerifyIntegrityTasks = new ActiveRepositoryVerifyIntegrityTasks();
+
+    private final TransportService transportService;
+    private final ClusterService clusterService;
+    private final Executor managementExecutor;
+
+    public static class Request extends ActionRequest {
+        private final RepositoryVerifyIntegrityParams requestParams;
+        private final RepositoryVerifyIntegrityResponseStream responseStream;
+
+        public Request(RepositoryVerifyIntegrityParams requestParams, RepositoryVerifyIntegrityResponseStream responseStream) {
+            this.requestParams = requestParams;
+            this.responseStream = responseStream;
+        }
+
+        @Override
+        public ActionRequestValidationException validate() {
+            return null;
+        }
+
+        public RepositoryVerifyIntegrityParams requestParams() {
+            return requestParams;
+        }
+
+        public RepositoryVerifyIntegrityResponseStream responseStream() {
+            return responseStream;
+        }
+
+        @Override
+        public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
+            return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers);
+        }
+    }
+
+    @Inject
+    public TransportRepositoryVerifyIntegrityCoordinationAction(
+        TransportService transportService,
+        ClusterService clusterService,
+        RepositoriesService repositoriesService,
+        ActionFilters actionFilters
+    ) {
+        super(
+            INSTANCE.name(),
+            actionFilters,
+            transportService.getTaskManager(),
+            transportService.getThreadPool().executor(ThreadPool.Names.MANAGEMENT)
+        );
+
+        this.transportService = transportService;
+        this.clusterService = clusterService;
+        this.managementExecutor = transportService.getThreadPool().executor(ThreadPool.Names.MANAGEMENT);
+
+        // register subsidiary actions
+        new TransportRepositoryVerifyIntegrityAction(transportService, repositoriesService, actionFilters, managementExecutor);
+
+        new TransportRepositoryVerifyIntegrityResponseChunkAction(
+            transportService,
+            actionFilters,
+            managementExecutor,
+            activeRepositoryVerifyIntegrityTasks
+        );
+    }
+
+    @Override
+    protected void doExecute(Task task, Request request, ActionListener<RepositoryVerifyIntegrityResponse> listener) {
+        ActionListener.run(
+            ActionListener.releaseAfter(
+                listener,
+                activeRepositoryVerifyIntegrityTasks.registerResponseBuilder(task.getId(), request.responseStream())
+            ),
+            l -> {
+                final var master = clusterService.state().nodes().getMasterNode();
+                if (master == null) {
+                    // no waiting around or retries here, we just fail immediately
+                    throw new MasterNotDiscoveredException();
+                }
+                transportService.sendChildRequest(
+                    master,
+                    TransportRepositoryVerifyIntegrityAction.ACTION_NAME,
+                    new TransportRepositoryVerifyIntegrityAction.Request(
+                        transportService.getLocalNode(),
+                        task.getId(),
+                        request.requestParams()
+                    ),
+                    task,
+                    TransportRequestOptions.EMPTY,
+                    new ActionListenerResponseHandler<>(l, RepositoryVerifyIntegrityResponse::new, managementExecutor)
+                );
+            }
+        );
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityResponseChunkAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityResponseChunkAction.java
new file mode 100644
index 000000000000..9015866fb3ec
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityResponseChunkAction.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.repositories.blobstore.testkit.integrity;
+
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.support.ActionFilters;
+import org.elasticsearch.action.support.HandledTransportAction;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.tasks.Task;
+import org.elasticsearch.transport.TransportService;
+
+import java.io.IOException;
+import java.util.Objects;
+import java.util.concurrent.Executor;
+
+/**
+ * Transport action that handles a response chunk on the coordinating node, sending it out to the REST client.
+ */
+class TransportRepositoryVerifyIntegrityResponseChunkAction extends HandledTransportAction<
+    TransportRepositoryVerifyIntegrityResponseChunkAction.Request,
+    ActionResponse.Empty> {
+
+    static final String ACTION_NAME = TransportRepositoryVerifyIntegrityCoordinationAction.INSTANCE.name() + "[response_chunk]";
+
+    private final ActiveRepositoryVerifyIntegrityTasks activeRepositoryVerifyIntegrityTasks;
+
+    TransportRepositoryVerifyIntegrityResponseChunkAction(
+        TransportService transportService,
+        ActionFilters actionFilters,
+        Executor executor,
+        ActiveRepositoryVerifyIntegrityTasks activeRepositoryVerifyIntegrityTasks
+    ) {
+        super(ACTION_NAME, transportService, actionFilters, Request::new, executor);
+        this.activeRepositoryVerifyIntegrityTasks = activeRepositoryVerifyIntegrityTasks;
+    }
+
+    static class Request extends ActionRequest {
+        private final long coordinatingTaskId;
+        private final RepositoryVerifyIntegrityResponseChunk chunkContents;
+
+        Request(long coordinatingTaskId, RepositoryVerifyIntegrityResponseChunk chunkContents) {
+            this.coordinatingTaskId = coordinatingTaskId;
+            this.chunkContents = Objects.requireNonNull(chunkContents);
+        }
+
+        Request(StreamInput in) throws IOException {
+            super(in);
+            coordinatingTaskId = in.readVLong();
+            chunkContents = new RepositoryVerifyIntegrityResponseChunk(in);
+        }
+
+        @Override
+        public void writeTo(StreamOutput out) throws IOException {
+            super.writeTo(out);
+            out.writeVLong(coordinatingTaskId);
+            chunkContents.writeTo(out);
+        }
+
+        @Override
+        public ActionRequestValidationException validate() {
+            return null;
+        }
+
+        public RepositoryVerifyIntegrityResponseChunk chunkContents() {
+            return chunkContents;
+        }
+    }
+
+    @Override
+    protected void doExecute(Task task, Request request, ActionListener<ActionResponse.Empty> listener) {
+        ActionListener.run(listener, l -> {
+            final var responseStream = activeRepositoryVerifyIntegrityTasks.acquireResponseStream(request.coordinatingTaskId);
+            try {
+                if (request.chunkContents().type() == RepositoryVerifyIntegrityResponseChunk.Type.START_RESPONSE) {
+                    responseStream.startResponse(() -> l.onResponse(ActionResponse.Empty.INSTANCE));
+                } else {
+                    responseStream.writeChunk(request.chunkContents(), () -> l.onResponse(ActionResponse.Empty.INSTANCE));
+                }
+            } finally {
+                responseStream.decRef();
+            }
+        });
+    }
+}
diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/resources/META-INF/services/org.elasticsearch.features.FeatureSpecification b/x-pack/plugin/snapshot-repo-test-kit/src/main/resources/META-INF/services/org.elasticsearch.features.FeatureSpecification
new file mode 100644
index 000000000000..ae11c3bb39d0
--- /dev/null
+++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/resources/META-INF/services/org.elasticsearch.features.FeatureSpecification
@@ -0,0 +1,8 @@
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License
+# 2.0; you may not use this file except in compliance with the Elastic License
+# 2.0.
+#
+
+org.elasticsearch.repositories.blobstore.testkit.SnapshotRepositoryTestKitFeatures
diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoBoundingBoxQueryLegacyGeoShapeWithDocValuesIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoBoundingBoxQueryLegacyGeoShapeWithDocValuesIT.java
index 296af0c98327..2c92d5387d87 100644
--- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoBoundingBoxQueryLegacyGeoShapeWithDocValuesIT.java
+++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoBoundingBoxQueryLegacyGeoShapeWithDocValuesIT.java
@@ -7,6 +7,8 @@
 
 package org.elasticsearch.xpack.spatial.search;
 
+import org.apache.lucene.tests.util.LuceneTestCase;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.plugins.Plugin;
@@ -20,6 +22,8 @@
 import java.util.Collection;
 import java.util.Collections;
 
+@UpdateForV9
+@LuceneTestCase.AwaitsFix(bugUrl = "this is testing legacy functionality so can likely be removed in 9.0")
 public class GeoBoundingBoxQueryLegacyGeoShapeWithDocValuesIT extends GeoBoundingBoxQueryIntegTestCase {
 
     @Override
diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java
index 3cf70b1d477b..b48f5a8c17e9 100644
--- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java
+++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java
@@ -7,6 +7,8 @@
 
 package org.elasticsearch.xpack.spatial.search;
 
+import org.apache.lucene.tests.util.LuceneTestCase;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.geometry.Circle;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -27,6 +29,8 @@
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
 import static org.hamcrest.Matchers.containsString;
 
+@UpdateForV9
+@LuceneTestCase.AwaitsFix(bugUrl = "this is testing legacy functionality so can likely be removed in 9.0")
 public class LegacyGeoShapeWithDocValuesIT extends GeoShapeIntegTestCase {
 
     @Override
diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java
index 04b194c2ec20..23505eda493a 100644
--- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java
+++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapper.java
@@ -111,7 +111,7 @@ public static final class Builder extends FieldMapper.Builder {
         final Parameter<Explicit<Boolean>> coerce;
         final Parameter<Explicit<Orientation>> orientation = orientationParam(m -> builder(m).orientation.get());
         private final Parameter<Script> script = Parameter.scriptParam(m -> builder(m).script.get());
-        private final Parameter<OnScriptError> onScriptError = Parameter.onScriptErrorParam(m -> builder(m).onScriptError.get(), script);
+        private final Parameter<OnScriptError> onScriptErrorParam = Parameter.onScriptErrorParam(m -> builder(m).onScriptError, script);
         final Parameter<Map<String, String>> meta = Parameter.metaParam();
         private final ScriptCompiler scriptCompiler;
         private final IndexVersion version;
@@ -152,7 +152,7 @@ protected Parameter<?>[] getParameters() {
                 coerce,
                 orientation,
                 script,
-                onScriptError,
+                onScriptErrorParam,
                 meta };
         }
 
@@ -194,29 +194,17 @@ public GeoShapeWithDocValuesFieldMapper build(MapperBuilderContext context) {
                 geoFormatterFactory,
                 meta.get()
             );
-            if (script.get() == null) {
-                return new GeoShapeWithDocValuesFieldMapper(
-                    leafName(),
-                    ft,
-                    multiFieldsBuilder.build(this, context),
-                    copyTo,
-                    new GeoShapeIndexer(orientation.get().value(), ft.name()),
-                    parser,
-                    this
-                );
-            }
+            hasScript = script.get() != null;
+            onScriptError = onScriptErrorParam.get();
             return new GeoShapeWithDocValuesFieldMapper(
                 leafName(),
                 ft,
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 new GeoShapeIndexer(orientation.get().value(), ft.name()),
                 parser,
-                onScriptError.get(),
                 this
             );
         }
-
     }
 
     public static final class GeoShapeWithDocValuesFieldType extends AbstractShapeGeometryFieldType<Geometry> implements GeoShapeQueryable {
@@ -365,8 +353,7 @@ public Mapper.Builder parse(String name, Map<String, Object> node, MappingParser
     public GeoShapeWithDocValuesFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         GeoShapeIndexer indexer,
         GeoShapeParser parser,
         Builder builder
@@ -374,33 +361,17 @@ public GeoShapeWithDocValuesFieldMapper(
         super(
             simpleName,
             mappedFieldType,
+            builderParams,
             builder.ignoreMalformed.get(),
             builder.coerce.get(),
             builder.ignoreZValue.get(),
             builder.orientation.get(),
-            multiFields,
-            copyTo,
             parser
         );
         this.builder = builder;
         this.indexer = indexer;
     }
 
-    protected GeoShapeWithDocValuesFieldMapper(
-        String simpleName,
-        MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
-        GeoShapeIndexer indexer,
-        Parser<Geometry> parser,
-        OnScriptError onScriptError,
-        Builder builder
-    ) {
-        super(simpleName, mappedFieldType, multiFields, builder.coerce.get(), builder.orientation.get(), copyTo, parser, onScriptError);
-        this.builder = builder;
-        this.indexer = indexer;
-    }
-
     @Override
     protected void index(DocumentParserContext context, Geometry geometry) {
         // TODO: Make common with the index method ShapeFieldMapper
diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java
index 2901e374003d..50221d838e05 100644
--- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java
+++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/PointFieldMapper.java
@@ -116,7 +116,7 @@ public FieldMapper build(MapperBuilderContext context) {
                 nullValue.get(),
                 meta.get()
             );
-            return new PointFieldMapper(leafName(), ft, multiFieldsBuilder.build(this, context), copyTo, parser, this);
+            return new PointFieldMapper(leafName(), ft, builderParams(this, context), parser, this);
         }
 
     }
@@ -128,19 +128,17 @@ public FieldMapper build(MapperBuilderContext context) {
     public PointFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         CartesianPointParser parser,
         Builder builder
     ) {
         super(
             simpleName,
             mappedFieldType,
-            multiFields,
+            builderParams,
             builder.ignoreMalformed.get(),
             builder.ignoreZValue.get(),
             builder.nullValue.get(),
-            copyTo,
             parser
         );
         this.builder = builder;
diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java
index 0ea8c3e22e28..e5d5354327f5 100644
--- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java
+++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapper.java
@@ -122,7 +122,7 @@ public ShapeFieldMapper build(MapperBuilderContext context) {
                 parser,
                 meta.get()
             );
-            return new ShapeFieldMapper(leafName(), ft, multiFieldsBuilder.build(this, context), copyTo, parser, this);
+            return new ShapeFieldMapper(leafName(), ft, builderParams(this, context), parser, this);
         }
     }
 
@@ -192,20 +192,18 @@ protected Function<List<Geometry>, List<Object>> getFormatter(String format) {
     public ShapeFieldMapper(
         String simpleName,
         MappedFieldType mappedFieldType,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         Parser<Geometry> parser,
         Builder builder
     ) {
         super(
             simpleName,
             mappedFieldType,
+            builderParams,
             builder.ignoreMalformed.get(),
             builder.coerce.get(),
             builder.ignoreZValue.get(),
             builder.orientation.get(),
-            multiFields,
-            copyTo,
             parser
         );
         this.builder = builder;
diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapperTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapperTests.java
index 5999a3ff1e15..0e04cfe6757b 100644
--- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapperTests.java
+++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/GeoShapeWithDocValuesFieldMapperTests.java
@@ -10,6 +10,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.geo.Orientation;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.geometry.Geometry;
 import org.elasticsearch.geometry.utils.GeometryValidator;
 import org.elasticsearch.geometry.utils.WellKnownBinary;
@@ -91,16 +92,6 @@ public void testDefaultConfiguration() throws IOException {
         assertTrue(fieldType.hasDocValues());
     }
 
-    public void testDefaultDocValueConfigurationOnPre7_8() throws IOException {
-        IndexVersion oldVersion = IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_7_7_0);
-        DocumentMapper defaultMapper = createDocumentMapper(oldVersion, fieldMapping(this::minimalMapping));
-        Mapper fieldMapper = defaultMapper.mappers().getMapper(FIELD_NAME);
-        assertThat(fieldMapper, instanceOf(fieldMapperClass()));
-
-        GeoShapeWithDocValuesFieldMapper geoShapeFieldMapper = (GeoShapeWithDocValuesFieldMapper) fieldMapper;
-        assertFalse(geoShapeFieldMapper.fieldType().hasDocValues());
-    }
-
     /**
      * Test that orientation parameter correctly parses
      */
@@ -289,6 +280,8 @@ public void testInvalidCurrentVersion() {
         );
     }
 
+    @UpdateForV9
+    @AwaitsFix(bugUrl = "this is testing legacy functionality so can likely be removed in 9.0")
     public void testGeoShapeLegacyMerge() throws Exception {
         IndexVersion version = IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.V_8_0_0);
         MapperService m = createMapperService(version, fieldMapping(b -> b.field("type", getFieldName())));
diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapperTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapperTests.java
index 35ccfe8deb5f..d030a2bbf81a 100644
--- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapperTests.java
+++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/mapper/ShapeFieldMapperTests.java
@@ -114,7 +114,7 @@ public void testDefaultConfiguration() throws IOException {
 
     public void testDefaultDocValueConfigurationOnPre8_4() throws IOException {
         // TODO verify which version this test is actually valid for (when PR is actually merged)
-        IndexVersion oldVersion = IndexVersionUtils.randomVersionBetween(random(), IndexVersions.V_7_0_0, IndexVersions.V_8_3_0);
+        IndexVersion oldVersion = IndexVersionUtils.randomVersionBetween(random(), IndexVersions.MINIMUM_COMPATIBLE, IndexVersions.V_8_3_0);
         DocumentMapper defaultMapper = createDocumentMapper(oldVersion, fieldMapping(this::minimalMapping));
         Mapper fieldMapper = defaultMapper.mappers().getMapper(FIELD_NAME);
         assertThat(fieldMapper, instanceOf(fieldMapperClass()));
diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/GeoShapeQueryBuilderGeoShapeTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/GeoShapeQueryBuilderGeoShapeTests.java
index 593656411eb4..405ef5c48068 100644
--- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/GeoShapeQueryBuilderGeoShapeTests.java
+++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/GeoShapeQueryBuilderGeoShapeTests.java
@@ -13,7 +13,6 @@
 import org.elasticsearch.geo.GeometryTestUtils;
 import org.elasticsearch.geometry.Geometry;
 import org.elasticsearch.geometry.ShapeType;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.GeoShapeQueryBuilder;
 import org.elasticsearch.index.query.SearchExecutionContext;
@@ -88,25 +87,12 @@ protected GeoShapeQueryBuilder doCreateTestQueryBuilder(boolean indexedShape) {
         }
         if (ESTestCase.randomBoolean()) {
             SearchExecutionContext context = AbstractBuilderTestCase.createSearchExecutionContext();
-            if (context.indexVersionCreated().onOrAfter(IndexVersions.V_7_5_0)) { // CONTAINS is only supported from version 7.5
-                if (shapeType == ShapeType.LINESTRING || shapeType == ShapeType.MULTILINESTRING) {
-                    builder.relation(ESTestCase.randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.CONTAINS));
-                } else {
-                    builder.relation(
-                        ESTestCase.randomFrom(
-                            ShapeRelation.DISJOINT,
-                            ShapeRelation.INTERSECTS,
-                            ShapeRelation.WITHIN,
-                            ShapeRelation.CONTAINS
-                        )
-                    );
-                }
+            if (shapeType == ShapeType.LINESTRING || shapeType == ShapeType.MULTILINESTRING) {
+                builder.relation(ESTestCase.randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.CONTAINS));
             } else {
-                if (shapeType == ShapeType.LINESTRING || shapeType == ShapeType.MULTILINESTRING) {
-                    builder.relation(ESTestCase.randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS));
-                } else {
-                    builder.relation(ESTestCase.randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.WITHIN));
-                }
+                builder.relation(
+                    ESTestCase.randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.WITHIN, ShapeRelation.CONTAINS)
+                );
             }
         }
 
diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/LegacyGeoShapeWithDocValuesQueryTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/LegacyGeoShapeWithDocValuesQueryTests.java
index 053931a882e4..de66d0b822c9 100644
--- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/LegacyGeoShapeWithDocValuesQueryTests.java
+++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/LegacyGeoShapeWithDocValuesQueryTests.java
@@ -7,9 +7,11 @@
 
 package org.elasticsearch.xpack.spatial.index.query;
 
+import org.apache.lucene.tests.util.LuceneTestCase;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.geo.GeoJson;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.geo.GeometryTestUtils;
 import org.elasticsearch.geometry.Geometry;
 import org.elasticsearch.geometry.MultiPoint;
@@ -39,6 +41,8 @@
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.containsString;
 
+@UpdateForV9
+@LuceneTestCase.AwaitsFix(bugUrl = "this is testing legacy functionality so can likely be removed in 9.0")
 public class LegacyGeoShapeWithDocValuesQueryTests extends GeoShapeQueryTestCase {
 
     @SuppressWarnings("deprecation")
diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryBuilderOverShapeTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryBuilderOverShapeTests.java
index aa5ae72df2b9..72073a6eff55 100644
--- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryBuilderOverShapeTests.java
+++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/ShapeQueryBuilderOverShapeTests.java
@@ -13,7 +13,6 @@
 import org.elasticsearch.geo.ShapeTestUtils;
 import org.elasticsearch.geometry.Geometry;
 import org.elasticsearch.geometry.ShapeType;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.query.SearchExecutionContext;
 
@@ -33,18 +32,10 @@ protected void initializeAdditionalMappings(MapperService mapperService) throws
     @Override
     protected ShapeRelation getShapeRelation(ShapeType type) {
         SearchExecutionContext context = createSearchExecutionContext();
-        if (context.indexVersionCreated().onOrAfter(IndexVersions.V_7_5_0)) { // CONTAINS is only supported from version 7.5
-            if (type == ShapeType.LINESTRING || type == ShapeType.MULTILINESTRING) {
-                return randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.CONTAINS);
-            } else {
-                return randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.WITHIN, ShapeRelation.CONTAINS);
-            }
+        if (type == ShapeType.LINESTRING || type == ShapeType.MULTILINESTRING) {
+            return randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.CONTAINS);
         } else {
-            if (type == ShapeType.LINESTRING || type == ShapeType.MULTILINESTRING) {
-                return randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS);
-            } else {
-                return randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.WITHIN);
-            }
+            return randomFrom(ShapeRelation.DISJOINT, ShapeRelation.INTERSECTS, ShapeRelation.WITHIN, ShapeRelation.CONTAINS);
         }
     }
 
diff --git a/x-pack/plugin/sql/qa/jdbc/build.gradle b/x-pack/plugin/sql/qa/jdbc/build.gradle
index 42bf524dac17..022306fe9b30 100644
--- a/x-pack/plugin/sql/qa/jdbc/build.gradle
+++ b/x-pack/plugin/sql/qa/jdbc/build.gradle
@@ -72,7 +72,7 @@ subprojects {
 
     // Configure compatibility testing tasks
     // Compatibility testing for JDBC driver started with version 7.9.0
-    BuildParams.bwcVersions.allIndexCompatible.findAll({ it.onOrAfter(Version.fromString("7.9.0")) && it != VersionProperties.elasticsearchVersion }).each { bwcVersion ->
+    BuildParams.bwcVersions.indexCompatible.findAll({ it.onOrAfter(Version.fromString("7.9.0")) && it != VersionProperties.elasticsearchVersion }).each { bwcVersion ->
       def baseName = "v${bwcVersion}"
       def cluster = testClusters.register(baseName)
 
diff --git a/x-pack/plugin/sql/qa/server/src/main/resources/case-functions.sql-spec b/x-pack/plugin/sql/qa/server/src/main/resources/case-functions.sql-spec
index 2a856c6d0840..d7de6d8a4a17 100644
--- a/x-pack/plugin/sql/qa/server/src/main/resources/case-functions.sql-spec
+++ b/x-pack/plugin/sql/qa/server/src/main/resources/case-functions.sql-spec
@@ -21,7 +21,7 @@ ucaseInline3
 SELECT UCASE(' elastic ') upper;
 
 multipleGroupingsAndOrderingByGroupsWithFunctions_1
-SELECT first_name f, last_name l, gender g, CONCAT(UCASE(first_name), LCASE(last_name)) c FROM test_emp GROUP BY gender, l, f, c ORDER BY c DESC, first_name, l ASC, g;
+SELECT first_name f, last_name l, gender g, CONCAT(UCASE(first_name), LCASE(last_name)) c FROM test_emp WHERE emp_no IN (10003, 10009, 10023, 10024, 10025, 10029, 10030, 10033, 10034, 10035) GROUP BY gender, l, f, c ORDER BY c DESC, first_name, l ASC, g;
 
 multipleGroupingsAndOrderingByGroupsWithFunctions_2
-SELECT first_name f, last_name l, LCASE(gender) g, CONCAT(UCASE(first_name), LCASE(last_name)) c FROM test_emp GROUP BY f, LCASE(gender), l, c ORDER BY c DESC, first_name, l ASC, g;
+SELECT first_name f, last_name l, LCASE(gender) g, CONCAT(UCASE(first_name), LCASE(last_name)) c FROM test_emp WHERE emp_no IN (10003, 10009, 10023, 10024, 10025, 10029, 10030, 10033, 10034, 10035) GROUP BY f, LCASE(gender), l, c ORDER BY c DESC, first_name, l ASC, g;
diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/dlm/10_usage.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/dlm/10_usage.yml
index 07ed83e1f886..95e4aa9b7b4d 100644
--- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/dlm/10_usage.yml
+++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/dlm/10_usage.yml
@@ -1,9 +1,12 @@
 ---
 "Test data stream lifecycle usage stats":
   - requires:
-      cluster_features: "gte_v8.11.0"
-      reason: "the data stream lifecycle stats were updated to the usage api in 8.11"
-      test_runner_features: "allowed_warnings"
+      reason: "Global retention telemetry was added in 8.16+"
+      test_runner_features: [ capabilities, allowed_warnings ]
+      capabilities:
+        - method: GET
+          path: /_xpack/usage
+          capabilities: [ 'global_retention_telemetry' ]
 
   - do:
       xpack.usage: {}
@@ -12,9 +15,19 @@
   - match: { data_lifecycle.enabled: true }
   - match: { data_lifecycle.count: 0 }
   - match: { data_lifecycle.default_rollover_used: true }
-  - match: { data_lifecycle.retention.minimum_millis: 0 }
-  - match: { data_lifecycle.retention.maximum_millis: 0 }
-  - match: { data_lifecycle.retention.average_millis: 0 }
+
+  - match: { data_lifecycle.data_retention.configured_data_streams: 0 }
+  - is_false: data_lifecycle.data_retention.minimum_millis
+  - is_false: data_lifecycle.data_retention.maximum_millis
+  - is_false: data_lifecycle.data_retention.average_millis
+
+  - match: { data_lifecycle.effective_retention.retained_data_streams: 0 }
+  - is_false: data_lifecycle.effective_retention.minimum_millis
+  - is_false: data_lifecycle.effective_retention.maximum_millis
+  - is_false: data_lifecycle.effective_retention.average_millis
+
+  - match: { data_lifecycle.global_retention.max.defined: false }
+  - match: { data_lifecycle.global_retention.default.defined: false }
 
   - do:
       allowed_warnings:
@@ -89,9 +102,15 @@
   - match: { data_lifecycle.enabled: true }
   - match: { data_lifecycle.count: 2 }
   - match: { data_lifecycle.default_rollover_used: true }
-  - match: { data_lifecycle.retention.minimum_millis: 432000000 }
-  - match: { data_lifecycle.retention.maximum_millis: 864000000 }
-  - match: { data_lifecycle.retention.average_millis: 648000000 }
+  - match: { data_lifecycle.data_retention.configured_data_streams: 2 }
+  - match: { data_lifecycle.data_retention.minimum_millis: 432000000 }
+  - match: { data_lifecycle.data_retention.maximum_millis: 864000000 }
+  - match: { data_lifecycle.data_retention.average_millis: 648000000 }
+
+  - match: { data_lifecycle.effective_retention.retained_data_streams: 2 }
+  - match: { data_lifecycle.effective_retention.minimum_millis: 432000000 }
+  - match: { data_lifecycle.data_retention.maximum_millis: 864000000 }
+  - match: { data_lifecycle.data_retention.average_millis: 648000000 }
 
   - do:
       indices.delete_data_stream:
@@ -106,6 +125,13 @@
   - match: { data_lifecycle.enabled: true }
   - match: { data_lifecycle.count: 1 }
   - match: { data_lifecycle.default_rollover_used: true }
-  - match: { data_lifecycle.retention.minimum_millis: 432000000 }
-  - match: { data_lifecycle.retention.maximum_millis: 432000000 }
-  - match: { data_lifecycle.retention.average_millis: 432000000 }
+
+  - match: { data_lifecycle.data_retention.configured_data_streams: 1 }
+  - match: { data_lifecycle.data_retention.minimum_millis: 432000000 }
+  - match: { data_lifecycle.data_retention.maximum_millis: 432000000 }
+  - match: { data_lifecycle.data_retention.average_millis: 432000000 }
+
+  - match: { data_lifecycle.effective_retention.retained_data_streams: 1 }
+  - match: { data_lifecycle.effective_retention.minimum_millis: 432000000 }
+  - match: { data_lifecycle.effective_retention.maximum_millis: 432000000 }
+  - match: { data_lifecycle.effective_retention.average_millis: 432000000 }
diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml
index e168fc589d11..132d54fa9ac1 100644
--- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml
+++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/10_basic.yml
@@ -393,6 +393,35 @@ setup:
   - match: {values.1: ["1",2.0,null,true,123,1674835275193]}
   - match: {values.2: ["1",2.0,null,true,123,1674835275193]}
 
+---
+"Test Interval in Input Params":
+  - requires:
+      test_runner_features: [ capabilities ]
+      capabilities:
+        - method: POST
+          path: /_query
+          parameters: [ ]
+          capabilities: [ cast_string_literal_to_temporal_amount ]
+      reason: "interval in parameters"
+
+  - do:
+      allowed_warnings_regex:
+        - "No limit defined, adding default limit of \\[.*\\]"
+      esql.query:
+        body:
+          query: 'row x = ?n1::datetime | eval y = x - ?n2::date_period, z = x + ?n3::time_duration'
+          params: [{"n1" : "2024-08-06"}, {"n2" : "3 days"}, {"n3" : "3 hours"}]
+
+  - length: {columns: 3}
+  - match: {columns.0.name: "x"}
+  - match: {columns.0.type: "date"}
+  - match: {columns.1.name: "y"}
+  - match: {columns.1.type: "date"}
+  - match: {columns.2.name: "z"}
+  - match: {columns.2.type: "date"}
+  - length: {values: 1}
+  - match: {values.0: ["2024-08-06T00:00:00.000Z","2024-08-03T00:00:00.000Z","2024-08-06T03:00:00.000Z"]}
+
 ---
 version is not allowed:
   - requires:
diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/160_union_types.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/160_union_types.yml
index 92b3f4d1b084..359ac40bc367 100644
--- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/160_union_types.yml
+++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/160_union_types.yml
@@ -6,7 +6,7 @@ setup:
           parameters: [method, path, parameters, capabilities]
           capabilities: [union_types, union_types_remove_fields, casting_operator]
       reason: "Union types and casting operator introduced in 8.15.0"
-      test_runner_features: [capabilities, allowed_warnings_regex]
+      test_runner_features: [capabilities, allowed_warnings_regex, warnings_regex]
 
   - do:
       indices.create:
@@ -830,3 +830,65 @@ load four indices with multiple conversion functions TO_LONG and TO_IP:
   - match: { values.21.2: "172.21.3.15" }
   - match: { values.21.3: 1756467 }
   - match: { values.21.4: "Connected to 10.1.0.1" }
+
+---
+CASE:
+  - requires:
+      capabilities:
+        - method: POST
+          path: /_query
+          parameters: [method, path, parameters, capabilities]
+          capabilities: [case_mv]
+      reason: "CASE support for multivalue conditions introduced in 8.16.0"
+
+  - do:
+      indices.create:
+        index: b1
+        body:
+          mappings:
+            properties:
+              f:
+                type: keyword
+  - do:
+      indices.create:
+        index: b2
+        body:
+          mappings:
+            properties:
+              f:
+                type: boolean
+  - do:
+      bulk:
+        refresh: true
+        body:
+          - '{"index": {"_index": "b1"}}'
+          - '{"a": 1, "f": false}'
+          - '{"index": {"_index": "b1"}}'
+          - '{"a": 2, "f": [true, false]}'
+          - '{"index": {"_index": "b2"}}'
+          - '{"a": 3, "f": true}'
+
+  - do:
+      warnings_regex:
+        - ".+evaluation of \\[f?\\] failed, treating result as false. Only first 20 failures recorded."
+        - ".+java.lang.IllegalArgumentException: CASE expects a single-valued boolean"
+      esql.query:
+        body:
+          query: 'FROM b* | EVAL c = CASE(f::BOOLEAN, "a", "b") | SORT a ASC | LIMIT 10'
+
+  - match: { columns.0.name: "a" }
+  - match: { columns.0.type: "long" }
+  - match: { columns.1.name: "f" }
+  - match: { columns.1.type: "unsupported" }
+  - match: { columns.2.name: "c" }
+  - match: { columns.2.type: "keyword" }
+  - length: { values: 3 }
+  - match: { values.0.0: 1 }
+  - match: { values.0.1: null }
+  - match: { values.0.2: "b" }
+  - match: { values.1.0: 2 }
+  - match: { values.1.1: null }
+  - match: { values.1.2: "b" }
+  - match: { values.2.0: 3 }
+  - match: { values.2.1: null }
+  - match: { values.2.2: "a" }
diff --git a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/sparse_vector_search.yml b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/sparse_vector_search.yml
index 75823d22504f..332981a58080 100644
--- a/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/sparse_vector_search.yml
+++ b/x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/sparse_vector_search.yml
@@ -313,3 +313,166 @@ setup:
               query: "octopus comforter smells"
 
   - match: { status: 400 }
+
+---
+"Search on a sparse_vector field with dots in the field names":
+
+  - requires:
+      cluster_features: [ "gte_v8.16.0" ]
+      reason: dots in field names allowed starting in in 8.16.0
+
+  - do:
+      indices.create:
+        index: index-with-sparse-vector2
+        body:
+          mappings:
+            properties:
+              ml.tokens:
+                type: sparse_vector
+
+  - match: { acknowledged: true }
+
+  - do:
+      headers:
+        Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
+      index:
+        index: index-with-sparse-vector2
+        id: "has-dots"
+        refresh: true
+        body:
+          ml:
+            tokens:
+              running: 2.4097164
+              good: 2.170997
+              run: 2.052153
+              race: 1.4575411
+              for: 1.1908325
+              5.0k: 2.489943
+
+  - match: { result: "created" }
+
+  - do:
+      headers:
+        Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
+      get:
+        index: index-with-sparse-vector2
+        id: "has-dots"
+
+  - match:
+      _source:
+        ml:
+          tokens:
+            running: 2.4097164
+            good: 2.170997
+            run: 2.052153
+            race: 1.4575411
+            for: 1.1908325
+            5.0k: 2.489943
+
+  - do:
+      search:
+        index: index-with-sparse-vector2
+        body:
+          query:
+            sparse_vector:
+              field: ml.tokens
+              query_vector:
+                5.0k: 2.489943
+
+  - match: { hits.total.value: 1 }
+
+---
+"Search on a nested sparse_vector field with dots in the field names and conflicting child fields":
+
+  - requires:
+      cluster_features: [ "gte_v8.16.0" ]
+      reason: dots in field names allowed starting in in 8.16.0
+
+  - do:
+      indices.create:
+        index: index-with-sparse-vector3
+        body:
+          mappings:
+            properties:
+              parent:
+                type: object
+                subobjects: false
+                properties:
+                  foo:
+                    type: sparse_vector
+                  foo.bar:
+                    type: sparse_vector
+
+  - match: { acknowledged: true }
+
+  - do:
+      headers:
+        Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
+        Content-Type: application/json
+      bulk:
+        index: index-with-sparse-vector3
+        refresh: true
+        body: |
+          {"index": { "_id": "parent-foo" }}
+          {"parent.foo": { "bar.baz": 1.0 }}
+          {"index": { "_id": "parent-foo-bar" }}
+          {"parent.foo.bar": { "baz": 2.0 }}
+          {"index": { "_id": "both-docs" }}
+          {"parent.foo": { "bar.baz": 3.0 }, "parent.foo.bar": { "baz": 4.0 }}
+
+
+  - do:
+      headers:
+        Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
+      get:
+        index: index-with-sparse-vector3
+        id: "parent-foo"
+
+  - match:
+      _source:
+        parent.foo:
+          bar.baz: 1.0
+
+  - do:
+      headers:
+        Authorization: "Basic eF9wYWNrX3Jlc3RfdXNlcjp4LXBhY2stdGVzdC1wYXNzd29yZA==" # run as x_pack_rest_user, i.e. the test setup superuser
+      get:
+        index: index-with-sparse-vector3
+        id: "parent-foo-bar"
+
+  - match:
+      _source:
+        parent.foo.bar:
+          baz: 2.0
+
+  - do:
+      search:
+        index: index-with-sparse-vector3
+        body:
+          query:
+            sparse_vector:
+              field: parent.foo
+              query_vector:
+                bar.baz: 1.0
+
+  - match: { hits.total.value: 2 }
+  - match: { hits.hits.0._id: "both-docs" }
+  - match: { hits.hits.0._score: 3.0 }
+  - match: { hits.hits.1._id: "parent-foo" }
+  - match: { hits.hits.1._score: 1.0 }
+
+  - do:
+      search:
+        index: index-with-sparse-vector3
+        body:
+          query:
+            sparse_vector:
+              field: parent.foo.bar
+              query_vector:
+                baz: 1.0
+
+  - match: { hits.total.value: 2 }
+  - match: { hits.hits.0._id: "both-docs" }
+  - match: { hits.hits.0._score: 4.0 }
+  - match: { hits.hits.1._id: "parent-foo-bar" }
+  - match: { hits.hits.1._score: 2.0 }
diff --git a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml
deleted file mode 100644
index 2cf26f336ba4..000000000000
--- a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec.test.geo_shape/10_compat_geo_shape_with_types.yml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "warnings"
-        - "allowed_warnings_regex"
-
----
-"Test geo_shape with type":
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
-      indices.create:
-        index: shapes
-        include_type_name: true
-        body:
-          mappings:
-            _doc:
-              properties:
-                location:
-                  type: geo_shape
-
-
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      allowed_warnings_regex:
-        - "\\[types removal\\].*"
-      index:
-        index:  shapes
-        type:   _doc
-        id:     deu
-        body:
-          location:
-            type : "envelope"
-            coordinates:  [[13.0, 53.0], [14.0, 52.0]]
-
-  - do:
-      indices.refresh: {}
-
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      warnings:
-        - "[types removal] Types are deprecated in [geo_shape] queries. The type should no longer be specified in the [indexed_shape] section."
-      search:
-        rest_total_hits_as_int: true
-        index: shapes
-        size: 0
-        body:
-          query:
-            bool:
-              filter:
-                geo_shape:
-                  location:
-                    indexed_shape:
-                        index: "shapes"
-                        type: "_doc"
-                        id: "deu"
-                        path: "location"
-
-  - match: {hits.total:      1    }
diff --git a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml b/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml
deleted file mode 100644
index a2d05446bbe1..000000000000
--- a/x-pack/plugin/src/yamlRestTestV7Compat/resources/rest-api-spec/test/freeze.gone/10_basic_compat.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "warnings_regex"
-  - do:
-      index:
-        index: some-test-index-1
-        id: "1"
-        body: { foo: bar }
-
----
-"Freezing a non-existent index throws 404":
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      indices.freeze:
-        index: some-test-index-404
-      catch: missing
-
----
-"Freezing an index throws 410":
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      indices.freeze:
-        index: some-test-index-1
-      catch: /It is no longer possible to freeze indices, but existing frozen indices can still be unfrozen/
-
----
-"Without compat headers throws 400":
-  - do:
-      indices.freeze:
-        index: some-test-index-1
-      catch: /no handler found for uri/
diff --git a/x-pack/plugin/stack/src/javaRestTest/java/org/elasticsearch/xpack/stack/EcsDynamicTemplatesIT.java b/x-pack/plugin/stack/src/javaRestTest/java/org/elasticsearch/xpack/stack/EcsDynamicTemplatesIT.java
index 423865eaab61..eba239cd97e2 100644
--- a/x-pack/plugin/stack/src/javaRestTest/java/org/elasticsearch/xpack/stack/EcsDynamicTemplatesIT.java
+++ b/x-pack/plugin/stack/src/javaRestTest/java/org/elasticsearch/xpack/stack/EcsDynamicTemplatesIT.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.network.NetworkAddress;
 import org.elasticsearch.common.time.DateFormatter;
+import org.elasticsearch.common.time.FormatNames;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
@@ -206,6 +207,44 @@ public void testNumericMessage() throws IOException {
         verifyEcsMappings(indexName);
     }
 
+    public void testDateFieldsWithDifferentFormats() throws IOException {
+        Map<String, Object> dateFieldsMap = ecsFlatFieldDefinitions.entrySet()
+            .stream()
+            .filter(entry -> "date".equals(entry.getValue().get("type")))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        // test with iso8601 format
+        String indexName = "test-date-fields-as-is8601";
+        createTestIndex(indexName);
+        Map<String, Object> document = new HashMap<>();
+        DateFormatter formatter = DateFormatter.forPattern(FormatNames.ISO8601.getName());
+        for (String field : dateFieldsMap.keySet()) {
+            document.put(field, formatter.formatMillis(System.currentTimeMillis()));
+        }
+        verifyAllDateFields(indexName, document, dateFieldsMap);
+
+        // test with milliseconds since epoch format
+        indexName = "test-date-fields-as-millis";
+        createTestIndex(indexName);
+        document = new HashMap<>();
+        for (String field : dateFieldsMap.keySet()) {
+            document.put(field, System.currentTimeMillis());
+        }
+        verifyAllDateFields(indexName, document, dateFieldsMap);
+    }
+
+    private void verifyAllDateFields(String indexName, Map<String, Object> document, Map<String, Object> dateFieldsMap) throws IOException {
+        indexDocument(indexName, document);
+        final Map<String, Object> rawMappings = getMappings(indexName);
+        final Map<String, Map<String, Object>> flatFieldMappings = new HashMap<>();
+        processRawMappingsSubtree(rawMappings, flatFieldMappings, new HashMap<>(), "");
+        flatFieldMappings.forEach((fieldName, fieldMappings) -> {
+            if (dateFieldsMap.containsKey(fieldName)) {
+                assertType("date", fieldMappings);
+            }
+        });
+    }
+
     private void assertType(String expectedType, Map<String, Object> actualMappings) {
         assertNotNull("expected to get non-null mappings for field", actualMappings);
         assertEquals(expectedType, actualMappings.get("type"));
@@ -312,6 +351,7 @@ private static void createTestIndex(String indexName, @Nullable Map<String, Obje
         } else {
             indexMappings = ecsDynamicTemplates;
         }
+        indexMappings.put("date_detection", false);
         try (XContentBuilder bodyBuilder = JsonXContent.contentBuilder()) {
             bodyBuilder.startObject();
             bodyBuilder.startObject("settings");
@@ -349,7 +389,7 @@ private Object generateTestValue(String type) {
                 return "test";
             }
             case "date" -> {
-                return DateFormatter.forPattern("strict_date_optional_time").formatMillis(System.currentTimeMillis());
+                return DateFormatter.forPattern(FormatNames.STRICT_DATE_OPTIONAL_TIME.getName()).formatMillis(System.currentTimeMillis());
             }
             case "ip" -> {
                 return NetworkAddress.format(randomIp(true));
@@ -485,9 +525,11 @@ private void verifyEcsMappings(String indexName, String fieldPrefix) throws IOEx
             );
         });
         fieldToWrongMappingType.forEach((fieldName, actualMappingType) -> {
-            Map<String, Object> fieldMappings = ecsFlatFieldDefinitions.get(fieldName);
+            // if fieldPrefix is not null, we need to remove it from the field name for the ECS lookup
+            String ecsFieldName = fieldPrefix == null ? fieldName : fieldName.substring(fieldPrefix.length());
+            Map<String, Object> fieldMappings = ecsFlatFieldDefinitions.get(ecsFieldName);
             if (fieldMappings == null) {
-                fieldMappings = ecsFlatMultiFieldDefinitions.get(fieldName);
+                fieldMappings = ecsFlatMultiFieldDefinitions.get(ecsFieldName);
             }
             String ecsExpectedType = (String) fieldMappings.get("type");
             logger.error(
diff --git a/x-pack/plugin/stack/src/main/java/org/elasticsearch/xpack/stack/StackTemplateRegistry.java b/x-pack/plugin/stack/src/main/java/org/elasticsearch/xpack/stack/StackTemplateRegistry.java
index 9e847455d2c8..592842f61eee 100644
--- a/x-pack/plugin/stack/src/main/java/org/elasticsearch/xpack/stack/StackTemplateRegistry.java
+++ b/x-pack/plugin/stack/src/main/java/org/elasticsearch/xpack/stack/StackTemplateRegistry.java
@@ -48,7 +48,7 @@ public class StackTemplateRegistry extends IndexTemplateRegistry {
 
     // The stack template registry version. This number must be incremented when we make changes
     // to built-in templates.
-    public static final int REGISTRY_VERSION = 13;
+    public static final int REGISTRY_VERSION = 14;
 
     public static final String TEMPLATE_VERSION_VARIABLE = "xpack.stack.template.version";
     public static final Setting<Boolean> STACK_TEMPLATES_ENABLED = Setting.boolSetting(
diff --git a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle
index 13470e3c2e4e..b429e123bb63 100644
--- a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle
+++ b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle
@@ -12,7 +12,7 @@ dependencies {
   testImplementation project(':x-pack:qa')
 }
 
-Version ccsCompatVersion = new Version(VersionProperties.getElasticsearchVersion().getMajor(), VersionProperties.getElasticsearchVersion().getMinor() - 1, 0)
+Version ccsCompatVersion = BuildParams.bwcVersions.minimumWireCompatibleVersion
 
 restResources {
   restApi {
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/TransformInternalIndex.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/TransformInternalIndex.java
index ae890cb8321d..e2f9af2c676c 100644
--- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/TransformInternalIndex.java
+++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/TransformInternalIndex.java
@@ -24,6 +24,7 @@
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.compress.CompressedXContent;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.indices.SystemIndexDescriptor;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -389,7 +390,10 @@ protected static boolean allPrimaryShardsActiveForLatestVersionedIndex(ClusterSt
     }
 
     private static void waitForLatestVersionedIndexShardsActive(Client client, ActionListener<Void> listener) {
-        ClusterHealthRequest request = new ClusterHealthRequest(TransformInternalIndexConstants.LATEST_INDEX_VERSIONED_NAME)
+        ClusterHealthRequest request = new ClusterHealthRequest(
+            TimeValue.THIRTY_SECONDS /* TODO should this be longer/configurable? */,
+            TransformInternalIndexConstants.LATEST_INDEX_VERSIONED_NAME
+        )
             // cluster health does not wait for active shards per default
             .waitForActiveShards(ActiveShardCount.ONE);
         ActionListener<ClusterHealthResponse> innerListener = ActionListener.wrap(r -> listener.onResponse(null), listener::onFailure);
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java
index 279c59b8b712..377476011465 100644
--- a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java
+++ b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java
@@ -20,6 +20,7 @@
 import org.elasticsearch.client.internal.ParentTaskAssigningClient;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
+import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.routing.IndexRoutingTable;
 import org.elasticsearch.cluster.service.ClusterService;
@@ -58,6 +59,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -134,17 +136,28 @@ public PersistentTasksCustomMetadata.Assignment getAssignment(
             logger.debug(reason);
             return new PersistentTasksCustomMetadata.Assignment(null, reason);
         }
+        Map<String, String> explainWhyAssignmentFailed = new TreeMap<>();
         DiscoveryNode discoveryNode = selectLeastLoadedNode(
             clusterState,
             candidateNodes,
-            node -> nodeCanRunThisTransform(node, params.getVersion(), params.requiresRemote(), null)
+            node -> nodeCanRunThisTransform(node, params.getVersion(), params.requiresRemote(), explainWhyAssignmentFailed)
         );
 
         if (discoveryNode == null) {
-            Map<String, String> explainWhyAssignmentFailed = new TreeMap<>();
-            for (DiscoveryNode node : clusterState.getNodes()) {
-                nodeCanRunThisTransform(node, params.getVersion(), params.requiresRemote(), explainWhyAssignmentFailed);
+            // clusterState can report an empty node list when the cluster health is yellow, if we have no other reason then include that
+            var nodes = clusterState.getNodes();
+            if (nodes.iterator().hasNext() == false && explainWhyAssignmentFailed.isEmpty()) {
+                var key = Optional.ofNullable(clusterState.getMetadata()).map(Metadata::clusterUUID).orElse("");
+                explainWhyAssignmentFailed.put(
+                    key,
+                    "No Discovery Nodes found in cluster state. Check cluster health and troubleshoot missing Discovery Nodes."
+                );
+            } else {
+                for (DiscoveryNode node : nodes) {
+                    nodeCanRunThisTransform(node, params.getVersion(), params.requiresRemote(), explainWhyAssignmentFailed);
+                }
             }
+
             String reason = "Not starting transform ["
                 + params.getId()
                 + "], reasons ["
diff --git a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java
index 07801221adc3..7d572aaef2de 100644
--- a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java
+++ b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java
@@ -135,12 +135,46 @@ public void testNodeVersionAssignment() {
     }
 
     public void testNodeAssignmentProblems() {
-        // no data nodes
-        DiscoveryNodes.Builder nodes = buildNodes(false, false, false, false, true);
-        ClusterState cs = buildClusterState(nodes);
+        // no nodes
+        ClusterState cs = buildClusterState(DiscoveryNodes.builder());
         TransformPersistentTasksExecutor executor = buildTaskExecutor();
 
         Assignment assignment = executor.getAssignment(
+            new TransformTaskParams("new-task-id", TransformConfigVersion.CURRENT, null, false),
+            List.of(),
+            cs
+        );
+        assertNull(assignment.getExecutorNode());
+        assertThat(
+            assignment.getExplanation(),
+            equalTo(
+                "Not starting transform [new-task-id], reasons [cluster-uuid:No Discovery Nodes found in cluster state."
+                    + " Check cluster health and troubleshoot missing Discovery Nodes.]"
+            )
+        );
+
+        // no data nodes, but the cluster state is empty
+        DiscoveryNodes.Builder nodes = buildNodes(false, false, false, false, true);
+        cs = buildClusterState(nodes);
+        executor = buildTaskExecutor();
+
+        assignment = executor.getAssignment(
+            new TransformTaskParams("new-task-id", TransformConfigVersion.CURRENT, null, false),
+            List.of(),
+            cs
+        );
+        assertNull(assignment.getExecutorNode());
+        assertThat(
+            assignment.getExplanation(),
+            equalTo("Not starting transform [new-task-id], reasons [current-data-node-with-transform-disabled:not a transform node]")
+        );
+
+        // no data nodes
+        nodes = buildNodes(false, false, false, false, true);
+        cs = buildClusterState(nodes);
+        executor = buildTaskExecutor();
+
+        assignment = executor.getAssignment(
             new TransformTaskParams("new-task-id", TransformConfigVersion.CURRENT, null, false),
             cs.nodes().getAllNodes(),
             cs
@@ -510,7 +544,7 @@ private DiscoveryNodes.Builder buildNodes(
     }
 
     private ClusterState buildClusterState(DiscoveryNodes.Builder nodes) {
-        Metadata.Builder metadata = Metadata.builder();
+        Metadata.Builder metadata = Metadata.builder().clusterUUID("cluster-uuid");
         RoutingTable.Builder routingTable = RoutingTable.builder();
         addIndices(metadata, routingTable);
         PersistentTasksCustomMetadata.Builder pTasksBuilder = PersistentTasksCustomMetadata.builder()
diff --git a/x-pack/plugin/voting-only-node/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyNodePluginTests.java b/x-pack/plugin/voting-only-node/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyNodePluginTests.java
index 58e6e736b120..b1df355417ac 100644
--- a/x-pack/plugin/voting-only-node/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyNodePluginTests.java
+++ b/x-pack/plugin/voting-only-node/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/votingonly/VotingOnlyNodePluginTests.java
@@ -76,7 +76,10 @@ public void testVotingOnlyNodeStats() throws Exception {
         internalCluster().startNodes(2);
         internalCluster().startNode(addRoles(Set.of(DiscoveryNodeRole.VOTING_ONLY_NODE_ROLE)));
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareState().get().getState().getLastCommittedConfiguration().getNodeIds(), hasSize(3))
+            () -> assertThat(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getLastCommittedConfiguration().getNodeIds(),
+                hasSize(3)
+            )
         );
         assertThat(
             clusterAdmin().prepareClusterStats()
@@ -98,15 +101,20 @@ public void testPreferFullMasterOverVotingOnlyNodes() throws Exception {
         internalCluster().startNode(addRoles(Set.of(DiscoveryNodeRole.VOTING_ONLY_NODE_ROLE)));
         internalCluster().startDataOnlyNodes(randomInt(2));
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareState().get().getState().getLastCommittedConfiguration().getNodeIds().size(), equalTo(3))
+            () -> assertThat(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getLastCommittedConfiguration().getNodeIds().size(),
+                equalTo(3)
+            )
         );
         final String originalMaster = internalCluster().getMasterName();
 
         internalCluster().stopCurrentMasterNode();
-        clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).get();
+        clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT).setWaitForEvents(Priority.LANGUID).get();
         assertNotEquals(originalMaster, internalCluster().getMasterName());
         assertThat(
-            VotingOnlyNodePlugin.isVotingOnlyNode(clusterAdmin().prepareState().get().getState().nodes().getMasterNode()),
+            VotingOnlyNodePlugin.isVotingOnlyNode(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNode()
+            ),
             equalTo(false)
         );
     }
@@ -115,10 +123,15 @@ public void testBootstrapOnlyVotingOnlyNodes() throws Exception {
         internalCluster().setBootstrapMasterNodeIndex(0);
         internalCluster().startNodes(addRoles(Set.of(DiscoveryNodeRole.VOTING_ONLY_NODE_ROLE)), Settings.EMPTY, Settings.EMPTY);
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareState().get().getState().getLastCommittedConfiguration().getNodeIds().size(), equalTo(3))
+            () -> assertThat(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getLastCommittedConfiguration().getNodeIds().size(),
+                equalTo(3)
+            )
         );
         assertThat(
-            VotingOnlyNodePlugin.isVotingOnlyNode(clusterAdmin().prepareState().get().getState().nodes().getMasterNode()),
+            VotingOnlyNodePlugin.isVotingOnlyNode(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNode()
+            ),
             equalTo(false)
         );
     }
@@ -132,9 +145,11 @@ public void testBootstrapOnlySingleVotingOnlyNode() throws Exception {
                 .build()
         );
         internalCluster().startNode();
-        assertBusy(() -> assertThat(clusterAdmin().prepareState().get().getState().getNodes().getSize(), equalTo(2)));
+        assertBusy(() -> assertThat(clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getNodes().getSize(), equalTo(2)));
         assertThat(
-            VotingOnlyNodePlugin.isVotingOnlyNode(clusterAdmin().prepareState().get().getState().nodes().getMasterNode()),
+            VotingOnlyNodePlugin.isVotingOnlyNode(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNode()
+            ),
             equalTo(false)
         );
     }
@@ -145,16 +160,19 @@ public void testVotingOnlyNodesCannotBeMasterWithoutFullMasterNodes() throws Exc
         internalCluster().startNodes(2, addRoles(Set.of(DiscoveryNodeRole.VOTING_ONLY_NODE_ROLE)));
         internalCluster().startDataOnlyNodes(randomInt(2));
         assertBusy(
-            () -> assertThat(clusterAdmin().prepareState().get().getState().getLastCommittedConfiguration().getNodeIds().size(), equalTo(3))
+            () -> assertThat(
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().getLastCommittedConfiguration().getNodeIds().size(),
+                equalTo(3)
+            )
         );
-        final String oldMasterId = clusterAdmin().prepareState().get().getState().nodes().getMasterNodeId();
+        final String oldMasterId = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNodeId();
 
         internalCluster().stopCurrentMasterNode();
 
         expectThrows(
             MasterNotDiscoveredException.class,
             () -> assertThat(
-                clusterAdmin().prepareState()
+                clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT)
                     .setMasterNodeTimeout(TimeValue.timeValueMillis(100))
                     .get()
                     .getState()
@@ -167,7 +185,7 @@ public void testVotingOnlyNodesCannotBeMasterWithoutFullMasterNodes() throws Exc
         // start a fresh full master node, which will be brought into the cluster as master by the voting-only nodes
         final String newMaster = internalCluster().startNode();
         assertEquals(newMaster, internalCluster().getMasterName());
-        final String newMasterId = clusterAdmin().prepareState().get().getState().nodes().getMasterNodeId();
+        final String newMasterId = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState().nodes().getMasterNodeId();
         assertNotEquals(oldMasterId, newMasterId);
     }
 
diff --git a/x-pack/plugin/watcher/qa/rest/build.gradle b/x-pack/plugin/watcher/qa/rest/build.gradle
index 3f61bdcb3c2e..a911c022212b 100644
--- a/x-pack/plugin/watcher/qa/rest/build.gradle
+++ b/x-pack/plugin/watcher/qa/rest/build.gradle
@@ -35,25 +35,3 @@ if (BuildParams.inFipsJvm){
   tasks.named("yamlRestTest").configure{enabled = false }
 }
 
-
-tasks.named("yamlRestTestV7CompatTransform").configure{ task ->
-  task.skipTest("mustache/30_search_input/Test search input mustache integration (using request body and rest_total_hits_as_int)", "remove JodaCompatibleDateTime -- ZonedDateTime doesn't output millis/nanos if they're 0 (#78417)")
-  task.skipTest("mustache/30_search_input/Test search input mustache integration (using request body)", "remove JodaCompatibleDateTime -- ZonedDateTime doesn't output millis/nanos if they're 0 (#78417)")
-  task.skipTest("mustache/40_search_transform/Test search transform mustache integration (using request body)", "remove JodaCompatibleDateTime -- ZonedDateTime doesn't output millis/nanos if they're 0 (#78417)")
-  task.skipTest("painless/40_exception/Test painless exceptions are returned when logging a broken response", "Exceptions are no longer thrown from Mustache, but from the transform action itself")
-  task.replaceKeyInDo("watcher.ack_watch", "xpack-watcher.ack_watch")
-  task.replaceKeyInDo("watcher.activate_watch", "xpack-watcher.activate_watch")
-  task.replaceKeyInDo("watcher.deactivate_watch", "xpack-watcher.deactivate_watch")
-  task.replaceKeyInDo("watcher.delete_watch", "xpack-watcher.delete_watch")
-  task.replaceKeyInDo("watcher.execute_watch", "xpack-watcher.execute_watch")
-  task.replaceKeyInDo("watcher.get_watch", "xpack-watcher.get_watch")
-  task.replaceKeyInDo("watcher.put_watch", "xpack-watcher.put_watch")
-  task.replaceKeyInDo("watcher.start", "xpack-watcher.start")
-  task.replaceKeyInDo("watcher.stats", "xpack-watcher.stats")
-  task.replaceKeyInDo("watcher.stop", "xpack-watcher.stop")
-
-  task.addAllowedWarningRegex(".*_xpack/watcher/.* is deprecated.*")
-  task.addAllowedWarningRegex("\\[types removal\\].*")
-  task.replaceValueTextByKeyValue("path", "/my_index/my_type/{{ctx.watch_id}}", "/my_index/_doc/{{ctx.watch_id}}",
-    "Test webhook action with mustache integration")
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.ack_watch.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.ack_watch.json
deleted file mode 100644
index 66ee9a7d3b83..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.ack_watch.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "xpack-watcher.ack_watch":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-ack-watch.html",
-      "description":"Acknowledges a watch, manually throttling the execution of the watch's actions."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/watch/{watch_id}/_ack",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "watch_id":{
-              "type":"string",
-              "description":"Watch ID"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/watcher/watch/{watch_id}/_ack/{action_id}",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "watch_id":{
-              "type":"string",
-              "description":"Watch ID"
-            },
-            "action_id":{
-              "type":"list",
-              "description":"A comma-separated list of the action ids to be acked"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.activate_watch.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.activate_watch.json
deleted file mode 100644
index 2790b3ac6904..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.activate_watch.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "xpack-watcher.activate_watch":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-activate-watch.html",
-      "description":"Activates a currently inactive watch."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/watch/{watch_id}/_activate",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "watch_id":{
-              "type":"string",
-              "description":"Watch ID"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.deactivate_watch.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.deactivate_watch.json
deleted file mode 100644
index 7633c5ab9ffc..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.deactivate_watch.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "xpack-watcher.deactivate_watch":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-deactivate-watch.html",
-      "description":"Deactivates a currently active watch."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/watch/{watch_id}/_deactivate",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "watch_id":{
-              "type":"string",
-              "description":"Watch ID"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.delete_watch.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.delete_watch.json
deleted file mode 100644
index b42003207eda..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.delete_watch.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-watcher.delete_watch":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-delete-watch.html",
-      "description":"Removes a watch from Watcher."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/watch/{id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"Watch ID"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.execute_watch.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.execute_watch.json
deleted file mode 100644
index 4dba5bd1817a..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.execute_watch.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "xpack-watcher.execute_watch":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-execute-watch.html",
-      "description":"Forces the execution of a stored watch."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/watch/{id}/_execute",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"Watch ID"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/watcher/watch/_execute",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "debug":{
-        "type":"boolean",
-        "description":"indicates whether the watch should execute in debug mode",
-        "required":false
-      }
-    },
-    "body":{
-      "description":"Execution control",
-      "required":false
-    }
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.get_watch.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.get_watch.json
deleted file mode 100644
index 0fa158751fba..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.get_watch.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "xpack-watcher.get_watch":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-get-watch.html",
-      "description":"Retrieves a watch by its ID."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/watch/{id}",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"Watch ID"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{}
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.put_watch.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.put_watch.json
deleted file mode 100644
index b6d17b0d9273..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.put_watch.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "xpack-watcher.put_watch":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-put-watch.html",
-      "description":"Creates a new watch, or updates an existing one."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/watch/{id}",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"Watch ID"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "active":{
-        "type":"boolean",
-        "description":"Specify whether the watch is in/active by default"
-      },
-      "version":{
-        "type":"number",
-        "description":"Explicit version number for concurrency control"
-      },
-      "if_seq_no":{
-        "type":"number",
-        "description":"only update the watch if the last operation that has changed the watch has the specified sequence number"
-      },
-      "if_primary_term":{
-        "type":"number",
-        "description":"only update the watch if the last operation that has changed the watch has the specified primary term"
-      }
-    },
-    "body":{
-      "description":"The watch",
-      "required":false
-    }
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.start.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.start.json
deleted file mode 100644
index 051344d02e87..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.start.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "xpack-watcher.start":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-start.html",
-      "description":"Starts Watcher if it is not already running."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/_start",
-          "methods":[
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{}
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.stats.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.stats.json
deleted file mode 100644
index f9dfd25f1e97..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.stats.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "xpack-watcher.stats":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stats.html",
-      "description":"Retrieves the current Watcher metrics."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/stats",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/watcher/stats/{metric}",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "metric":{
-              "type":"list",
-              "options":[
-                "_all",
-                "queued_watches",
-                "current_watches",
-                "pending_watches"
-              ],
-              "description":"Controls what additional stat metrics should be include in the response"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "metric":{
-        "type":"list",
-        "options":[
-          "_all",
-          "queued_watches",
-          "current_watches",
-          "pending_watches"
-        ],
-        "description":"Controls what additional stat metrics should be include in the response"
-      },
-      "emit_stacktraces":{
-        "type":"boolean",
-        "description":"Emits stack traces of currently running watches",
-        "required":false
-      }
-    }
-  }
-}
diff --git a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.stop.json b/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.stop.json
deleted file mode 100644
index c31bb162f601..000000000000
--- a/x-pack/plugin/watcher/qa/rest/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-watcher.stop.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "xpack-watcher.stop":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/watcher-api-stop.html",
-      "description":"Stops Watcher if it is running."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/watcher/_stop",
-          "methods":[
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{}
-  }
-}
diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
index 3b9ea0bd18d4..5dc537fc259d 100644
--- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
+++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
@@ -353,7 +353,7 @@ protected void assertWatchWithMinimumPerformedActionsCount(
         final AtomicReference<SearchResponse> lastResponse = new AtomicReference<>();
         try {
             assertBusy(() -> {
-                ClusterState state = clusterAdmin().prepareState().get().getState();
+                ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
                 String[] watchHistoryIndices = indexNameExpressionResolver().concreteIndexNames(
                     state,
                     IndicesOptions.lenientExpandOpen(),
@@ -429,7 +429,7 @@ protected void assertWatchWithNoActionNeeded(final String watchName, final long
             assertBusy(() -> {
                 // The watch_history index gets created in the background when the first watch is triggered
                 // so we to check first is this index is created and shards are started
-                ClusterState state = clusterAdmin().prepareState().get().getState();
+                ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
                 String[] watchHistoryIndices = indexNameExpressionResolver().concreteIndexNames(
                     state,
                     IndicesOptions.lenientExpandOpen(),
@@ -476,7 +476,7 @@ protected void assertWatchWithNoActionNeeded(final String watchName, final long
     protected void assertWatchWithMinimumActionsCount(final String watchName, final ExecutionState recordState, final long recordCount)
         throws Exception {
         assertBusy(() -> {
-            ClusterState state = clusterAdmin().prepareState().get().getState();
+            ClusterState state = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get().getState();
             String[] watchHistoryIndices = indexNameExpressionResolver().concreteIndexNames(
                 state,
                 IndicesOptions.lenientExpandOpen(),
diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/SingleNodeTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/SingleNodeTests.java
index 265b252082c6..7ff293ed9b15 100644
--- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/SingleNodeTests.java
+++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/SingleNodeTests.java
@@ -46,7 +46,7 @@ protected boolean timeWarped() {
     // the watch should be executed properly, despite the index being created and the cluster state listener being reloaded
     public void testThatLoadingWithNonExistingIndexWorks() throws Exception {
         stopWatcher();
-        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState().get();
+        ClusterStateResponse clusterStateResponse = clusterAdmin().prepareState(TEST_REQUEST_TIMEOUT).get();
         IndexMetadata metadata = WatchStoreUtils.getConcreteIndex(Watch.INDEX, clusterStateResponse.getState().metadata());
         String watchIndexName = metadata.getIndex().getName();
         assertAcked(indicesAdmin().prepareDelete(watchIndexName));
diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java
index 050e7ebe58e4..8d0001c1cc24 100644
--- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java
+++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherExecutorServiceBenchmark.java
@@ -9,6 +9,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.elasticsearch.client.internal.Client;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.node.MockNode;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.protocol.xpack.watcher.PutWatchRequest;
@@ -62,7 +63,7 @@ public class WatcherExecutorServiceBenchmark {
     protected static void start() throws Exception {
         Node node = new MockNode(Settings.builder().put(SETTINGS).put("node.data", false).build(), Arrays.asList(BenchmarkWatcher.class));
         client = node.client();
-        client.admin().cluster().prepareHealth("*").setWaitForGreenStatus().get();
+        client.admin().cluster().prepareHealth(TimeValue.THIRTY_SECONDS, "*").setWaitForGreenStatus().get();
         Thread.sleep(5000);
         scheduler = node.injector().getInstance(ScheduleTriggerEngineMock.class);
     }
diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java
index 53ca2fb3b3a3..1691a464d806 100644
--- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java
+++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/bench/WatcherScheduleEngineBenchmark.java
@@ -15,6 +15,7 @@
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.core.SuppressForbidden;
+import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.node.InternalSettingsPreparer;
@@ -109,7 +110,7 @@ public static void main(String[] args) throws Exception {
             ).start()
         ) {
             final Client client = node.client();
-            ClusterHealthResponse response = client.admin().cluster().prepareHealth().setWaitForNodes("2").get();
+            ClusterHealthResponse response = client.admin().cluster().prepareHealth(TimeValue.THIRTY_SECONDS).setWaitForNodes("2").get();
             if (response.getNumberOfNodes() != 2 && response.getNumberOfDataNodes() != 1) {
                 throw new IllegalStateException("This benchmark needs one extra data only node running outside this benchmark");
             }
@@ -161,9 +162,9 @@ public static void main(String[] args) throws Exception {
                 .build();
             try (Node node = new MockNode(settings, Arrays.asList(LocalStateWatcher.class))) {
                 final Client client = node.client();
-                client.admin().cluster().prepareHealth().setWaitForNodes("2").get();
+                client.admin().cluster().prepareHealth(TimeValue.THIRTY_SECONDS).setWaitForNodes("2").get();
                 client.admin().indices().prepareDelete(HistoryStoreField.DATA_STREAM + "*").get();
-                client.admin().cluster().prepareHealth(Watch.INDEX, "test").setWaitForYellowStatus().get();
+                client.admin().cluster().prepareHealth(TimeValue.THIRTY_SECONDS, Watch.INDEX, "test").setWaitForYellowStatus().get();
 
                 Clock clock = node.injector().getInstance(Clock.class);
                 while (new WatcherStatsRequestBuilder(client).get()
diff --git a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java
index 82dc4c071530..8e4f56e29958 100644
--- a/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java
+++ b/x-pack/plugin/wildcard/src/main/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapper.java
@@ -68,7 +68,6 @@
 import org.elasticsearch.index.mapper.LuceneDocument;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MapperBuilderContext;
-import org.elasticsearch.index.mapper.SourceLoader;
 import org.elasticsearch.index.mapper.SourceValueFetcher;
 import org.elasticsearch.index.mapper.TextSearchInfo;
 import org.elasticsearch.index.mapper.ValueFetcher;
@@ -246,8 +245,7 @@ public WildcardFieldMapper build(MapperBuilderContext context) {
                 ),
                 ignoreAbove.get(),
                 context.isSourceSynthetic(),
-                multiFieldsBuilder.build(this, context),
-                copyTo,
+                builderParams(this, context),
                 nullValue.get(),
                 indexVersionCreated
             );
@@ -902,12 +900,11 @@ private WildcardFieldMapper(
         WildcardFieldType mappedFieldType,
         int ignoreAbove,
         boolean storeIgnored,
-        MultiFields multiFields,
-        CopyTo copyTo,
+        BuilderParams builderParams,
         String nullValue,
         IndexVersion indexVersionCreated
     ) {
-        super(simpleName, mappedFieldType, multiFields, copyTo);
+        super(simpleName, mappedFieldType, builderParams);
         this.nullValue = nullValue;
         this.ignoreAbove = ignoreAbove;
         this.storeIgnored = storeIgnored;
@@ -990,35 +987,21 @@ public FieldMapper.Builder getMergeBuilder() {
     }
 
     @Override
-    protected SyntheticSourceMode syntheticSourceMode() {
-        return SyntheticSourceMode.NATIVE;
-    }
-
-    @Override
-    public SourceLoader.SyntheticFieldLoader syntheticFieldLoader() {
-        if (copyTo.copyToFields().isEmpty() != true) {
-            throw new IllegalArgumentException(
-                "field [" + fullPath() + "] of type [" + typeName() + "] doesn't support synthetic source because it declares copy_to"
-            );
-        }
-
-        var loader = new WildcardSyntheticFieldLoader();
+    protected SyntheticSourceSupport syntheticSourceSupport() {
+        var layers = new ArrayList<CompositeSyntheticFieldLoader.Layer>();
+        layers.add(new WildcardSyntheticFieldLoader());
         if (ignoreAbove != Defaults.IGNORE_ABOVE) {
-            return new CompositeSyntheticFieldLoader(
-                leafName(),
-                fullPath(),
-                loader,
-                new CompositeSyntheticFieldLoader.StoredFieldLayer(originalName()) {
-                    @Override
-                    protected void writeValue(Object value, XContentBuilder b) throws IOException {
-                        BytesRef r = (BytesRef) value;
-                        b.utf8Value(r.bytes, r.offset, r.length);
-                    }
+            layers.add(new CompositeSyntheticFieldLoader.StoredFieldLayer(originalName()) {
+                @Override
+                protected void writeValue(Object value, XContentBuilder b) throws IOException {
+                    BytesRef r = (BytesRef) value;
+                    b.utf8Value(r.bytes, r.offset, r.length);
                 }
-            );
+            });
         }
 
-        return new CompositeSyntheticFieldLoader(leafName(), fullPath(), loader);
+        var loader = new CompositeSyntheticFieldLoader(leafName(), fullPath(), layers);
+        return new SyntheticSourceSupport.Native(loader);
     }
 
     private class WildcardSyntheticFieldLoader implements CompositeSyntheticFieldLoader.DocValuesLayer {
diff --git a/x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapperTests.java b/x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapperTests.java
index 578fc90bd3e5..7abce10a82f3 100644
--- a/x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapperTests.java
+++ b/x-pack/plugin/wildcard/src/test/java/org/elasticsearch/xpack/wildcard/mapper/WildcardFieldMapperTests.java
@@ -50,7 +50,6 @@
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.IndexVersion;
-import org.elasticsearch.index.IndexVersions;
 import org.elasticsearch.index.cache.bitset.BitsetFilterCache;
 import org.elasticsearch.index.fielddata.FieldDataContext;
 import org.elasticsearch.index.fielddata.IndexFieldData;
@@ -106,7 +105,6 @@ static SearchExecutionContext createMockSearchExecutionContext(boolean allowExpe
 
     static final int MAX_FIELD_LENGTH = 30;
     static WildcardFieldMapper wildcardFieldType;
-    static WildcardFieldMapper wildcardFieldType79;
     static KeywordFieldMapper keywordFieldType;
     private DirectoryReader rewriteReader;
     private BaseDirectoryWrapper rewriteDir;
@@ -128,9 +126,6 @@ public void setUp() throws Exception {
         builder.ignoreAbove(MAX_FIELD_LENGTH);
         wildcardFieldType = builder.build(MapperBuilderContext.root(false, false));
 
-        Builder builder79 = new WildcardFieldMapper.Builder(WILDCARD_FIELD_NAME, IndexVersions.V_7_9_0);
-        wildcardFieldType79 = builder79.build(MapperBuilderContext.root(false, false));
-
         org.elasticsearch.index.mapper.KeywordFieldMapper.Builder kwBuilder = new KeywordFieldMapper.Builder(
             KEYWORD_FIELD_NAME,
             IndexVersion.current()
@@ -211,37 +206,6 @@ public void testIgnoreAbove() throws IOException {
         assertTrue(fields.stream().anyMatch(field -> "field".equals(field.stringValue())));
     }
 
-    public void testBWCIndexVersion() throws IOException {
-        // Create old format index using wildcard ngram analyzer used in 7.9 launch
-        Directory dir = newDirectory();
-        IndexWriterConfig iwc = newIndexWriterConfig(WildcardFieldMapper.WILDCARD_ANALYZER_7_9);
-        iwc.setMergePolicy(newTieredMergePolicy(random()));
-        RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwc);
-
-        Document doc = new Document();
-        LuceneDocument parseDoc = new LuceneDocument();
-        addFields(parseDoc, doc, "a b");
-        indexDoc(parseDoc, doc, iw);
-
-        iw.forceMerge(1);
-        DirectoryReader reader = iw.getReader();
-        IndexSearcher searcher = newSearcher(reader);
-        iw.close();
-
-        // Unnatural circumstance - testing we fail if we were to use the new analyzer on old index
-        Query oldWildcardFieldQuery = wildcardFieldType.fieldType().wildcardQuery("a b", null, null);
-        TopDocs oldWildcardFieldTopDocs = searcher.search(oldWildcardFieldQuery, 10, Sort.INDEXORDER);
-        assertThat(oldWildcardFieldTopDocs.totalHits.value, equalTo(0L));
-
-        // Natural circumstance test we revert to the old analyzer for old indices
-        Query wildcardFieldQuery = wildcardFieldType79.fieldType().wildcardQuery("a b", null, null);
-        TopDocs wildcardFieldTopDocs = searcher.search(wildcardFieldQuery, 10, Sort.INDEXORDER);
-        assertThat(wildcardFieldTopDocs.totalHits.value, equalTo(1L));
-
-        reader.close();
-        dir.close();
-    }
-
     // Test long query strings don't cause exceptions
     public void testTooBigQueryField() throws IOException {
         Directory dir = newDirectory();
diff --git a/x-pack/plugin/wildcard/src/yamlRestTest/resources/rest-api-spec/test/30_synthetic_source.yml b/x-pack/plugin/wildcard/src/yamlRestTest/resources/rest-api-spec/test/30_synthetic_source.yml
new file mode 100644
index 000000000000..ffa76f743398
--- /dev/null
+++ b/x-pack/plugin/wildcard/src/yamlRestTest/resources/rest-api-spec/test/30_synthetic_source.yml
@@ -0,0 +1,90 @@
+synthetic source:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires synthetic source support
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              name:
+                type: keyword
+              wildcard:
+                type: wildcard
+                ignore_above: 6
+
+  - do:
+      bulk:
+        index: synthetic_source_test
+        refresh: true
+        body: |
+          { "index": {"_id" : "1"} }
+          { "name": "A", "wildcard": "hello" }
+          { "index": {"_id" : "2"} }
+          { "name": "B", "wildcard": "long_hello" }
+
+  - do:
+      search:
+        index: synthetic_source_test
+        sort: name
+
+  - match: { "hits.total.value": 2 }
+  - match:
+      hits.hits.0._source.wildcard: "hello"
+  - match:
+      hits.hits.1._source.wildcard: "long_hello"
+
+---
+synthetic source with copy_to:
+  - requires:
+      cluster_features: ["mapper.source.synthetic_source_with_copy_to_and_doc_values_false"]
+      reason: requires copy_to support in synthetic source
+
+  - do:
+      indices.create:
+        index: synthetic_source_test
+        body:
+          mappings:
+            _source:
+              mode: synthetic
+            properties:
+              name:
+                type: keyword
+              wildcard:
+                type: wildcard
+                copy_to: copy
+              copy:
+                type: keyword
+
+  - do:
+      bulk:
+        index: synthetic_source_test
+        refresh: true
+        body: |
+          { "index": {"_id" : "1"} }
+          { "name": "A", "wildcard": "hello" }
+          { "index": {"_id" : "2"} }
+          { "name": "B", "wildcard": "long_hello" }
+
+  - do:
+      search:
+        index: synthetic_source_test
+        sort: name
+        body:
+          fields: ["copy"]
+
+  - match: { "hits.total.value": 2 }
+
+  - match:
+      hits.hits.0._source.wildcard: "hello"
+  - match:
+      hits.hits.0.fields.copy.0: "hello"
+
+  - match:
+      hits.hits.1._source.wildcard: "long_hello"
+  - match:
+      hits.hits.1.fields.copy.0: "long_hello"
diff --git a/x-pack/qa/evil-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosTestCase.java b/x-pack/qa/evil-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosTestCase.java
index cd17723c2635..229b6e2a8f92 100644
--- a/x-pack/qa/evil-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosTestCase.java
+++ b/x-pack/qa/evil-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosTestCase.java
@@ -87,7 +87,8 @@ public abstract class KerberosTestCase extends ESTestCase {
         "mni",
         "sat",
         "sa",
-        "bgc"
+        "bgc",
+        "raj"
     );
 
     @BeforeClass
diff --git a/x-pack/qa/repository-old-versions/build.gradle b/x-pack/qa/repository-old-versions/build.gradle
index c8659aa0753f..1abf6662a1b8 100644
--- a/x-pack/qa/repository-old-versions/build.gradle
+++ b/x-pack/qa/repository-old-versions/build.gradle
@@ -66,7 +66,7 @@ if (OS.current() == OS.WINDOWS) {
   });
 
   int currentMajorVersion = org.elasticsearch.gradle.VersionProperties.elasticsearchVersion.major
-  assert (currentMajorVersion - 2) == 6 : "add archive BWC tests for major version " + (currentMajorVersion - 2)
+  assert (currentMajorVersion - 2) == 7 : "add archive BWC tests for major version " + (currentMajorVersion - 2)
   for (String versionString : ['5.0.0', '5.6.16', '6.0.0', '6.8.20']) {
     Version version = Version.fromString(versionString)
     String packageName = 'org.elasticsearch.distribution.zip'
diff --git a/x-pack/qa/xpack-prefix-rest-compat/build.gradle b/x-pack/qa/xpack-prefix-rest-compat/build.gradle
deleted file mode 100644
index 8b91aae21ff7..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/build.gradle
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-
-import org.elasticsearch.gradle.Version
-import org.elasticsearch.gradle.VersionProperties
-
-apply plugin: 'elasticsearch.legacy-yaml-rest-compat-test'
-
-/**
- * This project exists to test the _xpack prefix for REST compatibility. The _xpack prefix was removed from the specification, but still supported
- * in 7x. This project re-introduces the _xpack prefix in the specification but only for compatibility testing purposes.
- */
-
-configurations {
-  compatXpackTests
-}
-
-int compatVersion = VersionProperties.getElasticsearchVersion().getMajor() - 1;
-
-dependencies {
-  "yamlRestTestV${compatVersion}CompatImplementation" project(':test:framework')
-  "yamlRestTestV${compatVersion}CompatImplementation"(testArtifact(project(':x-pack:plugin')))
-  compatXpackTests project(path: ':x-pack:plugin', configuration: 'restCompatTests')
-}
-
-// copy the already transformed compatible rest tests from the x-pack compatible tests
-tasks.named("copyRestCompatTestTask").configure { task ->
-    task.dependsOn(configurations.compatXpackTests);
-    task.setXpackConfig(configurations.compatXpackTests);
-    task.getIncludeXpack().set(List.of("license", "migration", "ml", "rollup", "sql", "ssl"));
-    def fileOperations = task.getFileOperations()
-    task.getOutputResourceDir().set(project.getLayout().getBuildDirectory().dir("restResources/v${compatVersion}/yamlTests/original"))
-    task.setXpackConfigToFileTree(
-      config -> fileOperations.fileTree(
-        config.getSingleFile()
-      )
-    )
-  }
-
-// location for keys and certificates
-File extraResourceDir = file("$buildDir/extra_resource")
-File nodeKey = file("$extraResourceDir/testnode.pem")
-File nodeCert = file("$extraResourceDir/testnode.crt")
-// location for service tokens
-File serviceTokens = file("$extraResourceDir/service_tokens")
-
-// Add key and certs to test classpath: it expects them there
-// User cert and key PEM files instead of a JKS Keystore for the cluster's trust material so that
-// it can run in a FIPS 140 JVM
-// TODO: Remove all existing uses of cross project file references when the new approach for referencing static files is available
-// https://github.com/elastic/elasticsearch/pull/32201
-def copyExtraResources = tasks.register("copyExtraResources", Copy) {
-  from(project(':x-pack:plugin:core').file('src/test/resources/org/elasticsearch/xpack/security/transport/ssl/certs/simple/')) {
-    include 'testnode.crt', 'testnode.pem'
-  }
-  from(project(':x-pack:plugin:security:qa:service-account').file('src/javaRestTest/resources/')) {
-    include 'service_tokens'
-  }
-  into extraResourceDir
-}
-// Add keystores to test classpath: it expects it there
-sourceSets."yamlRestTestV${compatVersion}Compat".resources.compiledBy(copyExtraResources, t -> {
-  def dirProp = project.objects.directoryProperty()
-  dirProp.set(t.destinationDir)
-  return dirProp;
-})
-
-tasks.named("processYamlRestTestV${compatVersion}CompatResources").configure {
-  dependsOn("copyExtraResources")
-}
-
-testClusters.configureEach {
-  testDistribution = 'DEFAULT' // this is important since we use the reindex module in ML
-  setting 'xpack.ml.enabled', 'true'
-  setting 'xpack.security.enabled', 'true'
-  setting 'xpack.watcher.enabled', 'false'
-  setting 'xpack.security.authc.token.enabled', 'true'
-  setting 'xpack.security.authc.api_key.enabled', 'true'
-  setting 'xpack.security.transport.ssl.enabled', 'true'
-  setting 'xpack.security.transport.ssl.key', nodeKey.name
-  setting 'xpack.security.transport.ssl.certificate', nodeCert.name
-  setting 'xpack.security.transport.ssl.verification_mode', 'certificate'
-  setting 'xpack.security.audit.enabled', 'true'
-  setting 'xpack.license.self_generated.type', 'trial'
-  // disable ILM history, since it disturbs tests using _all
-  setting 'indices.lifecycle.history_index_enabled', 'false'
-  keystore 'bootstrap.password', 'x-pack-test-password'
-  keystore 'xpack.security.transport.ssl.secure_key_passphrase', 'testnode'
-  setting 'xpack.searchable.snapshot.shared_cache.size', '16MB'
-  setting 'xpack.searchable.snapshot.shared_cache.region_size', '256KB'
-
-  user username: "x_pack_rest_user", password: "x-pack-test-password"
-  extraConfigFile nodeKey.name, nodeKey
-  extraConfigFile nodeCert.name, nodeCert
-  extraConfigFile serviceTokens.name, serviceTokens
-
-  requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
-}
-
-// transform (again) the (already) transformed x-pack compatibility tests to test the xpack prefixes
-tasks.named("yamlRestTestV7CompatTransform").configure{ task ->
-
-  task.replaceKeyInDo("license.delete", "xpack-license.delete")
-  task.replaceKeyInDo("license.get", "xpack-license.get")
-  task.replaceKeyInDo("license.get_basic_status", "xpack-license.get_basic_status")
-  task.replaceKeyInDo("license.get_trial_status", "xpack-license.get_trial_status")
-  task.replaceKeyInDo("license.post", "xpack-license.post")
-  task.replaceKeyInDo("license.post_start_basic", "xpack-license.post_start_basic")
-  task.replaceKeyInDo("license.post_start_trial", "xpack-license.post_start_trial")
-  task.addAllowedWarningRegex(".*_xpack/license.* is deprecated.*")
-
-  task.replaceKeyInDo("migration.deprecations", "xpack-migration.deprecations")
-  task.addAllowedWarningRegex(".*_xpack/migration.* is deprecated.*")
-
-  task.replaceKeyInDo("ml.close_job", "xpack-ml.close_job")
-  task.replaceKeyInDo("ml.delete_calendar", "xpack-ml.delete_calendar")
-  task.replaceKeyInDo("ml.delete_calendar_event", "xpack-ml.delete_calendar_event")
-  task.replaceKeyInDo("ml.delete_calendar_job", "xpack-ml.delete_calendar_job")
-  task.replaceKeyInDo("ml.delete_datafeed", "xpack-ml.delete_datafeed")
-  task.replaceKeyInDo("ml.delete_expired_data", "xpack-ml.delete_expired_data")
-  task.replaceKeyInDo("ml.delete_filter", "xpack-ml.delete_filter")
-  task.replaceKeyInDo("ml.delete_forecast", "xpack-ml.delete_forecast")
-  task.replaceKeyInDo("ml.delete_job", "xpack-ml.delete_job")
-  task.replaceKeyInDo("ml.delete_model_snapshot", "xpack-ml.delete_model_snapshot")
-  task.replaceKeyInDo("ml.flush_job", "xpack-ml.flush_job")
-  task.replaceKeyInDo("ml.forecast", "xpack-ml.forecast")
-  task.replaceKeyInDo("ml.get_buckets", "xpack-ml.get_buckets")
-  task.replaceKeyInDo("ml.get_calendar_events", "xpack-ml.get_calendar_events")
-  task.replaceKeyInDo("ml.get_calendars", "xpack-ml.get_calendars")
-  task.replaceKeyInDo("ml.get_categories", "xpack-ml.get_categories")
-  task.replaceKeyInDo("ml.get_datafeed_stats", "xpack-ml.get_datafeed_stats")
-  task.replaceKeyInDo("ml.get_datafeeds", "xpack-ml.get_datafeeds")
-  task.replaceKeyInDo("ml.get_filters", "xpack-ml.get_filters")
-  task.replaceKeyInDo("ml.get_influencers", "xpack-ml.get_influencers")
-  task.replaceKeyInDo("ml.get_job_stats", "xpack-ml.get_job_stats")
-  task.replaceKeyInDo("ml.get_jobs", "xpack-ml.get_jobs")
-  task.replaceKeyInDo("ml.get_model_snapshots", "xpack-ml.get_model_snapshots")
-  task.replaceKeyInDo("ml.get_overall_buckets", "xpack-ml.get_overall_buckets")
-  task.replaceKeyInDo("ml.get_records", "xpack-ml.get_records")
-  task.replaceKeyInDo("ml.info", "xpack-ml.info")
-  task.replaceKeyInDo("ml.open_job", "xpack-ml.open_job")
-  task.replaceKeyInDo("ml.post_calendar_events", "xpack-ml.post_calendar_events")
-  task.replaceKeyInDo("ml.post_data", "xpack-ml.post_data")
-  task.replaceKeyInDo("ml.preview_datafeed", "xpack-ml.preview_datafeed")
-  task.replaceKeyInDo("ml.put_calendar", "xpack-ml.put_calendar")
-  task.replaceKeyInDo("ml.put_calendar_job", "xpack-ml.put_calendar_job")
-  task.replaceKeyInDo("ml.put_datafeed", "xpack-ml.put_datafeed")
-  task.replaceKeyInDo("ml.put_filter", "xpack-ml.put_filter")
-  task.replaceKeyInDo("ml.put_job", "xpack-ml.put_job")
-  task.replaceKeyInDo("ml.revert_model_snapshot", "xpack-ml.revert_model_snapshot")
-  task.replaceKeyInDo("ml.set_upgrade_mode", "xpack-ml.set_upgrade_mode")
-  task.replaceKeyInDo("ml.start_datafeed", "xpack-ml.start_datafeed")
-  task.replaceKeyInDo("ml.stop_datafeed", "xpack-ml.stop_datafeed")
-  task.replaceKeyInDo("ml.update_datafeed", "xpack-ml.update_datafeed")
-  task.replaceKeyInDo("ml.update_filter", "xpack-ml.update_filter")
-  task.replaceKeyInDo("ml.update_job", "xpack-ml.update_job")
-  task.replaceKeyInDo("ml.update_model_snapshot", "xpack-ml.update_model_snapshot")
-  task.replaceKeyInDo("ml.validate", "xpack-ml.validate")
-  task.replaceKeyInDo("ml.validate_detector", "xpack-ml.validate_detector")
-  task.addAllowedWarningRegex(".*_xpack/ml.* is deprecated.*")
-  task.addAllowedWarningRegex("bucket_span .* is not an integral .* of the number of sconds in 1d.* This is now deprecated.*")
-
-  task.replaceKeyInDo("rollup.delete_job", "xpack-rollup.delete_job")
-  task.replaceKeyInDo("rollup.get_jobs", "xpack-rollup.get_jobs")
-  task.replaceKeyInDo("rollup.get_rollup_caps", "xpack-rollup.get_rollup_caps")
-  task.replaceKeyInDo("rollup.get_rollup_index_caps", "xpack-rollup.get_rollup_index_caps")
-  task.replaceKeyInDo("rollup.put_job", "xpack-rollup.put_job")
-  task.replaceKeyInDo("rollup.start_job", "xpack-rollup.start_job")
-  task.replaceKeyInDo("rollup.stop_job", "xpack-rollup.stop_job")
-  task.addAllowedWarningRegex(".*_xpack/rollup.* is deprecated.*")
-
-  task.replaceKeyInDo("sql.clear_cursor", "xpack-sql.clear_cursor")
-  task.replaceKeyInDo("sql.query", "xpack-sql.query")
-  task.replaceKeyInDo("sql.translate", "xpack-sql.translate")
-  task.addAllowedWarningRegex(".*_xpack/sql.* is deprecated.*")
-
-  task.replaceKeyInDo("ssl.certificates", "xpack-ssl.certificates", "Test get SSL certificates")
-  task.addAllowedWarningRegexForTest(".*_xpack/ssl.* is deprecated.*", "Test get SSL certificates")
-}
-
-tasks.named("yamlRestTestV7CompatTest").configure {
-  systemProperty 'tests.rest.blacklist', [
-    'ml/evaluate_data_frame/Test classification auc_roc',
-    'ml/evaluate_data_frame/Test classification auc_roc with default top_classes_field',
-    'ml/evaluate_data_frame/Test outlier_detection auc_roc',
-    'ml/evaluate_data_frame/Test outlier_detection auc_roc include curve',
-    'ml/evaluate_data_frame/Test outlier_detection auc_roc given actual_field is int',
-  ].join(',')
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java
deleted file mode 100644
index 3e060d2875e8..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/java/org/elasticsearch/xpack/test/rest/XPackRestIT.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-package org.elasticsearch.xpack.test.rest;
-
-import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
-
-import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
-
-public class XPackRestIT extends AbstractXPackRestTest {
-
-    public XPackRestIT(ClientYamlTestCandidate testCandidate) {
-        super(testCandidate);
-    }
-
-    @ParametersFactory
-    public static Iterable<Object[]> parameters() throws Exception {
-        return createParameters();
-    }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.delete.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.delete.json
deleted file mode 100644
index 3a20798a8148..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.delete.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "xpack-license.delete":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-license.html",
-      "description":"Deletes licensing information for the cluster"
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/license",
-          "methods":[
-            "DELETE"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get.json
deleted file mode 100644
index e5c89084c375..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "xpack-license.get":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-license.html",
-      "description":"Retrieves licensing information for the cluster"
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/license",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "local":{
-        "type":"boolean",
-        "description":"Return local information, do not retrieve the state from master node (default: false)"
-      },
-      "accept_enterprise":{
-        "type":"boolean",
-        "description":"Supported for backwards compatibility with 7.x. If this param is used it must be set to true",
-        "deprecated":true
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get_basic_status.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get_basic_status.json
deleted file mode 100644
index f0808e45d2da..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get_basic_status.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "xpack-license.get_basic_status":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-basic-status.html",
-      "description":"Retrieves information about the status of the basic license."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/license/basic_status",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{}
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get_trial_status.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get_trial_status.json
deleted file mode 100644
index 8ccde8365830..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.get_trial_status.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "xpack-license.get_trial_status":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/get-trial-status.html",
-      "description":"Retrieves information about the status of the trial license."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/license/trial_status",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{}
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post.json
deleted file mode 100644
index 8db5533bbad9..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "xpack-license.post":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/update-license.html",
-      "description":"Updates the license for the cluster."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/license",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "acknowledge":{
-        "type":"boolean",
-        "description":"whether the user has acknowledged acknowledge messages (default: false)"
-      },
-      "master_timeout": {
-        "type": "time",
-        "description": "Timeout for processing on master node"
-      },
-      "timeout": {
-        "type": "time",
-        "description": "Timeout for acknowledgement of update from all nodes in cluster"
-      }
-    },
-    "body":{
-      "description":"licenses to be installed"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post_start_basic.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post_start_basic.json
deleted file mode 100644
index 4589ed26386c..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post_start_basic.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-license.post_start_basic":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/start-basic.html",
-      "description":"Starts an indefinite basic license."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/license/start_basic",
-          "methods":[
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "acknowledge":{
-        "type":"boolean",
-        "description":"whether the user has acknowledged acknowledge messages (default: false)"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post_start_trial.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post_start_trial.json
deleted file mode 100644
index 225034d397ef..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-license.post_start_trial.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "xpack-license.post_start_trial":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/start-trial.html",
-      "description":"starts a limited time trial license."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/license/start_trial",
-          "methods":[
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "type":{
-        "type":"string",
-        "description":"The type of trial license to generate (default: \"trial\")"
-      },
-      "acknowledge":{
-        "type":"boolean",
-        "description":"whether the user has acknowledged acknowledge messages (default: false)"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-migration.deprecations.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-migration.deprecations.json
deleted file mode 100644
index 05885f845877..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-migration.deprecations.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "xpack-migration.deprecations":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html",
-      "description":"Retrieves information about different cluster, node, and index level settings that use deprecated features that will be removed or changed in the next major version."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/migration/deprecations",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/{index}/_xpack/migration/deprecations",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "index":{
-              "type":"string",
-              "description":"Index pattern"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{}
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.close_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.close_job.json
deleted file mode 100644
index afbf2591e10f..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.close_job.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "xpack-ml.close_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-close-job.html",
-      "description":"Closes one or more anomaly detection jobs. A job can be opened and closed multiple times throughout its lifecycle."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_close",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The name of the job to close"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "allow_no_match":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)"
-      },
-      "allow_no_jobs":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)",
-        "deprecated":true
-      },
-      "force":{
-        "type":"boolean",
-        "required":false,
-        "description":"True if the job should be forcefully closed"
-      },
-      "timeout":{
-        "type":"time",
-        "description":"Controls the time to wait until a job has closed. Default to 30 minutes"
-      }
-    },
-    "body":{
-      "description":"The URL params optionally sent in the body",
-      "required":false
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar.json
deleted file mode 100644
index 7965921a5ea2..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-ml.delete_calendar":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar.html",
-      "description":"Deletes a calendar."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/calendars/{calendar_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "calendar_id":{
-              "type":"string",
-              "description":"The ID of the calendar to delete"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar_event.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar_event.json
deleted file mode 100644
index 7584b2512a8b..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar_event.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "xpack-ml.delete_calendar_event":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar-event.html",
-      "description":"Deletes scheduled events from a calendar."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/calendars/{calendar_id}/events/{event_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "calendar_id":{
-              "type":"string",
-              "description":"The ID of the calendar to modify"
-            },
-            "event_id":{
-              "type":"string",
-              "description":"The ID of the event to remove from the calendar"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar_job.json
deleted file mode 100644
index bdada60699df..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_calendar_job.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "xpack-ml.delete_calendar_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-calendar-job.html",
-      "description":"Deletes anomaly detection jobs from a calendar."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/calendars/{calendar_id}/jobs/{job_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "calendar_id":{
-              "type":"string",
-              "description":"The ID of the calendar to modify"
-            },
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to remove from the calendar"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_datafeed.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_datafeed.json
deleted file mode 100644
index 6743b3eadff9..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_datafeed.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "xpack-ml.delete_datafeed":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-datafeed.html",
-      "description":"Deletes an existing datafeed."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/datafeeds/{datafeed_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "datafeed_id":{
-              "type":"string",
-              "description":"The ID of the datafeed to delete"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "force":{
-        "type":"boolean",
-        "required":false,
-        "description":"True if the datafeed should be forcefully deleted"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_expired_data.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_expired_data.json
deleted file mode 100644
index 0520055d968d..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_expired_data.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "xpack-ml.delete_expired_data":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-expired-data.html",
-      "description":"Deletes expired and unused machine learning data."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/_delete_expired_data/{job_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job(s) to perform expired data hygiene for"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/_delete_expired_data",
-          "methods":[
-            "DELETE"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "requests_per_second":{
-        "type":"number",
-        "required":false,
-        "description":"The desired requests per second for the deletion processes."
-      },
-      "timeout":{
-        "type":"time",
-        "required":false,
-        "description":"How long can the underlying delete processes run until they are canceled"
-      }
-    },
-    "body":{
-      "description":"deleting expired data parameters"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_filter.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_filter.json
deleted file mode 100644
index c9c4f76e15f5..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_filter.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-ml.delete_filter":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-filter.html",
-      "description":"Deletes a filter."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/filters/{filter_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "filter_id":{
-              "type":"string",
-              "description":"The ID of the filter to delete"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_forecast.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_forecast.json
deleted file mode 100644
index 4c647046c370..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_forecast.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "xpack-ml.delete_forecast":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-forecast.html",
-      "description":"Deletes forecasts from a machine learning job."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_forecast",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job from which to delete forecasts"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_forecast/{forecast_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job from which to delete forecasts"
-            },
-            "forecast_id":{
-              "type":"string",
-              "description":"The ID of the forecast to delete, can be comma delimited list. Leaving blank implies `_all`"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "allow_no_forecasts":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if `_all` matches no forecasts"
-      },
-      "timeout":{
-        "type":"time",
-        "required":false,
-        "description":"Controls the time to wait until the forecast(s) are deleted. Default to 30 seconds"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_job.json
deleted file mode 100644
index 9043baacb781..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_job.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "xpack-ml.delete_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-job.html",
-      "description":"Deletes an existing anomaly detection job."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to delete"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "force":{
-        "type":"boolean",
-        "description":"True if the job should be forcefully deleted",
-        "default":false
-      },
-      "wait_for_completion":{
-        "type":"boolean",
-        "description":"Should this request wait until the operation has completed before returning",
-        "default":true
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_model_snapshot.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_model_snapshot.json
deleted file mode 100644
index e3f1dd203660..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.delete_model_snapshot.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "xpack-ml.delete_model_snapshot":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-delete-snapshot.html",
-      "description":"Deletes an existing model snapshot."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to fetch"
-            },
-            "snapshot_id":{
-              "type":"string",
-              "description":"The ID of the snapshot to delete"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.flush_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.flush_job.json
deleted file mode 100644
index 801258194d28..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.flush_job.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "xpack-ml.flush_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-flush-job.html",
-      "description":"Forces any buffered data to be processed by the job."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_flush",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The name of the job to flush"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "calc_interim":{
-        "type":"boolean",
-        "description":"Calculates interim results for the most recent bucket or all buckets within the latency period"
-      },
-      "start":{
-        "type":"string",
-        "description":"When used in conjunction with calc_interim, specifies the range of buckets on which to calculate interim results"
-      },
-      "end":{
-        "type":"string",
-        "description":"When used in conjunction with calc_interim, specifies the range of buckets on which to calculate interim results"
-      },
-      "advance_time":{
-        "type":"string",
-        "description":"Advances time to the given value generating results and updating the model for the advanced interval"
-      },
-      "skip_time":{
-        "type":"string",
-        "description":"Skips time to the given value without generating results or updating the model for the skipped interval"
-      }
-    },
-    "body":{
-      "description":"Flush parameters"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.forecast.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.forecast.json
deleted file mode 100644
index f86d1d6f6d94..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.forecast.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "xpack-ml.forecast":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-forecast.html",
-      "description":"Predicts the future behavior of a time series by using its historical behavior."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_forecast",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to forecast for"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "duration":{
-        "type":"time",
-        "required":false,
-        "description":"The duration of the forecast"
-      },
-      "expires_in":{
-        "type":"time",
-        "required":false,
-        "description":"The time interval after which the forecast expires. Expired forecasts will be deleted at the first opportunity."
-      },
-      "max_model_memory":{
-        "type":"string",
-        "required":false,
-        "description":"The max memory able to be used by the forecast. Default is 20mb."
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_buckets.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_buckets.json
deleted file mode 100644
index 0ccc693b5b68..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_buckets.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "xpack-ml.get_buckets":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-bucket.html",
-      "description":"Retrieves anomaly detection job results for one or more buckets."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/results/buckets/{timestamp}",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"ID of the job to get bucket results from"
-            },
-            "timestamp":{
-              "type":"string",
-              "description":"The timestamp of the desired single bucket result"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/results/buckets",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"ID of the job to get bucket results from"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "expand":{
-        "type":"boolean",
-        "description":"Include anomaly records"
-      },
-      "exclude_interim":{
-        "type":"boolean",
-        "description":"Exclude interim results"
-      },
-      "from":{
-        "type":"int",
-        "description":"skips a number of buckets"
-      },
-      "size":{
-        "type":"int",
-        "description":"specifies a max number of buckets to get"
-      },
-      "start":{
-        "type":"string",
-        "description":"Start time filter for buckets"
-      },
-      "end":{
-        "type":"string",
-        "description":"End time filter for buckets"
-      },
-      "anomaly_score":{
-        "type":"double",
-        "description":"Filter for the most anomalous buckets"
-      },
-      "sort":{
-        "type":"string",
-        "description":"Sort buckets by a particular field"
-      },
-      "desc":{
-        "type":"boolean",
-        "description":"Set the sort direction"
-      }
-    },
-    "body":{
-      "description":"Bucket selection details if not provided in URI"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_calendar_events.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_calendar_events.json
deleted file mode 100644
index 731c51076748..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_calendar_events.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "xpack-ml.get_calendar_events":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-calendar-event.html",
-      "description":"Retrieves information about the scheduled events in calendars."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/calendars/{calendar_id}/events",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "calendar_id":{
-              "type":"string",
-              "description":"The ID of the calendar containing the events"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "job_id":{
-        "type":"string",
-        "description":"Get events for the job. When this option is used calendar_id must be '_all'"
-      },
-      "start":{
-        "type":"string",
-        "description":"Get events after this time"
-      },
-      "end":{
-        "type":"date",
-        "description":"Get events before this time"
-      },
-      "from":{
-        "type":"int",
-        "description":"Skips a number of events"
-      },
-      "size":{
-        "type":"int",
-        "description":"Specifies a max number of events to get"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_calendars.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_calendars.json
deleted file mode 100644
index c80005451ff0..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_calendars.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "xpack-ml.get_calendars":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-calendar.html",
-      "description":"Retrieves configuration information for calendars."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/calendars",
-          "methods":[
-            "GET",
-            "POST"
-          ]
-        },
-        {
-          "path":"/_xpack/ml/calendars/{calendar_id}",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "calendar_id":{
-              "type":"string",
-              "description":"The ID of the calendar to fetch"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "from":{
-        "type":"int",
-        "description":"skips a number of calendars"
-      },
-      "size":{
-        "type":"int",
-        "description":"specifies a max number of calendars to get"
-      }
-    },
-    "body":{
-      "description":"The from and size parameters optionally sent in the body"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_categories.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_categories.json
deleted file mode 100644
index 4fce55f68224..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_categories.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "xpack-ml.get_categories":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-category.html",
-      "description":"Retrieves anomaly detection job results for one or more categories."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/results/categories/{category_id}",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The name of the job"
-            },
-            "category_id":{
-              "type":"long",
-              "description":"The identifier of the category definition of interest"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/results/categories",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The name of the job"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "from":{
-        "type":"int",
-        "description":"skips a number of categories"
-      },
-      "size":{
-        "type":"int",
-        "description":"specifies a max number of categories to get"
-      },
-      "partition_field_value":{
-        "type":"string",
-        "description":"Specifies the partition to retrieve categories for. This is optional, and should never be used for jobs where per-partition categorization is disabled."
-      }
-    },
-    "body":{
-      "description":"Category selection details if not provided in URI"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_datafeed_stats.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_datafeed_stats.json
deleted file mode 100644
index 1c63df2a33fe..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_datafeed_stats.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "xpack-ml.get_datafeed_stats":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed-stats.html",
-      "description":"Retrieves usage information for datafeeds."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/datafeeds/{datafeed_id}/_stats",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "datafeed_id":{
-              "type":"string",
-              "description":"The ID of the datafeeds stats to fetch"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/datafeeds/_stats",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "allow_no_match":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)"
-      },
-      "allow_no_datafeeds":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)",
-        "deprecated":true
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_datafeeds.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_datafeeds.json
deleted file mode 100644
index 14f8a3f65397..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_datafeeds.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "xpack-ml.get_datafeeds":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-datafeed.html",
-      "description":"Retrieves configuration information for datafeeds."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/datafeeds/{datafeed_id}",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "datafeed_id":{
-              "type":"string",
-              "description":"The ID of the datafeeds to fetch"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/datafeeds",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "allow_no_match":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)"
-      },
-      "allow_no_datafeeds":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)",
-        "deprecated":true
-      },
-      "exclude_generated": {
-        "required": false,
-        "type": "boolean",
-        "default": false,
-        "description": "Omits fields that are illegal to set on datafeed PUT"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_filters.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_filters.json
deleted file mode 100644
index 886f289a7509..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_filters.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "xpack-ml.get_filters":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-filter.html",
-      "description":"Retrieves filters."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/filters",
-          "methods":[
-            "GET"
-          ]
-        },
-        {
-          "path":"/_xpack/ml/filters/{filter_id}",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "filter_id":{
-              "type":"string",
-              "description":"The ID of the filter to fetch"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "from":{
-        "type":"int",
-        "description":"skips a number of filters"
-      },
-      "size":{
-        "type":"int",
-        "description":"specifies a max number of filters to get"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_influencers.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_influencers.json
deleted file mode 100644
index d039f14175f0..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_influencers.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "xpack-ml.get_influencers":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-influencer.html",
-      "description":"Retrieves anomaly detection job results for one or more influencers."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/results/influencers",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"Identifier for the anomaly detection job"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "exclude_interim":{
-        "type":"boolean",
-        "description":"Exclude interim results"
-      },
-      "from":{
-        "type":"int",
-        "description":"skips a number of influencers"
-      },
-      "size":{
-        "type":"int",
-        "description":"specifies a max number of influencers to get"
-      },
-      "start":{
-        "type":"string",
-        "description":"start timestamp for the requested influencers"
-      },
-      "end":{
-        "type":"string",
-        "description":"end timestamp for the requested influencers"
-      },
-      "influencer_score":{
-        "type":"double",
-        "description":"influencer score threshold for the requested influencers"
-      },
-      "sort":{
-        "type":"string",
-        "description":"sort field for the requested influencers"
-      },
-      "desc":{
-        "type":"boolean",
-        "description":"whether the results should be sorted in decending order"
-      }
-    },
-    "body":{
-      "description":"Influencer selection criteria"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_job_stats.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_job_stats.json
deleted file mode 100644
index ea6154916c15..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_job_stats.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "xpack-ml.get_job_stats":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job-stats.html",
-      "description":"Retrieves usage information for anomaly detection jobs."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/_stats",
-          "methods":[
-            "GET"
-          ]
-        },
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_stats",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the jobs stats to fetch"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "allow_no_match":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)"
-      },
-      "allow_no_jobs":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)",
-        "deprecated":true
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_jobs.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_jobs.json
deleted file mode 100644
index 70fb374b846f..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_jobs.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "xpack-ml.get_jobs":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-job.html",
-      "description":"Retrieves configuration information for anomaly detection jobs."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the jobs to fetch"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/anomaly_detectors",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "allow_no_match":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)"
-      },
-      "allow_no_jobs":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)",
-        "deprecated":true
-      },
-      "exclude_generated": {
-        "required": false,
-        "type": "boolean",
-        "default": false,
-        "description": "Omits fields that are illegal to set on job PUT"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_model_snapshots.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_model_snapshots.json
deleted file mode 100644
index 44120f655960..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_model_snapshots.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "xpack-ml.get_model_snapshots":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-snapshot.html",
-      "description":"Retrieves information about model snapshots."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to fetch"
-            },
-            "snapshot_id":{
-              "type":"string",
-              "description":"The ID of the snapshot to fetch"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/model_snapshots",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to fetch"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "from":{
-        "type":"int",
-        "description":"Skips a number of documents"
-      },
-      "size":{
-        "type":"int",
-        "description":"The default number of documents returned in queries as a string."
-      },
-      "start":{
-        "type":"date",
-        "description":"The filter 'start' query parameter"
-      },
-      "end":{
-        "type":"date",
-        "description":"The filter 'end' query parameter"
-      },
-      "sort":{
-        "type":"string",
-        "description":"Name of the field to sort on"
-      },
-      "desc":{
-        "type":"boolean",
-        "description":"True if the results should be sorted in descending order"
-      }
-    },
-    "body":{
-      "description":"Model snapshot selection criteria"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_overall_buckets.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_overall_buckets.json
deleted file mode 100644
index d18e0c1be3df..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_overall_buckets.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "xpack-ml.get_overall_buckets":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-overall-buckets.html",
-      "description":"Retrieves overall bucket results that summarize the bucket results of multiple anomaly detection jobs."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/results/overall_buckets",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The job IDs for which to calculate overall bucket results"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "top_n":{
-        "type":"int",
-        "description":"The number of top job bucket scores to be used in the overall_score calculation"
-      },
-      "bucket_span":{
-        "type":"string",
-        "description":"The span of the overall buckets. Defaults to the longest job bucket_span"
-      },
-      "overall_score":{
-        "type":"double",
-        "description":"Returns overall buckets with overall scores higher than this value"
-      },
-      "exclude_interim":{
-        "type":"boolean",
-        "description":"If true overall buckets that include interim buckets will be excluded"
-      },
-      "start":{
-        "type":"string",
-        "description":"Returns overall buckets with timestamps after this time"
-      },
-      "end":{
-        "type":"string",
-        "description":"Returns overall buckets with timestamps earlier than this time"
-      },
-      "allow_no_match":{
-        "type":"boolean",
-        "description":"Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)"
-      },
-      "allow_no_jobs":{
-        "type":"boolean",
-        "description":"Whether to ignore if a wildcard expression matches no jobs. (This includes `_all` string or when no jobs have been specified)",
-        "deprecated":true
-      }
-    },
-    "body":{
-      "description":"Overall bucket selection details if not provided in URI"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_records.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_records.json
deleted file mode 100644
index a930001a0e31..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.get_records.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "xpack-ml.get_records":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-get-record.html",
-      "description":"Retrieves anomaly records for an anomaly detection job."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/results/records",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "exclude_interim":{
-        "type":"boolean",
-        "description":"Exclude interim results"
-      },
-      "from":{
-        "type":"int",
-        "description":"skips a number of records"
-      },
-      "size":{
-        "type":"int",
-        "description":"specifies a max number of records to get"
-      },
-      "start":{
-        "type":"string",
-        "description":"Start time filter for records"
-      },
-      "end":{
-        "type":"string",
-        "description":"End time filter for records"
-      },
-      "record_score":{
-        "type":"double",
-        "description":"Returns records with anomaly scores greater or equal than this value"
-      },
-      "sort":{
-        "type":"string",
-        "description":"Sort records by a particular field"
-      },
-      "desc":{
-        "type":"boolean",
-        "description":"Set the sort direction"
-      }
-    },
-    "body":{
-      "description":"Record selection criteria"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.info.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.info.json
deleted file mode 100644
index a21bf7986ac2..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.info.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "xpack-ml.info":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/get-ml-info.html",
-      "description":"Returns defaults and limits used by machine learning."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/info",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.open_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.open_job.json
deleted file mode 100644
index e464c3743695..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.open_job.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-ml.open_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-open-job.html",
-      "description":"Opens one or more anomaly detection jobs."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_open",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to open"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.post_calendar_events.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.post_calendar_events.json
deleted file mode 100644
index ca754b25a0d0..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.post_calendar_events.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "xpack-ml.post_calendar_events":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-post-calendar-event.html",
-      "description":"Posts scheduled events in a calendar."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/calendars/{calendar_id}/events",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "calendar_id":{
-              "type":"string",
-              "description":"The ID of the calendar to modify"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"A list of events",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.post_data.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.post_data.json
deleted file mode 100644
index 21d4687e5411..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.post_data.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "xpack-ml.post_data":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-post-data.html",
-      "description":"Sends data to an anomaly detection job for analysis."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/x-ndjson", "application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_data",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The name of the job receiving the data"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "reset_start":{
-        "type":"string",
-        "description":"Optional parameter to specify the start of the bucket resetting range"
-      },
-      "reset_end":{
-        "type":"string",
-        "description":"Optional parameter to specify the end of the bucket resetting range"
-      }
-    },
-    "body":{
-      "description":"The data to process",
-      "required":true,
-      "serialize":"bulk"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.preview_datafeed.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.preview_datafeed.json
deleted file mode 100644
index c14869ff1242..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.preview_datafeed.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "xpack-ml.preview_datafeed":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-preview-datafeed.html",
-      "description":"Previews a datafeed."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/datafeeds/{datafeed_id}/_preview",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "datafeed_id":{
-              "type":"string",
-              "description":"The ID of the datafeed to preview"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/ml/datafeeds/_preview",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"The datafeed config and job config with which to execute the preview",
-      "required":false
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_calendar.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_calendar.json
deleted file mode 100644
index d44674646e71..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_calendar.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "xpack-ml.put_calendar":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-calendar.html",
-      "description":"Instantiates a calendar."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/calendars/{calendar_id}",
-          "methods":[
-            "PUT"
-          ],
-          "parts":{
-            "calendar_id":{
-              "type":"string",
-              "description":"The ID of the calendar to create"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"The calendar details",
-      "required":false
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_calendar_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_calendar_job.json
deleted file mode 100644
index 3351ba74cf96..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_calendar_job.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "xpack-ml.put_calendar_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-calendar-job.html",
-      "description":"Adds an anomaly detection job to a calendar."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/calendars/{calendar_id}/jobs/{job_id}",
-          "methods":[
-            "PUT"
-          ],
-          "parts":{
-            "calendar_id":{
-              "type":"string",
-              "description":"The ID of the calendar to modify"
-            },
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to add to the calendar"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_datafeed.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_datafeed.json
deleted file mode 100644
index 3e2700899214..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_datafeed.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "xpack-ml.put_datafeed":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-datafeed.html",
-      "description":"Instantiates a datafeed."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/datafeeds/{datafeed_id}",
-          "methods":[
-            "PUT"
-          ],
-          "parts":{
-            "datafeed_id":{
-              "type":"string",
-              "description":"The ID of the datafeed to create"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"The datafeed config",
-      "required":true
-    },
-    "params":{
-      "ignore_unavailable":{
-        "type":"boolean",
-        "description":"Ignore unavailable indexes (default: false)"
-      },
-      "allow_no_indices":{
-        "type":"boolean",
-        "description":"Ignore if the source indices expressions resolves to no concrete indices (default: true)"
-      },
-      "ignore_throttled":{
-        "type":"boolean",
-        "description":"Ignore indices that are marked as throttled (default: true)"
-      },
-      "expand_wildcards":{
-        "type":"enum",
-        "options":[
-          "open",
-          "closed",
-          "hidden",
-          "none",
-          "all"
-        ],
-        "description":"Whether source index expressions should get expanded to open or closed indices (default: open)"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_filter.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_filter.json
deleted file mode 100644
index a36f748bb6bb..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_filter.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "xpack-ml.put_filter":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-filter.html",
-      "description":"Instantiates a filter."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/filters/{filter_id}",
-          "methods":[
-            "PUT"
-          ],
-          "parts":{
-            "filter_id":{
-              "type":"string",
-              "description":"The ID of the filter to create"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"The filter details",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_job.json
deleted file mode 100644
index 3c1798170969..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.put_job.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "xpack-ml.put_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-put-job.html",
-      "description":"Instantiates an anomaly detection job."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}",
-          "methods":[
-            "PUT"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to create"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "ignore_unavailable":{
-        "type":"boolean",
-        "description":"Ignore unavailable indexes (default: false). Only set if datafeed_config is provided."
-      },
-      "allow_no_indices":{
-        "type":"boolean",
-        "description":"Ignore if the source indices expressions resolves to no concrete indices (default: true). Only set if datafeed_config is provided."
-      },
-      "ignore_throttled":{
-        "type":"boolean",
-        "description":"Ignore indices that are marked as throttled (default: true). Only set if datafeed_config is provided."
-      },
-      "expand_wildcards":{
-        "type":"enum",
-        "options":[
-          "open",
-          "closed",
-          "hidden",
-          "none",
-          "all"
-        ],
-        "description":"Whether source index expressions should get expanded to open or closed indices (default: open). Only set if datafeed_config is provided."
-      }
-    },
-    "body":{
-      "description":"The job",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.revert_model_snapshot.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.revert_model_snapshot.json
deleted file mode 100644
index 803595f9ec0b..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.revert_model_snapshot.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "xpack-ml.revert_model_snapshot":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-revert-snapshot.html",
-      "description":"Reverts to a specific snapshot."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}/_revert",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to fetch"
-            },
-            "snapshot_id":{
-              "type":"string",
-              "description":"The ID of the snapshot to revert to"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "delete_intervening_results":{
-        "type":"boolean",
-        "description":"Should we reset the results back to the time of the snapshot?"
-      }
-    },
-    "body":{
-      "description":"Reversion options"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.set_upgrade_mode.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.set_upgrade_mode.json
deleted file mode 100644
index 1967d8a6262f..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.set_upgrade_mode.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "xpack-ml.set_upgrade_mode":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-set-upgrade-mode.html",
-      "description":"Sets a cluster wide upgrade_mode setting that prepares machine learning indices for an upgrade."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/set_upgrade_mode",
-          "methods":[
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "enabled":{
-        "type":"boolean",
-        "description":"Whether to enable upgrade_mode ML setting or not. Defaults to false."
-      },
-      "timeout":{
-        "type":"time",
-        "description":"Controls the time to wait before action times out. Defaults to 30 seconds"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.start_datafeed.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.start_datafeed.json
deleted file mode 100644
index cef069eaa153..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.start_datafeed.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "xpack-ml.start_datafeed":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-start-datafeed.html",
-      "description":"Starts one or more datafeeds."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/datafeeds/{datafeed_id}/_start",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "datafeed_id":{
-              "type":"string",
-              "description":"The ID of the datafeed to start"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "start":{
-        "type":"string",
-        "required":false,
-        "description":"The start time from where the datafeed should begin"
-      },
-      "end":{
-        "type":"string",
-        "required":false,
-        "description":"The end time when the datafeed should stop. When not set, the datafeed continues in real time"
-      },
-      "timeout":{
-        "type":"time",
-        "required":false,
-        "description":"Controls the time to wait until a datafeed has started. Default to 20 seconds"
-      }
-    },
-    "body":{
-      "description":"The start datafeed parameters"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.stop_datafeed.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.stop_datafeed.json
deleted file mode 100644
index b09d536f05b3..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.stop_datafeed.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "xpack-ml.stop_datafeed":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-stop-datafeed.html",
-      "description":"Stops one or more datafeeds."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/datafeeds/{datafeed_id}/_stop",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "datafeed_id":{
-              "type":"string",
-              "description":"The ID of the datafeed to stop"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "allow_no_match":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)"
-      },
-      "allow_no_datafeeds":{
-        "type":"boolean",
-        "required":false,
-        "description":"Whether to ignore if a wildcard expression matches no datafeeds. (This includes `_all` string or when no datafeeds have been specified)",
-        "deprecated":true
-      },
-      "force":{
-        "type":"boolean",
-        "required":false,
-        "description":"True if the datafeed should be forcefully stopped."
-      },
-      "timeout":{
-        "type":"time",
-        "required":false,
-        "description":"Controls the time to wait until a datafeed has stopped. Default to 20 seconds"
-      }
-    },
-    "body":{
-      "description":"The URL params optionally sent in the body",
-      "required":false
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_datafeed.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_datafeed.json
deleted file mode 100644
index ccddff3dd011..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_datafeed.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "xpack-ml.update_datafeed":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-datafeed.html",
-      "description":"Updates certain properties of a datafeed."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/datafeeds/{datafeed_id}/_update",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "datafeed_id":{
-              "type":"string",
-              "description":"The ID of the datafeed to update"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"The datafeed update settings",
-      "required":true
-    },
-    "params":{
-      "ignore_unavailable":{
-        "type":"boolean",
-        "description":"Ignore unavailable indexes (default: false)"
-      },
-      "allow_no_indices":{
-        "type":"boolean",
-        "description":"Ignore if the source indices expressions resolves to no concrete indices (default: true)"
-      },
-      "ignore_throttled":{
-        "type":"boolean",
-        "description":"Ignore indices that are marked as throttled (default: true)"
-      },
-      "expand_wildcards":{
-        "type":"enum",
-        "options":[
-          "open",
-          "closed",
-          "hidden",
-          "none",
-          "all"
-        ],
-        "description":"Whether source index expressions should get expanded to open or closed indices (default: open)"
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_filter.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_filter.json
deleted file mode 100644
index 00e58675e0db..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_filter.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "xpack-ml.update_filter":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-filter.html",
-      "description":"Updates the description of a filter, adds items, or removes items."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/filters/{filter_id}/_update",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "filter_id":{
-              "type":"string",
-              "description":"The ID of the filter to update"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"The filter update",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_job.json
deleted file mode 100644
index 62e79020ac76..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_job.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "xpack-ml.update_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-job.html",
-      "description":"Updates certain properties of an anomaly detection job."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/_update",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to create"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"The job update settings",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_model_snapshot.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_model_snapshot.json
deleted file mode 100644
index cd72375d6ae4..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.update_model_snapshot.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "xpack-ml.update_model_snapshot":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/ml-update-snapshot.html",
-      "description":"Updates certain properties of a snapshot."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/{job_id}/model_snapshots/{snapshot_id}/_update",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "job_id":{
-              "type":"string",
-              "description":"The ID of the job to fetch"
-            },
-            "snapshot_id":{
-              "type":"string",
-              "description":"The ID of the snapshot to update"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{},
-    "body":{
-      "description":"The model snapshot properties to update",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.validate.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.validate.json
deleted file mode 100644
index ad337c3c1ad8..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.validate.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-ml.validate":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html",
-      "description":"Validates an anomaly detection job."
-    },
-    "stability":"stable",
-    "visibility":"private",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/_validate",
-          "methods":[
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{},
-    "body":{
-      "description":"The job config",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.validate_detector.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.validate_detector.json
deleted file mode 100644
index 5a06df8977df..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ml.validate_detector.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-ml.validate_detector":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/machine-learning/current/ml-jobs.html",
-      "description":"Validates an anomaly detection detector."
-    },
-    "stability":"stable",
-    "visibility":"private",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ml/anomaly_detectors/_validate/detector",
-          "methods":[
-            "POST"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{},
-    "body":{
-      "description":"The detector",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-monitoring.bulk.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-monitoring.bulk.json
deleted file mode 100644
index bf37993fb786..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-monitoring.bulk.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "xpack-monitoring.bulk":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/monitor-elasticsearch-cluster.html",
-      "description":"Used by the monitoring features to send monitoring data."
-    },
-    "stability":"experimental",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/x-ndjson;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/monitoring/_bulk",
-          "methods":[
-            "POST",
-            "PUT"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "system_id":{
-        "type":"string",
-        "description":"Identifier of the monitored system"
-      },
-      "system_api_version":{
-        "type":"string",
-        "description":"API Version of the monitored system"
-      },
-      "interval":{
-        "type":"string",
-        "description":"Collection interval (e.g., '10s' or '10000ms') of the payload"
-      }
-    },
-    "body":{
-      "description":"The operation definition and data (action-data pairs), separated by newlines",
-      "required":true,
-      "serialize":"bulk"
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.delete_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.delete_job.json
deleted file mode 100644
index 3c23fddd7e4f..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.delete_job.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-rollup.delete_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-delete-job.html",
-      "description":"Deletes an existing rollup job."
-    },
-    "stability":"experimental",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/rollup/job/{id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The ID of the job to delete"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_jobs.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_jobs.json
deleted file mode 100644
index 6b98664cf17e..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_jobs.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "xpack-rollup.get_jobs":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-job.html",
-      "description":"Retrieves the configuration, stats, and status of rollup jobs."
-    },
-    "stability":"experimental",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/rollup/job/{id}",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The ID of the job(s) to fetch. Accepts glob patterns, or left blank for all jobs"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/rollup/job/",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_rollup_caps.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_rollup_caps.json
deleted file mode 100644
index a8b95d00b6c3..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_rollup_caps.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "xpack-rollup.get_rollup_caps":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-caps.html",
-      "description":"Returns the capabilities of any rollup jobs that have been configured for a specific index or index pattern."
-    },
-    "stability":"experimental",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/rollup/data/{id}",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The ID of the index to check rollup capabilities on, or left blank for all jobs"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        },
-        {
-          "path":"/_xpack/rollup/data/",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_rollup_index_caps.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_rollup_index_caps.json
deleted file mode 100644
index 38c9af891add..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.get_rollup_index_caps.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-rollup.get_rollup_index_caps":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-index-caps.html",
-      "description":"Returns the rollup capabilities of all jobs inside of a rollup index (e.g. the index where rollup data is stored)."
-    },
-    "stability":"experimental",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/{index}/_xpack/rollup/data",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "index":{
-              "type":"string",
-              "description":"The rollup index or index pattern to obtain rollup capabilities from."
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.put_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.put_job.json
deleted file mode 100644
index 865a6f448193..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.put_job.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "xpack-rollup.put_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-put-job.html",
-      "description":"Creates a rollup job."
-    },
-    "stability":"experimental",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/rollup/job/{id}",
-          "methods":[
-            "PUT"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The ID of the job to create"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "body":{
-      "description":"The job configuration",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.start_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.start_job.json
deleted file mode 100644
index aebaf859ce9e..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.start_job.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "xpack-rollup.start_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-start-job.html",
-      "description":"Starts an existing, stopped rollup job."
-    },
-    "stability":"experimental",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/rollup/job/{id}/_start",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The ID of the job to start"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.stop_job.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.stop_job.json
deleted file mode 100644
index 62eada2313f2..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-rollup.stop_job.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "xpack-rollup.stop_job":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-stop-job.html",
-      "description":"Stops an existing, started rollup job."
-    },
-    "stability":"experimental",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/rollup/job/{id}/_stop",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The ID of the job to stop"
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{
-      "wait_for_completion":{
-        "type":"boolean",
-        "required":false,
-        "description":"True if the API should block until the job has fully stopped, false if should be executed async. Defaults to false."
-      },
-      "timeout":{
-        "type":"time",
-        "required":false,
-        "description":"Block for (at maximum) the specified duration while waiting for the job to stop.  Defaults to 30s."
-      }
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.clear_cursor.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.clear_cursor.json
deleted file mode 100644
index ee706fc0736c..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.clear_cursor.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "xpack-sql.clear_cursor":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-sql-cursor-api.html",
-      "description":"Clears the SQL cursor"
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/sql/close",
-          "methods":[
-            "POST"
-          ]
-        }
-      ]
-    },
-    "body":{
-      "description":"Specify the cursor value in the `cursor` element to clean the cursor.",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.query.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.query.json
deleted file mode 100644
index d153e0f3484c..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.query.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "xpack-sql.query":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-search-api.html",
-      "description":"Executes a SQL request"
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/sql",
-          "methods":[
-            "POST",
-            "GET"
-          ]
-        }
-      ]
-    },
-    "params":{
-      "format":{
-        "type":"string",
-        "description":"a short version of the Accept header, e.g. json, yaml"
-      }
-    },
-    "body":{
-      "description":"Use the `query` element to start a query. Use the `cursor` element to continue a query.",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.translate.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.translate.json
deleted file mode 100644
index 1fad4a643dbb..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-sql.translate.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "xpack-sql.translate":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/sql-translate-api.html",
-      "description":"Translates SQL into Elasticsearch queries"
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/vnd.elasticsearch+json;compatible-with=7"],
-      "content_type": ["application/vnd.elasticsearch+json;compatible-with=7"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/sql/translate",
-          "methods":[
-            "POST",
-            "GET"
-          ]
-        }
-      ]
-    },
-    "params":{},
-    "body":{
-      "description":"Specify the query in the `query` element.",
-      "required":true
-    }
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ssl.certificates.json b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ssl.certificates.json
deleted file mode 100644
index 7d25b0bf8f4f..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/api/xpack-ssl.certificates.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "xpack-ssl.certificates":{
-    "documentation":{
-      "url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-ssl.html",
-      "description":"Retrieves information about the X.509 certificates used to encrypt communications in the cluster."
-    },
-    "stability":"stable",
-    "visibility":"public",
-    "headers":{
-      "accept": [ "application/json"]
-    },
-    "url":{
-      "paths":[
-        {
-          "path":"/_xpack/ssl/certificates",
-          "methods":[
-            "GET"
-          ],
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"all _xpack prefix have been deprecated"
-          }
-        }
-      ]
-    },
-    "params":{}
-  }
-}
diff --git a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml b/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml
deleted file mode 100644
index a88f67b39478..000000000000
--- a/x-pack/qa/xpack-prefix-rest-compat/src/yamlRestTestV7Compat/resources/rest-api-spec/test/monitoring.bulk/10_basic_compat.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-setup:
-  - requires:
-      test_runner_features:
-        - "headers"
-        - "warnings_regex"
-
----
-"Bulk indexing of monitoring data":
-
-  - do:
-      headers:
-        Content-Type: "application/vnd.elasticsearch+json;compatible-with=7"
-        Accept: "application/vnd.elasticsearch+json;compatible-with=7"
-      xpack-monitoring.bulk:
-        system_id:          "kibana"
-        system_api_version: "6"
-        interval:           "10s"
-        body:
-          - index:
-              _type:  test_type
-          - avg-cpu:
-              user:   13.26
-              nice:   0.17
-              system: 1.51
-              iowait: 0.85
-              idle:   84.20
-      warnings_regex:
-        - "\\[.* /_xpack/monitoring/_bulk\\] is deprecated! Use \\[.* /_monitoring/bulk\\] instead."
-
-  - is_false: errors