diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index ca0180755b..e0f8143cba 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -1097,6 +1097,40 @@
             "$ref": "#/components/parameters/cat.count-s"
           }
         ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/cat.count"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/cat.count-200"
+          }
+        },
+        "x-state": "Generally available",
+        "x-metaTags": [
+          {
+            "content": "Elasticsearch",
+            "name": "product_name"
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "cat"
+        ],
+        "summary": "Get a document count",
+        "description": "Get quick access to a document count for a data stream, an index, or an entire cluster.\nThe document count only includes live documents, not deleted documents which have not yet been removed by the merge process.\n\nIMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the count API.\n\n## Required authorization\n\n* Index privileges: `read`\n",
+        "operationId": "cat-count-1",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/cat.count-h"
+          },
+          {
+            "$ref": "#/components/parameters/cat.count-s"
+          }
+        ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/cat.count"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/cat.count-200"
@@ -1118,7 +1152,7 @@
         ],
         "summary": "Get a document count",
         "description": "Get quick access to a document count for a data stream, an index, or an entire cluster.\nThe document count only includes live documents, not deleted documents which have not yet been removed by the merge process.\n\nIMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the count API.\n\n## Required authorization\n\n* Index privileges: `read`\n",
-        "operationId": "cat-count-1",
+        "operationId": "cat-count-2",
         "parameters": [
           {
             "$ref": "#/components/parameters/cat.count-index"
@@ -1130,6 +1164,43 @@
             "$ref": "#/components/parameters/cat.count-s"
           }
         ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/cat.count"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/cat.count-200"
+          }
+        },
+        "x-state": "Generally available",
+        "x-metaTags": [
+          {
+            "content": "Elasticsearch",
+            "name": "product_name"
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "cat"
+        ],
+        "summary": "Get a document count",
+        "description": "Get quick access to a document count for a data stream, an index, or an entire cluster.\nThe document count only includes live documents, not deleted documents which have not yet been removed by the merge process.\n\nIMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the count API.\n\n## Required authorization\n\n* Index privileges: `read`\n",
+        "operationId": "cat-count-3",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/cat.count-index"
+          },
+          {
+            "$ref": "#/components/parameters/cat.count-h"
+          },
+          {
+            "$ref": "#/components/parameters/cat.count-s"
+          }
+        ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/cat.count"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/cat.count-200"
@@ -19303,109 +19374,67 @@
         "operationId": "indices-resolve-index",
         "parameters": [
           {
-            "in": "path",
-            "name": "name",
-            "description": "Comma-separated name(s) or index pattern(s) of the indices, aliases, and data streams to resolve.\nResources on remote clusters can be specified using the `<cluster>`:`<name>` syntax.",
-            "required": true,
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.Names"
-            },
-            "style": "simple"
+            "$ref": "#/components/parameters/indices.resolve_index-name"
           },
           {
-            "in": "query",
-            "name": "expand_wildcards",
-            "description": "Type of index that wildcard patterns can match.\nIf the request can target data streams, this argument determines whether wildcard expressions match hidden data streams.\nSupports comma-separated values, such as `open,hidden`.",
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.ExpandWildcards"
-            },
-            "style": "form"
+            "$ref": "#/components/parameters/indices.resolve_index-expand_wildcards"
           },
           {
-            "in": "query",
-            "name": "ignore_unavailable",
-            "description": "If `false`, the request returns an error if it targets a missing or closed index.",
-            "deprecated": false,
-            "schema": {
-              "type": "boolean"
-            },
-            "style": "form"
+            "$ref": "#/components/parameters/indices.resolve_index-ignore_unavailable"
           },
           {
-            "in": "query",
-            "name": "allow_no_indices",
-            "description": "If `false`, the request returns an error if any wildcard expression, index alias, or `_all` value targets only missing or closed indices.\nThis behavior applies even if the request targets other open indices.\nFor example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.",
-            "deprecated": false,
-            "schema": {
-              "type": "boolean"
-            },
-            "style": "form"
+            "$ref": "#/components/parameters/indices.resolve_index-allow_no_indices"
           },
           {
-            "in": "query",
-            "name": "mode",
-            "description": "Filter indices by index mode - standard, lookup, time_series, etc. Comma-separated list of IndexMode. Empty means no filter.",
-            "deprecated": false,
-            "schema": {
-              "oneOf": [
-                {
-                  "$ref": "#/components/schemas/indices._types.IndexMode"
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/indices._types.IndexMode"
-                  }
-                }
-              ]
-            },
-            "x-state": "Generally available; Added in 9.2.0",
-            "style": "form"
+            "$ref": "#/components/parameters/indices.resolve_index-mode"
           }
         ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/indices.resolve_index"
