diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 3599ea909d..9056cfcadb 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -125529,7 +125529,7 @@
       "simulate.ingest-merge_type": {
         "in": "query",
         "name": "merge_type",
-        "description": "The method to be used when merging mapping_additions existing mappings. Mappings can be merged in the way mapping changes are merged into an existing index, or in\nthe way mapping changes are merged into existing templates. Some changes are allowed to templates that are not allowed to indices. For example,\na field cannot be changed to an incompatible type in an index, but can in a template.",
+        "description": "The mapping merge type if mapping overrides are being provided in mapping_addition.\nThe allowed values are one of index or template.\nThe index option merges mappings the way they would be merged into an existing index.\nThe template option merges mappings the way they would be merged into a template.",
         "deprecated": false,
         "schema": {
           "$ref": "#/components/schemas/simulate.ingest.MergeType"
diff --git a/output/schema/schema.json b/output/schema/schema.json
index 4ef362833c..475ff5d77c 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -23725,6 +23725,31 @@
         }
       ]
     },
+    {
+      "availability": {
+        "stack": {
+          "stability": "stable",
+          "visibility": "public"
+        }
+      },
+      "description": "Sets a cluster wide upgrade_mode setting that prepares transform indices for an upgrade.",
+      "docUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-set-upgrade-mode.html",
+      "name": "transform.set_upgrade_mode",
+      "request": null,
+      "requestBodyRequired": false,
+      "response": null,
+      "responseMediaType": [
+        "application/json"
+      ],
+      "urls": [
+        {
+          "methods": [
+            "POST"
+          ],
+          "path": "/_transform/set_upgrade_mode"
+        }
+      ]
+    },
     {
       "availability": {
         "serverless": {
@@ -248756,7 +248781,7 @@
         "name": "MergeType",
         "namespace": "simulate.ingest"
       },
-      "specLocation": "simulate/ingest/SimulateIngestRequest.ts#L109-L112"
+      "specLocation": "simulate/ingest/SimulateIngestRequest.ts#L110-L113"
     },
     {
       "kind": "request",
@@ -249032,7 +249057,7 @@
           }
         },
         {
-          "description": "The method to be used when merging mapping_additions existing mappings. Mappings can be merged in the way mapping changes are merged into an existing index, or in\nthe way mapping changes are merged into existing templates. Some changes are allowed to templates that are not allowed to indices. For example,\na field cannot be changed to an incompatible type in an index, but can in a template.",
+          "description": "The mapping merge type if mapping overrides are being provided in mapping_addition.\nThe allowed values are one of index or template.\nThe index option merges mappings the way they would be merged into an existing index.\nThe template option merges mappings the way they would be merged into a template.",
           "name": "merge_type",
           "required": false,
           "serverDefault": "index",
@@ -249045,7 +249070,7 @@
           }
         }
       ],
-      "specLocation": "simulate/ingest/SimulateIngestRequest.ts#L29-L107"
+      "specLocation": "simulate/ingest/SimulateIngestRequest.ts#L29-L108"
     },
     {
       "kind": "response",
diff --git a/specification/_json_spec/indices.get_data_stream_mappings.json b/specification/_json_spec/indices.get_data_stream_mappings.json
index 90f0118f20..408aa3ebc2 100644
--- a/specification/_json_spec/indices.get_data_stream_mappings.json
+++ b/specification/_json_spec/indices.get_data_stream_mappings.json
@@ -5,8 +5,7 @@
       "description": "Gets a data stream's mappings"
     },
     "stability": "stable",
-    "visibility": "feature_flag",
-    "feature_flag": "logs_stream",
+    "visibility": "public",
     "headers": {
       "accept": ["application/json"]
     },
diff --git a/specification/_json_spec/indices.put_data_stream_mappings.json b/specification/_json_spec/indices.put_data_stream_mappings.json
index 0f12695346..afed732073 100644
--- a/specification/_json_spec/indices.put_data_stream_mappings.json
+++ b/specification/_json_spec/indices.put_data_stream_mappings.json
@@ -5,8 +5,7 @@
       "description": "Updates a data stream's mappings"
     },
     "stability": "stable",
-    "visibility": "feature_flag",
-    "feature_flag": "logs_stream",
+    "visibility": "public",
     "headers": {
       "accept": ["application/json"]
     },
diff --git a/specification/_json_spec/simulate.ingest.json b/specification/_json_spec/simulate.ingest.json
index 7c29e5454f..dddad994c9 100644
--- a/specification/_json_spec/simulate.ingest.json
+++ b/specification/_json_spec/simulate.ingest.json
@@ -35,7 +35,8 @@
       },
       "merge_type": {
         "type": "string",
-        "description": "The method to be used when merging mapping_additions existing mappings"
+        "description": "The mapping merge type if mapping overrides are being provided in mapping_addition. The allowed values are one of index or template. The index option merges mappings the way they would be merged into an existing index. The template option merges mappings the way they would be merged into a template.",
+        "default": "index"
       }
     },
     "body": {
diff --git a/specification/_json_spec/transform.set_upgrade_mode.json b/specification/_json_spec/transform.set_upgrade_mode.json
new file mode 100644
index 0000000000..cc45209034
--- /dev/null
+++ b/specification/_json_spec/transform.set_upgrade_mode.json
@@ -0,0 +1,31 @@
+{
+  "transform.set_upgrade_mode": {
+    "documentation": {
+      "url": "https://www.elastic.co/guide/en/elasticsearch/reference/current/transform-set-upgrade-mode.html",
+      "description": "Sets a cluster wide upgrade_mode setting that prepares transform indices for an upgrade."
+    },
+    "stability": "stable",
+    "visibility": "public",
+    "headers": {
+      "accept": ["application/json"]
+    },
+    "url": {
+      "paths": [
+        {
+          "path": "/_transform/set_upgrade_mode",
+          "methods": ["POST"]
+        }
+      ]
+    },
+    "params": {
+      "enabled": {
+        "type": "boolean",
+        "description": "Whether to enable upgrade_mode Transform 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/specification/simulate/ingest/SimulateIngestRequest.ts b/specification/simulate/ingest/SimulateIngestRequest.ts
index 13580cd40e..5369d92bec 100644
--- a/specification/simulate/ingest/SimulateIngestRequest.ts
+++ b/specification/simulate/ingest/SimulateIngestRequest.ts
@@ -76,9 +76,10 @@ export interface Request extends RequestBase {
      */
     pipeline?: PipelineName
     /**
-     * The method to be used when merging mapping_additions existing mappings. Mappings can be merged in the way mapping changes are merged into an existing index, or in
-     * the way mapping changes are merged into existing templates. Some changes are allowed to templates that are not allowed to indices. For example,
-     * a field cannot be changed to an incompatible type in an index, but can in a template.
+     * The mapping merge type if mapping overrides are being provided in mapping_addition.
+     * The allowed values are one of index or template.
+     * The index option merges mappings the way they would be merged into an existing index.
+     * The template option merges mappings the way they would be merged into a template.
      * @server_default index
      */
     merge_type?: MergeType