+        },
         "responses": {
           "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "indices": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexItem"
-                      }
-                    },
-                    "aliases": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexAliasItem"
-                      }
-                    },
-                    "data_streams": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexDataStreamsItem"
-                      }
-                    }
-                  },
-                  "required": [
-                    "indices",
-                    "aliases",
-                    "data_streams"
-                  ]
-                },
-                "examples": {
-                  "ResolveIndexResponseExample1": {
-                    "description": "A successful response from `GET /_resolve/index/f*,remoteCluster1:bar*?expand_wildcards=all`.",
-                    "value": "{\n  \"indices\": [\n    {\n      \"name\": \"foo_closed\",\n      \"attributes\": [\n        \"closed\"\n      ],\n      \"mode\": \"standard\"\n    },\n    {\n      \"name\": \"freeze-index\",\n      \"aliases\": [\n        \"f-alias\"\n      ],\n      \"attributes\": [\n        \"open\"\n      ]\n    },\n    {\n      \"name\": \"remoteCluster1:bar-01\",\n      \"attributes\": [\n        \"open\"\n      ]\n    }\n  ],\n  \"aliases\": [\n    {\n      \"name\": \"f-alias\",\n      \"indices\": [\n        \"freeze-index\",\n        \"my-index-000001\"\n      ]\n    }\n  ],\n  \"data_streams\": [\n    {\n      \"name\": \"foo\",\n      \"backing_indices\": [\n        \".ds-foo-2099.03.07-000001\"\n      ],\n      \"timestamp_field\": \"@timestamp\"\n    }\n  ]\n}"
-                  }
-                }
-              }
-            }
+            "$ref": "#/components/responses/indices.resolve_index-200"
+          }
+        },
+        "x-state": "Generally available; Added in 7.9.0",
+        "x-metaTags": [
+          {
+            "content": "Elasticsearch",
+            "name": "product_name"
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "indices"
+        ],
+        "summary": "Resolve indices",
+        "description": "Resolve the names and/or index patterns for indices, aliases, and data streams.\nMultiple patterns and remote clusters are supported.\n\n## Required authorization\n\n* Index privileges: `view_index_metadata`\n",
+        "operationId": "indices-resolve-index-1",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-name"
+          },
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-expand_wildcards"
+          },
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-ignore_unavailable"
+          },
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-allow_no_indices"
+          },
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-mode"
+          }
+        ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/indices.resolve_index"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/indices.resolve_index-200"
           }
         },
         "x-state": "Generally available; Added in 7.9.0",
@@ -134625,6 +134654,47 @@
           }
         }
       },
+      "indices.resolve_index-200": {
+        "description": "",
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object",
+              "properties": {
+                "indices": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexItem"
+                  }
+                },
+                "aliases": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexAliasItem"
+                  }
+                },
+                "data_streams": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexDataStreamsItem"
+                  }
+                }
+              },
+              "required": [
+                "indices",
+                "aliases",
+                "data_streams"
+              ]
+            },
+            "examples": {
+              "ResolveIndexResponseExample1": {
+                "description": "A successful response from `GET /_resolve/index/f*,remoteCluster1:bar*?expand_wildcards=all`.",
+                "value": "{\n  \"indices\": [\n    {\n      \"name\": \"foo_closed\",\n      \"attributes\": [\n        \"closed\"\n      ],\n      \"mode\": \"standard\"\n    },\n    {\n      \"name\": \"freeze-index\",\n      \"aliases\": [\n        \"f-alias\"\n      ],\n      \"attributes\": [\n        \"open\"\n      ]\n    },\n    {\n      \"name\": \"remoteCluster1:bar-01\",\n      \"attributes\": [\n        \"open\"\n      ]\n    }\n  ],\n  \"aliases\": [\n    {\n      \"name\": \"f-alias\",\n      \"indices\": [\n        \"freeze-index\",\n        \"my-index-000001\"\n      ]\n    }\n  ],\n  \"data_streams\": [\n    {\n      \"name\": \"foo\",\n      \"backing_indices\": [\n        \".ds-foo-2099.03.07-000001\"\n      ],\n      \"timestamp_field\": \"@timestamp\"\n    }\n  ]\n}"
+              }
+            }
+          }
+        }
+      },
       "indices.rollover-200": {
         "description": "",
         "content": {
@@ -142714,6 +142784,68 @@
         },
         "style": "form"
       },
+      "indices.resolve_index-name": {
+        "in": "path",
+        "name": "name",
+        "description": "Comma-separated name(s) or index pattern(s) of the indices, aliases, and data streams to resolve.\nResources on remote clusters can be specified using the `<cluster>`:`<name>` syntax.",
+        "required": true,
+        "deprecated": false,
+        "schema": {
+          "$ref": "#/components/schemas/_types.Names"
+        },
+        "style": "simple"
+      },
+      "indices.resolve_index-expand_wildcards": {
+        "in": "query",
+        "name": "expand_wildcards",
+        "description": "Type of index that wildcard patterns can match.\nIf the request can target data streams, this argument determines whether wildcard expressions match hidden data streams.\nSupports comma-separated values, such as `open,hidden`.",
+        "deprecated": false,
+        "schema": {
+          "$ref": "#/components/schemas/_types.ExpandWildcards"
+        },
+        "style": "form"
+      },
+      "indices.resolve_index-ignore_unavailable": {
+        "in": "query",
+        "name": "ignore_unavailable",
+        "description": "If `false`, the request returns an error if it targets a missing or closed index.",
+        "deprecated": false,
+        "schema": {
+          "type": "boolean"
+        },
+        "style": "form"
+      },
+      "indices.resolve_index-allow_no_indices": {
+        "in": "query",
+        "name": "allow_no_indices",
+        "description": "If `false`, the request returns an error if any wildcard expression, index alias, or `_all` value targets only missing or closed indices.\nThis behavior applies even if the request targets other open indices.\nFor example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.",
+        "deprecated": false,
+        "schema": {
+          "type": "boolean"
+        },
+        "style": "form"
+      },
+      "indices.resolve_index-mode": {
+        "in": "query",
+        "name": "mode",
+        "description": "Filter indices by index mode - standard, lookup, time_series, etc. Comma-separated list of IndexMode. Empty means no filter.",
+        "deprecated": false,
+        "schema": {
+          "oneOf": [
+            {
+              "$ref": "#/components/schemas/indices._types.IndexMode"
+            },
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/indices._types.IndexMode"
+              }
+            }
+          ]
+        },
+        "x-state": "Generally available; Added in 9.2.0",
+        "style": "form"
+      },
       "indices.rollover-alias": {
         "in": "path",
         "name": "alias",
@@ -148062,6 +148194,15 @@
         },
         "required": true
       },
+      "cat.count": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object"
+            }
+          }
+        }
+      },
       "clear_scroll": {
         "content": {
           "application/json": {
@@ -149296,6 +149437,15 @@
         },
         "required": true
       },
+      "indices.resolve_index": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object"
+            }
+          }
+        }
+      },
       "indices.rollover": {
         "content": {
           "application/json": {
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index 1d8578a1a3..236fb89f79 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -947,6 +947,40 @@
             "$ref": "#/components/parameters/cat.count-s"
           }
         ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/cat.count"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/cat.count-200"
+          }
+        },
+        "x-state": "Generally available",
+        "x-metaTags": [
+          {
+            "content": "Elasticsearch",
+            "name": "product_name"
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "cat"
+        ],
+        "summary": "Get a document count",
+        "description": "Get quick access to a document count for a data stream, an index, or an entire cluster.\nThe document count only includes live documents, not deleted documents which have not yet been removed by the merge process.\n\nIMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the count API.\n\n## Required authorization\n\n* Index privileges: `read`\n",
+        "operationId": "cat-count-1",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/cat.count-h"
+          },
+          {
+            "$ref": "#/components/parameters/cat.count-s"
+          }
+        ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/cat.count"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/cat.count-200"
@@ -968,7 +1002,7 @@
         ],
         "summary": "Get a document count",
         "description": "Get quick access to a document count for a data stream, an index, or an entire cluster.\nThe document count only includes live documents, not deleted documents which have not yet been removed by the merge process.\n\nIMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the count API.\n\n## Required authorization\n\n* Index privileges: `read`\n",
-        "operationId": "cat-count-1",
+        "operationId": "cat-count-2",
         "parameters": [
           {
             "$ref": "#/components/parameters/cat.count-index"
@@ -980,6 +1014,43 @@
             "$ref": "#/components/parameters/cat.count-s"
           }
         ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/cat.count"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/cat.count-200"
+          }
+        },
+        "x-state": "Generally available",
+        "x-metaTags": [
+          {
+            "content": "Elasticsearch",
+            "name": "product_name"
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "cat"
+        ],
+        "summary": "Get a document count",
+        "description": "Get quick access to a document count for a data stream, an index, or an entire cluster.\nThe document count only includes live documents, not deleted documents which have not yet been removed by the merge process.\n\nIMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the count API.\n\n## Required authorization\n\n* Index privileges: `read`\n",
+        "operationId": "cat-count-3",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/cat.count-index"
+          },
+          {
+            "$ref": "#/components/parameters/cat.count-h"
+          },
+          {
+            "$ref": "#/components/parameters/cat.count-s"
+          }
+        ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/cat.count"
+        },
         "responses": {
           "200": {
             "$ref": "#/components/responses/cat.count-200"
@@ -10830,109 +10901,67 @@
         "operationId": "indices-resolve-index",
         "parameters": [
           {
-            "in": "path",
-            "name": "name",
-            "description": "Comma-separated name(s) or index pattern(s) of the indices, aliases, and data streams to resolve.\nResources on remote clusters can be specified using the `<cluster>`:`<name>` syntax.",
-            "required": true,
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.Names"
-            },
-            "style": "simple"
+            "$ref": "#/components/parameters/indices.resolve_index-name"
           },
           {
-            "in": "query",
-            "name": "expand_wildcards",
-            "description": "Type of index that wildcard patterns can match.\nIf the request can target data streams, this argument determines whether wildcard expressions match hidden data streams.\nSupports comma-separated values, such as `open,hidden`.",
-            "deprecated": false,
-            "schema": {
-              "$ref": "#/components/schemas/_types.ExpandWildcards"
-            },
-            "style": "form"
+            "$ref": "#/components/parameters/indices.resolve_index-expand_wildcards"
           },
           {
-            "in": "query",
-            "name": "ignore_unavailable",
-            "description": "If `false`, the request returns an error if it targets a missing or closed index.",
-            "deprecated": false,
-            "schema": {
-              "type": "boolean"
-            },
-            "style": "form"
+            "$ref": "#/components/parameters/indices.resolve_index-ignore_unavailable"
           },
           {
-            "in": "query",
-            "name": "allow_no_indices",
-            "description": "If `false`, the request returns an error if any wildcard expression, index alias, or `_all` value targets only missing or closed indices.\nThis behavior applies even if the request targets other open indices.\nFor example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.",
-            "deprecated": false,
-            "schema": {
-              "type": "boolean"
-            },
-            "style": "form"
+            "$ref": "#/components/parameters/indices.resolve_index-allow_no_indices"
           },
           {
-            "in": "query",
-            "name": "mode",
-            "description": "Filter indices by index mode - standard, lookup, time_series, etc. Comma-separated list of IndexMode. Empty means no filter.",
-            "deprecated": false,
-            "schema": {
-              "oneOf": [
-                {
-                  "$ref": "#/components/schemas/indices._types.IndexMode"
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/indices._types.IndexMode"
-                  }
-                }
-              ]
-            },
-            "x-state": "Generally available",
-            "style": "form"
+            "$ref": "#/components/parameters/indices.resolve_index-mode"
           }
         ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/indices.resolve_index"
+        },
         "responses": {
           "200": {
-            "description": "",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "indices": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexItem"
-                      }
-                    },
-                    "aliases": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexAliasItem"
-                      }
-                    },
-                    "data_streams": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexDataStreamsItem"
-                      }
-                    }
-                  },
-                  "required": [
-                    "indices",
-                    "aliases",
-                    "data_streams"
-                  ]
-                },
-                "examples": {
-                  "ResolveIndexResponseExample1": {
-                    "description": "A successful response from `GET /_resolve/index/f*,remoteCluster1:bar*?expand_wildcards=all`.",
-                    "value": "{\n  \"indices\": [\n    {\n      \"name\": \"foo_closed\",\n      \"attributes\": [\n        \"closed\"\n      ],\n      \"mode\": \"standard\"\n    },\n    {\n      \"name\": \"freeze-index\",\n      \"aliases\": [\n        \"f-alias\"\n      ],\n      \"attributes\": [\n        \"open\"\n      ]\n    },\n    {\n      \"name\": \"remoteCluster1:bar-01\",\n      \"attributes\": [\n        \"open\"\n      ]\n    }\n  ],\n  \"aliases\": [\n    {\n      \"name\": \"f-alias\",\n      \"indices\": [\n        \"freeze-index\",\n        \"my-index-000001\"\n      ]\n    }\n  ],\n  \"data_streams\": [\n    {\n      \"name\": \"foo\",\n      \"backing_indices\": [\n        \".ds-foo-2099.03.07-000001\"\n      ],\n      \"timestamp_field\": \"@timestamp\"\n    }\n  ]\n}"
-                  }
-                }
-              }
-            }
+            "$ref": "#/components/responses/indices.resolve_index-200"
+          }
+        },
+        "x-state": "Generally available",
+        "x-metaTags": [
+          {
+            "content": "Elasticsearch",
+            "name": "product_name"
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "indices"
+        ],
+        "summary": "Resolve indices",
+        "description": "Resolve the names and/or index patterns for indices, aliases, and data streams.\nMultiple patterns and remote clusters are supported.\n\n## Required authorization\n\n* Index privileges: `view_index_metadata`\n",
+        "operationId": "indices-resolve-index-1",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-name"
+          },
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-expand_wildcards"
+          },
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-ignore_unavailable"
+          },
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-allow_no_indices"
+          },
+          {
+            "$ref": "#/components/parameters/indices.resolve_index-mode"
+          }
+        ],
+        "requestBody": {
+          "$ref": "#/components/requestBodies/indices.resolve_index"
+        },
+        "responses": {
+          "200": {
+            "$ref": "#/components/responses/indices.resolve_index-200"
           }
         },
         "x-state": "Generally available",
@@ -83264,6 +83293,47 @@
           }
         }
       },
+      "indices.resolve_index-200": {
+        "description": "",
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object",
+              "properties": {
+                "indices": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexItem"
+                  }
+                },
+                "aliases": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexAliasItem"
+                  }
+                },
+                "data_streams": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/indices.resolve_index.ResolveIndexDataStreamsItem"
+                  }
+                }
+              },
+              "required": [
+                "indices",
+                "aliases",
+                "data_streams"
+              ]
+            },
+            "examples": {
+              "ResolveIndexResponseExample1": {
+                "description": "A successful response from `GET /_resolve/index/f*,remoteCluster1:bar*?expand_wildcards=all`.",
+                "value": "{\n  \"indices\": [\n    {\n      \"name\": \"foo_closed\",\n      \"attributes\": [\n        \"closed\"\n      ],\n      \"mode\": \"standard\"\n    },\n    {\n      \"name\": \"freeze-index\",\n      \"aliases\": [\n        \"f-alias\"\n      ],\n      \"attributes\": [\n        \"open\"\n      ]\n    },\n    {\n      \"name\": \"remoteCluster1:bar-01\",\n      \"attributes\": [\n        \"open\"\n      ]\n    }\n  ],\n  \"aliases\": [\n    {\n      \"name\": \"f-alias\",\n      \"indices\": [\n        \"freeze-index\",\n        \"my-index-000001\"\n      ]\n    }\n  ],\n  \"data_streams\": [\n    {\n      \"name\": \"foo\",\n      \"backing_indices\": [\n        \".ds-foo-2099.03.07-000001\"\n      ],\n      \"timestamp_field\": \"@timestamp\"\n    }\n  ]\n}"
+              }
+            }
+          }
+        }
+      },
       "indices.rollover-200": {
         "description": "",
         "content": {
@@ -87427,6 +87497,68 @@
         },
         "style": "form"
       },
+      "indices.resolve_index-name": {
+        "in": "path",
+        "name": "name",
+        "description": "Comma-separated name(s) or index pattern(s) of the indices, aliases, and data streams to resolve.\nResources on remote clusters can be specified using the `<cluster>`:`<name>` syntax.",
+        "required": true,
+        "deprecated": false,
+        "schema": {
+          "$ref": "#/components/schemas/_types.Names"
+        },
+        "style": "simple"
+      },
+      "indices.resolve_index-expand_wildcards": {
+        "in": "query",
+        "name": "expand_wildcards",
+        "description": "Type of index that wildcard patterns can match.\nIf the request can target data streams, this argument determines whether wildcard expressions match hidden data streams.\nSupports comma-separated values, such as `open,hidden`.",
+        "deprecated": false,
+        "schema": {
+          "$ref": "#/components/schemas/_types.ExpandWildcards"
+        },
+        "style": "form"
+      },
+      "indices.resolve_index-ignore_unavailable": {
+        "in": "query",
+        "name": "ignore_unavailable",
+        "description": "If `false`, the request returns an error if it targets a missing or closed index.",
+        "deprecated": false,
+        "schema": {
+          "type": "boolean"
+        },
+        "style": "form"
+      },
+      "indices.resolve_index-allow_no_indices": {
+        "in": "query",
+        "name": "allow_no_indices",
+        "description": "If `false`, the request returns an error if any wildcard expression, index alias, or `_all` value targets only missing or closed indices.\nThis behavior applies even if the request targets other open indices.\nFor example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.",
+        "deprecated": false,
+        "schema": {
+          "type": "boolean"
+        },
+        "style": "form"
+      },
+      "indices.resolve_index-mode": {
+        "in": "query",
+        "name": "mode",
+        "description": "Filter indices by index mode - standard, lookup, time_series, etc. Comma-separated list of IndexMode. Empty means no filter.",
+        "deprecated": false,
+        "schema": {
+          "oneOf": [
+            {
+              "$ref": "#/components/schemas/indices._types.IndexMode"
+            },
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/indices._types.IndexMode"
+              }
+            }
+          ]
+        },
+        "x-state": "Generally available",
+        "style": "form"
+      },
       "indices.rollover-alias": {
         "in": "path",
         "name": "alias",
@@ -90375,6 +90507,15 @@
         },
         "required": true
       },
+      "cat.count": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object"
+            }
+          }
+        }
+      },
       "clear_scroll": {
         "content": {
           "application/json": {
@@ -91176,6 +91317,15 @@
         },
         "required": true
       },
+      "indices.resolve_index": {
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object"
+            }
+          }
+        }
+      },
       "indices.rollover": {
         "content": {
           "application/json": {
diff --git a/output/schema/schema.json b/output/schema/schema.json
index 6c2dfc068c..c09e1afea7 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -825,13 +825,15 @@
       "urls": [
         {
           "methods": [
-            "GET"
+            "GET",
+            "POST"
           ],
           "path": "/_cat/count"
         },
         {
           "methods": [
-            "GET"
+            "GET",
+            "POST"
           ],
           "path": "/_cat/count/{index}"
         }
@@ -9576,7 +9578,8 @@
       "urls": [
         {
           "methods": [
-            "GET"
+            "GET",
+            "POST"
           ],
           "path": "/_resolve/index/{name}"
         }
@@ -27023,6 +27026,25 @@
                 "namespace": "_types.query_dsl"
               }
             }
+          },
+          {
+            "availability": {
+              "serverless": {
+                "featureFlag": "serverless.cross_project.enabled",
+                "stability": "stable",
+                "visibility": "feature_flag"
+              }
+            },
+            "description": "Specifies a subset of projects to target using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
+            "name": "project_routing",
+            "required": false,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "ProjectRouting",
+                "namespace": "_types"
+              }
+            }
           }
         ]
       },
@@ -27228,25 +27250,6 @@
             }
           }
         },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target for the search using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "A custom value used to route operations to a specific shard.",
           "name": "routing",
@@ -30166,28 +30169,9 @@
               "namespace": "_builtins"
             }
           }
-        },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target for the field-caps query using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "_global/field_caps/FieldCapabilitiesRequest.ts#L31-L162"
+      "specLocation": "_global/field_caps/FieldCapabilitiesRequest.ts#L31-L150"
     },
     {
       "kind": "response",
@@ -35973,25 +35957,6 @@
             }
           }
         },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target for the PIT request using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "A custom value that is used to route operations to a specific shard.",
           "name": "routing",
@@ -36044,7 +36009,7 @@
           }
         }
       ],
-      "specLocation": "_global/open_point_in_time/OpenPointInTimeRequest.ts#L32-L162"
+      "specLocation": "_global/open_point_in_time/OpenPointInTimeRequest.ts#L32-L150"
     },
     {
       "kind": "response",
@@ -40340,25 +40305,6 @@
             }
           }
         },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target for the search using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "If `true`, the caching of search results is enabled for requests where `size` is `0`.\nIt defaults to index level settings.",
           "extDocId": "shard-request-cache",
@@ -40738,7 +40684,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/SearchRequest.ts#L55-L623"
+      "specLocation": "_global/search/SearchRequest.ts#L55-L611"
     },
     {
       "kind": "response",
@@ -102303,25 +102249,6 @@
             }
           }
         },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target for the search using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "Specify if request cache should be used for this request or not, defaults to true",
           "name": "request_cache",
@@ -102634,7 +102561,7 @@
           }
         }
       ],
-      "specLocation": "async_search/submit/AsyncSearchSubmitRequest.ts#L56-L444"
+      "specLocation": "async_search/submit/AsyncSearchSubmitRequest.ts#L56-L432"
     },
     {
       "kind": "response",
@@ -110211,7 +110138,28 @@
         "CommonQueryParameters"
       ],
       "body": {
-        "kind": "no_body"
+        "kind": "properties",
+        "properties": [
+          {
+            "availability": {
+              "serverless": {
+                "featureFlag": "serverless.cross_project.enabled",
+                "stability": "stable",
+                "visibility": "feature_flag"
+              }
+            },
+            "description": "Specifies a subset of projects to target using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
+            "name": "project_routing",
+            "required": false,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "ProjectRouting",
+                "namespace": "_types"
+              }
+            }
+          }
+        ]
       },
       "description": "Get a document count.\n\nGet quick access to a document count for a data stream, an index, or an entire cluster.\nThe document count only includes live documents, not deleted documents which have not yet been removed by the merge process.\n\nIMPORTANT: CAT APIs are only intended for human consumption using the command line or Kibana console.\nThey are not intended for use by applications. For application consumption, use the count API.",
       "examples": {
@@ -110282,25 +110230,6 @@
             }
           }
         },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target for the search using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "List of columns that determine how the table should be sorted.\nSorting defaults to ascending and can be changed by setting `:asc`\nor `:desc` as a suffix to the column name.",
           "name": "s",
@@ -110314,7 +110243,7 @@
           }
         }
       ],
-      "specLocation": "cat/count/CatCountRequest.ts#L23-L81"
+      "specLocation": "cat/count/CatCountRequest.ts#L23-L83"
     },
     {
       "kind": "response",
@@ -143566,6 +143495,25 @@
       "body": {
         "kind": "properties",
         "properties": [
+          {
+            "availability": {
+              "serverless": {
+                "featureFlag": "serverless.cross_project.enabled",
+                "stability": "stable",
+                "visibility": "feature_flag"
+              }
+            },
+            "description": "Specifies a subset of projects to target using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
+            "name": "project_routing",
+            "required": false,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "ProjectRouting",
+                "namespace": "_types"
+              }
+            }
+          },
           {
             "description": "EQL query you wish to run.",
             "docId": "eql-syntax",
@@ -144011,25 +143959,6 @@
             }
           }
         },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target for the search using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
-        },
         {
           "description": "Timeout duration to wait for the request to finish. Defaults to no timeout, meaning the request waits for complete search results.",
           "name": "wait_for_completion_timeout",
@@ -170727,7 +170656,28 @@
         "CommonQueryParameters"
       ],
       "body": {
-        "kind": "no_body"
+        "kind": "properties",
+        "properties": [
+          {
+            "availability": {
+              "serverless": {
+                "featureFlag": "serverless.cross_project.enabled",
+                "stability": "stable",
+                "visibility": "feature_flag"
+              }
+            },
+            "description": "Specifies a subset of projects to target using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
+            "name": "project_routing",
+            "required": false,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "ProjectRouting",
+                "namespace": "_types"
+              }
+            }
+          }
+        ]
       },
       "description": "Resolve indices.\n\nResolve the names and/or index patterns for indices, aliases, and data streams.\nMultiple patterns and remote clusters are supported.",
       "examples": {
@@ -170857,28 +170807,9 @@
               }
             ]
           }
-        },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
         }
       ],
-      "specLocation": "indices/resolve_index/ResolveIndexRequest.ts#L29-L94"
+      "specLocation": "indices/resolve_index/ResolveIndexRequest.ts#L29-L96"
     },
     {
       "kind": "interface",
@@ -267976,6 +267907,25 @@
               }
             }
           },
+          {
+            "availability": {
+              "serverless": {
+                "featureFlag": "serverless.cross_project.enabled",
+                "stability": "stable",
+                "visibility": "feature_flag"
+              }
+            },
+            "description": "Specifies a subset of projects to target using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
+            "name": "project_routing",
+            "required": false,
+            "type": {
+              "kind": "instance_of",
+              "type": {
+                "name": "ProjectRouting",
+                "namespace": "_types"
+              }
+            }
+          },
           {
             "description": "The timeout before the request fails.",
             "name": "request_timeout",
@@ -268089,25 +268039,6 @@
               "namespace": "sql.query"
             }
           }
-        },
-        {
-          "availability": {
-            "serverless": {
-              "featureFlag": "serverless.cross_project.enabled",
-              "stability": "stable",
-              "visibility": "feature_flag"
-            }
-          },
-          "description": "Specifies a subset of projects to target for the search using project\nmetadata tags in a subset of Lucene query syntax.\nAllowed Lucene queries: the _alias tag and a single value (possibly wildcarded).\nExamples:\n _alias:my-project\n _alias:_origin\n _alias:*pr*\nSupported in serverless only.",
-          "name": "project_routing",
-          "required": false,
-          "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "ProjectRouting",
-              "namespace": "_types"
-            }
-          }
         }
       ],
       "specLocation": "sql/query/QuerySqlRequest.ts#L28-L167"
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 0590943900..d0050f7a21 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -165,12 +165,12 @@ export interface CountRequest extends RequestBase {
   lenient?: boolean
   min_score?: double
   preference?: string
-  project_routing?: ProjectRouting
   routing?: Routing
   terminate_after?: long
   q?: string
   body?: {
     query?: QueryDslQueryContainer
+    project_routing?: ProjectRouting
   }
 }
 
@@ -383,7 +383,6 @@ export interface FieldCapsRequest extends RequestBase {
   filters?: string | string[]
   types?: string[]
   include_empty_fields?: boolean
-  project_routing?: ProjectRouting
   body?: {
     fields?: Fields
     index_filter?: QueryDslQueryContainer
@@ -908,7 +907,6 @@ export interface OpenPointInTimeRequest extends RequestBase {
   keep_alive: Duration
   ignore_unavailable?: boolean
   preference?: string
-  project_routing?: ProjectRouting
   routing?: Routing
   expand_wildcards?: ExpandWildcards
   allow_partial_search_results?: boolean
@@ -1210,7 +1208,6 @@ export interface SearchRequest extends RequestBase {
   max_concurrent_shard_requests?: integer
   preference?: string
   pre_filter_shard_size?: long
-  project_routing?: ProjectRouting
   request_cache?: boolean
   routing?: Routing
   scroll?: Duration
@@ -7323,7 +7320,6 @@ export interface AsyncSearchSubmitRequest extends RequestBase {
   lenient?: boolean
   max_concurrent_shard_requests?: integer
   preference?: string
-  project_routing?: ProjectRouting
   request_cache?: boolean
   routing?: Routing
   search_type?: SearchType
@@ -7699,8 +7695,10 @@ export interface CatCountCountRecord {
 export interface CatCountRequest extends CatCatRequestBase {
   index?: Indices
   h?: CatCatCountColumns
-  project_routing?: ProjectRouting
   s?: Names
+  body?: {
+    project_routing?: ProjectRouting
+  }
 }
 
 export type CatCountResponse = CatCountCountRecord[]
@@ -11360,9 +11358,9 @@ export interface EqlSearchRequest extends RequestBase {
   ignore_unavailable?: boolean
   keep_alive?: Duration
   keep_on_completion?: boolean
-  project_routing?: ProjectRouting
   wait_for_completion_timeout?: Duration
   body?: {
+    project_routing?: ProjectRouting
     query: string
     case_sensitive?: boolean
     event_category_field?: Field
@@ -13798,7 +13796,9 @@ export interface IndicesResolveIndexRequest extends RequestBase {
   ignore_unavailable?: boolean
   allow_no_indices?: boolean
   mode?: IndicesIndexMode | IndicesIndexMode[]
-  project_routing?: ProjectRouting
+  body?: {
+    project_routing?: ProjectRouting
+  }
 }
 
 export interface IndicesResolveIndexResolveIndexAliasItem {
@@ -22655,7 +22655,6 @@ export interface SqlGetAsyncStatusResponse {
 
 export interface SqlQueryRequest extends RequestBase {
   format?: SqlQuerySqlFormat
-  project_routing?: ProjectRouting
   body?: {
     allow_partial_search_results?: boolean
     catalog?: string
@@ -22670,6 +22669,7 @@ export interface SqlQueryRequest extends RequestBase {
     page_timeout?: Duration
     params?: any[]
     query?: string
+    project_routing?: ProjectRouting
     request_timeout?: Duration
     runtime_mappings?: MappingRuntimeFields
     time_zone?: TimeZone
diff --git a/specification/_global/count/CountRequest.ts b/specification/_global/count/CountRequest.ts
index eb5aac3cb5..ea75eb0a38 100644
--- a/specification/_global/count/CountRequest.ts
+++ b/specification/_global/count/CountRequest.ts
@@ -133,18 +133,6 @@ export interface Request extends RequestBase {
      * By default, it is random.
      */
     preference?: string
-    /**
-     * Specifies a subset of projects to target for the search using project
-     * metadata tags in a subset of Lucene query syntax.
-     * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
-     * Examples:
-     *  _alias:my-project
-     *  _alias:_origin
-     *  _alias:*pr*
-     * Supported in serverless only.
-     * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
-     */
-    project_routing?: ProjectRouting
     /**
      * A custom value used to route operations to a specific shard.
      */
@@ -171,5 +159,17 @@ export interface Request extends RequestBase {
      * with the `q` query string parameter.
      */
     query?: QueryContainer
+    /**
+     * Specifies a subset of projects to target using project
+     * metadata tags in a subset of Lucene query syntax.
+     * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
+     * Examples:
+     *  _alias:my-project
+     *  _alias:_origin
+     *  _alias:*pr*
+     * Supported in serverless only.
+     * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
+     */
+    project_routing?: ProjectRouting
   }
 }
diff --git a/specification/_global/field_caps/FieldCapabilitiesRequest.ts b/specification/_global/field_caps/FieldCapabilitiesRequest.ts
index 9bd767e3c1..195da8980f 100644
--- a/specification/_global/field_caps/FieldCapabilitiesRequest.ts
+++ b/specification/_global/field_caps/FieldCapabilitiesRequest.ts
@@ -110,18 +110,6 @@ export interface Request extends RequestBase {
      * @server_default true
      */
     include_empty_fields?: boolean
-    /**
-     * Specifies a subset of projects to target for the field-caps query using project
-     * metadata tags in a subset of Lucene query syntax.
-     * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
-     * Examples:
-     *  _alias:my-project
-     *  _alias:_origin
-     *  _alias:*pr*
-     * Supported in serverless only.
-     * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
-     */
-    project_routing?: ProjectRouting
   }
   body?: {
     /**
diff --git a/specification/_global/open_point_in_time/OpenPointInTimeRequest.ts b/specification/_global/open_point_in_time/OpenPointInTimeRequest.ts
index fad18251d8..721396a6ff 100644
--- a/specification/_global/open_point_in_time/OpenPointInTimeRequest.ts
+++ b/specification/_global/open_point_in_time/OpenPointInTimeRequest.ts
@@ -105,18 +105,6 @@ export interface Request extends RequestBase {
      * By default, it is random.
      */
     preference?: string
-    /**
-     * Specifies a subset of projects to target for the PIT request using project
-     * metadata tags in a subset of Lucene query syntax.
-     * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
-     * Examples:
-     *  _alias:my-project
-     *  _alias:_origin
-     *  _alias:*pr*
-     * Supported in serverless only.
-     * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
-     */
-    project_routing?: ProjectRouting
     /**
      * A custom value that is used to route operations to a specific shard.
      */
diff --git a/specification/_global/search/SearchRequest.ts b/specification/_global/search/SearchRequest.ts
index c6617dad67..1a6c9e6572 100644
--- a/specification/_global/search/SearchRequest.ts
+++ b/specification/_global/search/SearchRequest.ts
@@ -223,18 +223,6 @@ export interface Request extends RequestBase {
      * * The primary sort of the query targets an indexed field.
      */
     pre_filter_shard_size?: long
-    /**
-     * Specifies a subset of projects to target for the search using project
-     * metadata tags in a subset of Lucene query syntax.
-     * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
-     * Examples:
-     *  _alias:my-project
-     *  _alias:_origin
-     *  _alias:*pr*
-     * Supported in serverless only.
-     * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
-     */
-    project_routing?: ProjectRouting
     /**
      * If `true`, the caching of search results is enabled for requests where `size` is `0`.
      * It defaults to index level settings.
diff --git a/specification/async_search/submit/AsyncSearchSubmitRequest.ts b/specification/async_search/submit/AsyncSearchSubmitRequest.ts
index dd92035506..815968291e 100644
--- a/specification/async_search/submit/AsyncSearchSubmitRequest.ts
+++ b/specification/async_search/submit/AsyncSearchSubmitRequest.ts
@@ -181,18 +181,6 @@ export interface Request extends RequestBase {
      * @server_default random
      */
     preference?: string
-    /**
-     * Specifies a subset of projects to target for the search using project
-     * metadata tags in a subset of Lucene query syntax.
-     * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
-     * Examples:
-     *  _alias:my-project
-     *  _alias:_origin
-     *  _alias:*pr*
-     * Supported in serverless only.
-     * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
-     */
-    project_routing?: ProjectRouting
     /**
      * Specify if request cache should be used for this request or not, defaults to true
      * @server_default true
diff --git a/specification/cat/count/CatCountRequest.ts b/specification/cat/count/CatCountRequest.ts
index f77ebc7c2c..4416f0489a 100644
--- a/specification/cat/count/CatCountRequest.ts
+++ b/specification/cat/count/CatCountRequest.ts
@@ -38,11 +38,11 @@ export interface Request extends CatRequestBase {
   urls: [
     {
       path: '/_cat/count'
-      methods: ['GET']
+      methods: ['GET', 'POST']
     },
     {
       path: '/_cat/count/{index}'
-      methods: ['GET']
+      methods: ['GET', 'POST']
     }
   ]
   path_parts: {
@@ -60,7 +60,15 @@ export interface Request extends CatRequestBase {
      */
     h?: CatCountColumns
     /**
-     * Specifies a subset of projects to target for the search using project
+     * List of columns that determine how the table should be sorted.
+     * Sorting defaults to ascending and can be changed by setting `:asc`
+     * or `:desc` as a suffix to the column name.
+     */
+    s?: Names
+  }
+  body?: {
+    /**
+     * Specifies a subset of projects to target using project
      * metadata tags in a subset of Lucene query syntax.
      * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
      * Examples:
@@ -71,11 +79,5 @@ export interface Request extends CatRequestBase {
      * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
      */
     project_routing?: ProjectRouting
-    /**
-     * List of columns that determine how the table should be sorted.
-     * Sorting defaults to ascending and can be changed by setting `:asc`
-     * or `:desc` as a suffix to the column name.
-     */
-    s?: Names
   }
 }
diff --git a/specification/eql/search/EqlSearchRequest.ts b/specification/eql/search/EqlSearchRequest.ts
index 81ca361cec..b0789e7b4f 100644
--- a/specification/eql/search/EqlSearchRequest.ts
+++ b/specification/eql/search/EqlSearchRequest.ts
@@ -99,7 +99,13 @@ export interface Request extends RequestBase {
      */
     keep_on_completion?: boolean
     /**
-     * Specifies a subset of projects to target for the search using project
+     * Timeout duration to wait for the request to finish. Defaults to no timeout, meaning the request waits for complete search results.
+     */
+    wait_for_completion_timeout?: Duration
+  }
+  body: {
+    /**
+     * Specifies a subset of projects to target using project
      * metadata tags in a subset of Lucene query syntax.
      * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
      * Examples:
@@ -110,12 +116,6 @@ export interface Request extends RequestBase {
      * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
      */
     project_routing?: ProjectRouting
-    /**
-     * Timeout duration to wait for the request to finish. Defaults to no timeout, meaning the request waits for complete search results.
-     */
-    wait_for_completion_timeout?: Duration
-  }
-  body: {
     /**
      * EQL query you wish to run.
      * @doc_id eql-syntax
diff --git a/specification/indices/resolve_index/ResolveIndexRequest.ts b/specification/indices/resolve_index/ResolveIndexRequest.ts
index 8197eccc12..55656a1599 100644
--- a/specification/indices/resolve_index/ResolveIndexRequest.ts
+++ b/specification/indices/resolve_index/ResolveIndexRequest.ts
@@ -41,7 +41,7 @@ export interface Request extends RequestBase {
   urls: [
     {
       path: '/_resolve/index/{name}'
-      methods: ['GET']
+      methods: ['GET', 'POST']
     }
   ]
   path_parts: {
@@ -78,6 +78,8 @@ export interface Request extends RequestBase {
      * @availability serverless stability=stable visibility=public
      */
     mode?: IndexMode | IndexMode[]
+  }
+  body?: {
     /**
      * Specifies a subset of projects to target using project
      * metadata tags in a subset of Lucene query syntax.
diff --git a/specification/sql/query/QuerySqlRequest.ts b/specification/sql/query/QuerySqlRequest.ts
index aa31128dcf..bf7a1dc1b7 100644
--- a/specification/sql/query/QuerySqlRequest.ts
+++ b/specification/sql/query/QuerySqlRequest.ts
@@ -52,18 +52,6 @@ export interface Request extends RequestBase {
      * @ext_doc_id sql-rest-format
      */
     format?: SqlFormat
-    /**
-     * Specifies a subset of projects to target for the search using project
-     * metadata tags in a subset of Lucene query syntax.
-     * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
-     * Examples:
-     *  _alias:my-project
-     *  _alias:_origin
-     *  _alias:*pr*
-     * Supported in serverless only.
-     * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
-     */
-    project_routing?: ProjectRouting
   }
   body: {
     /**
@@ -139,6 +127,18 @@ export interface Request extends RequestBase {
      * @ext_doc_id sql-spec
      */
     query?: string
+    /**
+     * Specifies a subset of projects to target using project
+     * metadata tags in a subset of Lucene query syntax.
+     * Allowed Lucene queries: the _alias tag and a single value (possibly wildcarded).
+     * Examples:
+     *  _alias:my-project
+     *  _alias:_origin
+     *  _alias:*pr*
+     * Supported in serverless only.
+     * @availability serverless stability=stable visibility=feature_flag feature_flag=serverless.cross_project.enabled
+     */
+    project_routing?: ProjectRouting
     /**
      * The timeout before the request fails.
      * @server_default 90s