diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json
index 8212445928..6cebe2287d 100644
--- a/output/openapi/elasticsearch-openapi.json
+++ b/output/openapi/elasticsearch-openapi.json
@@ -32429,6 +32429,12 @@
                         "type": "string"
                       }
                     },
+                    "remote_cluster": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/security._types:RemoteClusterPrivileges"
+                      }
+                    },
                     "global": {
                       "type": "array",
                       "items": {
@@ -32441,6 +32447,12 @@
                         "$ref": "#/components/schemas/security._types:UserIndicesPrivileges"
                       }
                     },
+                    "remote_indices": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/security._types:RemoteUserIndicesPrivileges"
+                      }
+                    },
                     "run_as": {
                       "type": "array",
                       "items": {
@@ -57035,7 +57047,14 @@
             ]
           },
           "auto_expand_replicas": {
-            "type": "string"
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/components/schemas/_spec_utils:NullValue"
+              }
+            ]
           },
           "merge": {
             "$ref": "#/components/schemas/indices._types:Merge"
@@ -57304,6 +57323,11 @@
           }
         ]
       },
+      "_spec_utils:NullValue": {
+        "nullable": true,
+        "description": "A `null` value that is to be interpreted as an actual value, unless other uses of `null` that are equivalent\nto a missing value. It is used for exemple in settings, where using the `NullValue` for a setting will reset\nit to its default value.",
+        "type": "string"
+      },
       "indices._types:Merge": {
         "type": "object",
         "properties": {
@@ -68975,11 +68999,6 @@
           "scheduled"
         ]
       },
-      "_spec_utils:NullValue": {
-        "nullable": true,
-        "description": "A `null` value that is to be interpreted as an actual value, unless other uses of `null` that are equivalent\nto a missing value. It is used for exemple in settings, where using the `NullValue` for a setting will reset\nit to its default value.",
-        "type": "string"
-      },
       "_types:WriteResponseBase": {
         "type": "object",
         "properties": {
@@ -87931,6 +87950,9 @@
           "metadata": {
             "$ref": "#/components/schemas/_types:Metadata"
           },
+          "description": {
+            "type": "string"
+          },
           "run_as": {
             "type": "array",
             "items": {
@@ -87975,7 +87997,6 @@
           "cluster",
           "indices",
           "metadata",
-          "run_as",
           "applications"
         ]
       },
@@ -88379,6 +88400,27 @@
           "allow_restricted_indices"
         ]
       },
+      "security._types:RemoteUserIndicesPrivileges": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/security._types:UserIndicesPrivileges"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "clusters": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            "required": [
+              "clusters"
+            ]
+          }
+        ]
+      },
       "security.get_user_profile:GetUserProfileErrors": {
         "type": "object",
         "properties": {
diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json
index e88fda7f54..83fc126362 100644
--- a/output/openapi/elasticsearch-serverless-openapi.json
+++ b/output/openapi/elasticsearch-serverless-openapi.json
@@ -35600,7 +35600,14 @@
             ]
           },
           "auto_expand_replicas": {
-            "type": "string"
+            "oneOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/components/schemas/_spec_utils:NullValue"
+              }
+            ]
           },
           "merge": {
             "$ref": "#/components/schemas/indices._types:Merge"
@@ -35869,6 +35876,11 @@
           }
         ]
       },
+      "_spec_utils:NullValue": {
+        "nullable": true,
+        "description": "A `null` value that is to be interpreted as an actual value, unless other uses of `null` that are equivalent\nto a missing value. It is used for exemple in settings, where using the `NullValue` for a setting will reset\nit to its default value.",
+        "type": "string"
+      },
       "indices._types:Merge": {
         "type": "object",
         "properties": {
@@ -44721,11 +44733,6 @@
           "scheduled"
         ]
       },
-      "_spec_utils:NullValue": {
-        "nullable": true,
-        "description": "A `null` value that is to be interpreted as an actual value, unless other uses of `null` that are equivalent\nto a missing value. It is used for exemple in settings, where using the `NullValue` for a setting will reset\nit to its default value.",
-        "type": "string"
-      },
       "_types:WriteResponseBase": {
         "type": "object",
         "properties": {
@@ -55333,6 +55340,9 @@
           "metadata": {
             "$ref": "#/components/schemas/_types:Metadata"
           },
+          "description": {
+            "type": "string"
+          },
           "run_as": {
             "type": "array",
             "items": {
@@ -55377,7 +55387,6 @@
           "cluster",
           "indices",
           "metadata",
-          "run_as",
           "applications"
         ]
       },
diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json
index 80867cd73c..f6fe05ca8c 100644
--- a/output/schema/schema-serverless.json
+++ b/output/schema/schema-serverless.json
@@ -96548,7 +96548,7 @@
         "name": "IndexCheckOnStartup",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L263-L270"
+      "specLocation": "indices/_types/IndexSettings.ts#L264-L271"
     },
     {
       "kind": "enum",
@@ -96684,7 +96684,7 @@
         "name": "SettingsSimilarity",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L171-L183",
+      "specLocation": "indices/_types/IndexSettings.ts#L172-L184",
       "type": {
         "items": [
           {
@@ -96801,7 +96801,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L189-L194"
+      "specLocation": "indices/_types/IndexSettings.ts#L190-L195"
     },
     {
       "kind": "interface",
@@ -96819,7 +96819,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L185-L187"
+      "specLocation": "indices/_types/IndexSettings.ts#L186-L188"
     },
     {
       "kind": "interface",
@@ -96848,7 +96848,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L196-L199"
+      "specLocation": "indices/_types/IndexSettings.ts#L197-L200"
     },
     {
       "kind": "interface",
@@ -96899,7 +96899,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L201-L206"
+      "specLocation": "indices/_types/IndexSettings.ts#L202-L207"
     },
     {
       "kind": "interface",
@@ -96950,7 +96950,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L208-L213"
+      "specLocation": "indices/_types/IndexSettings.ts#L209-L214"
     },
     {
       "kind": "interface",
@@ -96979,7 +96979,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L215-L218"
+      "specLocation": "indices/_types/IndexSettings.ts#L216-L219"
     },
     {
       "kind": "interface",
@@ -97008,7 +97008,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L220-L223"
+      "specLocation": "indices/_types/IndexSettings.ts#L221-L224"
     },
     {
       "kind": "interface",
@@ -97048,7 +97048,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L225-L229"
+      "specLocation": "indices/_types/IndexSettings.ts#L226-L230"
     },
     {
       "kind": "enum",
@@ -97067,7 +97067,7 @@
         "name": "SourceMode",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L502-L506"
+      "specLocation": "indices/_types/IndexSettings.ts#L503-L507"
     },
     {
       "isOpen": true,
@@ -97094,7 +97094,7 @@
         "name": "StorageType",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L538-L566"
+      "specLocation": "indices/_types/IndexSettings.ts#L539-L567"
     },
     {
       "kind": "enum",
@@ -97118,7 +97118,7 @@
         "name": "TranslogDurability",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L372-L387"
+      "specLocation": "indices/_types/IndexSettings.ts#L373-L388"
     },
     {
       "kind": "enum",
@@ -106292,7 +106292,7 @@
         "name": "IndexPrivilege",
         "namespace": "security._types"
       },
-      "specLocation": "security/_types/Privileges.ts#L361-L403"
+      "specLocation": "security/_types/Privileges.ts#L365-L407"
     },
     {
       "codegenNames": [
@@ -106306,7 +106306,7 @@
         "name": "IndicesPrivilegesQuery",
         "namespace": "security._types"
       },
-      "specLocation": "security/_types/Privileges.ts#L316-L324",
+      "specLocation": "security/_types/Privileges.ts#L320-L328",
       "type": {
         "items": [
           {
@@ -106356,7 +106356,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L326-L336"
+      "specLocation": "security/_types/Privileges.ts#L330-L340"
     },
     {
       "kind": "interface",
@@ -106444,7 +106444,7 @@
         }
       ],
       "shortcutProperty": "source",
-      "specLocation": "security/_types/Privileges.ts#L338-L356"
+      "specLocation": "security/_types/Privileges.ts#L342-L360"
     },
     {
       "codegenNames": [
@@ -106456,7 +106456,7 @@
         "name": "RoleTemplateInlineQuery",
         "namespace": "security._types"
       },
-      "specLocation": "security/_types/Privileges.ts#L358-L359",
+      "specLocation": "security/_types/Privileges.ts#L362-L363",
       "type": {
         "items": [
           {
@@ -115498,10 +115498,19 @@
           "required": false,
           "serverDefault": "false",
           "type": {
+            "generics": [
+              {
+                "kind": "instance_of",
+                "type": {
+                  "name": "string",
+                  "namespace": "_builtins"
+                }
+              }
+            ],
             "kind": "instance_of",
             "type": {
-              "name": "string",
-              "namespace": "_builtins"
+              "name": "WithNullValue",
+              "namespace": "_spec_utils"
             }
           }
         },
@@ -116051,7 +116060,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L69-L169"
+      "specLocation": "indices/_types/IndexSettings.ts#L70-L170"
     },
     {
       "kind": "interface",
@@ -116086,7 +116095,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L50-L63"
+      "specLocation": "indices/_types/IndexSettings.ts#L51-L64"
     },
     {
       "kind": "interface",
@@ -116107,7 +116116,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L65-L67"
+      "specLocation": "indices/_types/IndexSettings.ts#L66-L68"
     },
     {
       "kind": "interface",
@@ -116227,7 +116236,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L339-L341"
+      "specLocation": "indices/_types/IndexSettings.ts#L340-L342"
     },
     {
       "kind": "interface",
@@ -116277,7 +116286,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L343-L346"
+      "specLocation": "indices/_types/IndexSettings.ts#L344-L347"
     },
     {
       "kind": "interface",
@@ -116309,7 +116318,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L241-L244"
+      "specLocation": "indices/_types/IndexSettings.ts#L242-L245"
     },
     {
       "kind": "interface",
@@ -116331,7 +116340,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L246-L249"
+      "specLocation": "indices/_types/IndexSettings.ts#L247-L250"
     },
     {
       "kind": "interface",
@@ -116385,7 +116394,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L508-L513"
+      "specLocation": "indices/_types/IndexSettings.ts#L509-L514"
     },
     {
       "kind": "interface",
@@ -116417,7 +116426,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L515-L518"
+      "specLocation": "indices/_types/IndexSettings.ts#L516-L519"
     },
     {
       "kind": "interface",
@@ -116471,7 +116480,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L520-L525"
+      "specLocation": "indices/_types/IndexSettings.ts#L521-L526"
     },
     {
       "kind": "interface",
@@ -116581,7 +116590,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L255-L261"
+      "specLocation": "indices/_types/IndexSettings.ts#L256-L262"
     },
     {
       "kind": "interface",
@@ -116612,7 +116621,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L236-L239"
+      "specLocation": "indices/_types/IndexSettings.ts#L237-L240"
     },
     {
       "kind": "interface",
@@ -116634,7 +116643,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L231-L234"
+      "specLocation": "indices/_types/IndexSettings.ts#L232-L235"
     },
     {
       "kind": "interface",
@@ -116945,7 +116954,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L277-L316"
+      "specLocation": "indices/_types/IndexSettings.ts#L278-L317"
     },
     {
       "kind": "interface",
@@ -116967,7 +116976,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L318-L324"
+      "specLocation": "indices/_types/IndexSettings.ts#L319-L325"
     },
     {
       "kind": "interface",
@@ -116999,7 +117008,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L272-L275"
+      "specLocation": "indices/_types/IndexSettings.ts#L273-L276"
     },
     {
       "kind": "interface",
@@ -117059,7 +117068,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L348-L370"
+      "specLocation": "indices/_types/IndexSettings.ts#L349-L371"
     },
     {
       "kind": "interface",
@@ -117095,7 +117104,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L389-L408"
+      "specLocation": "indices/_types/IndexSettings.ts#L390-L409"
     },
     {
       "kind": "interface",
@@ -117125,7 +117134,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L251-L253"
+      "specLocation": "indices/_types/IndexSettings.ts#L252-L254"
     },
     {
       "kind": "interface",
@@ -117245,7 +117254,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L326-L332"
+      "specLocation": "indices/_types/IndexSettings.ts#L327-L333"
     },
     {
       "kind": "interface",
@@ -117277,7 +117286,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L334-L337"
+      "specLocation": "indices/_types/IndexSettings.ts#L335-L338"
     },
     {
       "kind": "interface",
@@ -117298,7 +117307,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L410-L412"
+      "specLocation": "indices/_types/IndexSettings.ts#L411-L413"
     },
     {
       "kind": "interface",
@@ -117319,7 +117328,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L414-L416"
+      "specLocation": "indices/_types/IndexSettings.ts#L415-L417"
     },
     {
       "description": "Mapping Limit Settings",
@@ -117443,7 +117452,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L418-L432"
+      "specLocation": "indices/_types/IndexSettings.ts#L419-L433"
     },
     {
       "kind": "interface",
@@ -117503,7 +117512,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L434-L451"
+      "specLocation": "indices/_types/IndexSettings.ts#L435-L452"
     },
     {
       "kind": "interface",
@@ -117526,7 +117535,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L453-L460"
+      "specLocation": "indices/_types/IndexSettings.ts#L454-L461"
     },
     {
       "kind": "interface",
@@ -117549,7 +117558,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L462-L470"
+      "specLocation": "indices/_types/IndexSettings.ts#L463-L471"
     },
     {
       "kind": "interface",
@@ -117572,7 +117581,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L472-L479"
+      "specLocation": "indices/_types/IndexSettings.ts#L473-L480"
     },
     {
       "kind": "interface",
@@ -117594,7 +117603,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L481-L488"
+      "specLocation": "indices/_types/IndexSettings.ts#L482-L489"
     },
     {
       "kind": "interface",
@@ -117616,7 +117625,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L490-L496"
+      "specLocation": "indices/_types/IndexSettings.ts#L491-L497"
     },
     {
       "kind": "interface",
@@ -117637,7 +117646,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L498-L500"
+      "specLocation": "indices/_types/IndexSettings.ts#L499-L501"
     },
     {
       "kind": "interface",
@@ -117691,7 +117700,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L581-L586"
+      "specLocation": "indices/_types/IndexSettings.ts#L582-L587"
     },
     {
       "kind": "interface",
@@ -117715,7 +117724,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L588-L595"
+      "specLocation": "indices/_types/IndexSettings.ts#L589-L596"
     },
     {
       "kind": "interface",
@@ -117736,7 +117745,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L568-L570"
+      "specLocation": "indices/_types/IndexSettings.ts#L569-L571"
     },
     {
       "kind": "interface",
@@ -117758,7 +117767,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L572-L579"
+      "specLocation": "indices/_types/IndexSettings.ts#L573-L580"
     },
     {
       "kind": "interface",
@@ -117791,7 +117800,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L527-L536"
+      "specLocation": "indices/_types/IndexSettings.ts#L528-L537"
     },
     {
       "kind": "interface",
@@ -144744,7 +144753,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L417-L427"
+      "specLocation": "security/_types/Privileges.ts#L421-L431"
     },
     {
       "kind": "interface",
@@ -144807,7 +144816,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L429-L449"
+      "specLocation": "security/_types/Privileges.ts#L433-L453"
     },
     {
       "kind": "interface",
@@ -144855,9 +144864,20 @@
             }
           }
         },
+        {
+          "name": "description",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "string",
+              "namespace": "_builtins"
+            }
+          }
+        },
         {
           "name": "run_as",
-          "required": true,
+          "required": false,
           "type": {
             "kind": "array_of",
             "value": {
@@ -144969,7 +144989,7 @@
           }
         }
       ],
-      "specLocation": "security/get_role/types.ts#L32-L53"
+      "specLocation": "security/get_role/types.ts#L32-L54"
     },
     {
       "kind": "interface",
diff --git a/output/schema/schema.json b/output/schema/schema.json
index b1a0c6f0dc..16af2ba37d 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -128246,7 +128246,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L414-L416"
+      "specLocation": "indices/_types/IndexSettings.ts#L415-L417"
     },
     {
       "kind": "interface",
@@ -128991,7 +128991,7 @@
         "name": "IndexCheckOnStartup",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L263-L270"
+      "specLocation": "indices/_types/IndexSettings.ts#L264-L271"
     },
     {
       "kind": "interface",
@@ -129437,7 +129437,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L255-L261"
+      "specLocation": "indices/_types/IndexSettings.ts#L256-L262"
     },
     {
       "kind": "interface",
@@ -129691,9 +129691,18 @@
           "serverDefault": "false",
           "type": {
             "kind": "instance_of",
+            "generics": [
+              {
+                "kind": "instance_of",
+                "type": {
+                  "name": "string",
+                  "namespace": "_builtins"
+                }
+              }
+            ],
             "type": {
-              "name": "string",
-              "namespace": "_builtins"
+              "name": "WithNullValue",
+              "namespace": "_spec_utils"
             }
           }
         },
@@ -130243,7 +130252,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L69-L169"
+      "specLocation": "indices/_types/IndexSettings.ts#L70-L170"
     },
     {
       "kind": "interface",
@@ -130363,7 +130372,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L326-L332"
+      "specLocation": "indices/_types/IndexSettings.ts#L327-L333"
     },
     {
       "kind": "interface",
@@ -130481,7 +130490,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L277-L316"
+      "specLocation": "indices/_types/IndexSettings.ts#L278-L317"
     },
     {
       "kind": "interface",
@@ -130503,7 +130512,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L318-L324"
+      "specLocation": "indices/_types/IndexSettings.ts#L319-L325"
     },
     {
       "kind": "interface",
@@ -130535,7 +130544,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L334-L337"
+      "specLocation": "indices/_types/IndexSettings.ts#L335-L338"
     },
     {
       "kind": "interface",
@@ -130924,7 +130933,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L272-L275"
+      "specLocation": "indices/_types/IndexSettings.ts#L273-L276"
     },
     {
       "kind": "interface",
@@ -130945,7 +130954,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L568-L570"
+      "specLocation": "indices/_types/IndexSettings.ts#L569-L571"
     },
     {
       "kind": "interface",
@@ -130967,7 +130976,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L572-L579"
+      "specLocation": "indices/_types/IndexSettings.ts#L573-L580"
     },
     {
       "kind": "interface",
@@ -131021,7 +131030,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L581-L586"
+      "specLocation": "indices/_types/IndexSettings.ts#L582-L587"
     },
     {
       "kind": "interface",
@@ -131045,7 +131054,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L588-L595"
+      "specLocation": "indices/_types/IndexSettings.ts#L589-L596"
     },
     {
       "kind": "enum",
@@ -131191,7 +131200,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L418-L432"
+      "specLocation": "indices/_types/IndexSettings.ts#L419-L433"
     },
     {
       "kind": "interface",
@@ -131214,7 +131223,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L453-L460"
+      "specLocation": "indices/_types/IndexSettings.ts#L454-L461"
     },
     {
       "kind": "interface",
@@ -131236,7 +131245,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L490-L496"
+      "specLocation": "indices/_types/IndexSettings.ts#L491-L497"
     },
     {
       "kind": "interface",
@@ -131258,7 +131267,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L481-L488"
+      "specLocation": "indices/_types/IndexSettings.ts#L482-L489"
     },
     {
       "kind": "interface",
@@ -131281,7 +131290,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L462-L470"
+      "specLocation": "indices/_types/IndexSettings.ts#L463-L471"
     },
     {
       "kind": "interface",
@@ -131304,7 +131313,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L472-L479"
+      "specLocation": "indices/_types/IndexSettings.ts#L473-L480"
     },
     {
       "kind": "interface",
@@ -131325,7 +131334,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L498-L500"
+      "specLocation": "indices/_types/IndexSettings.ts#L499-L501"
     },
     {
       "kind": "interface",
@@ -131385,7 +131394,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L434-L451"
+      "specLocation": "indices/_types/IndexSettings.ts#L435-L452"
     },
     {
       "kind": "interface",
@@ -131406,7 +131415,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L339-L341"
+      "specLocation": "indices/_types/IndexSettings.ts#L340-L342"
     },
     {
       "kind": "interface",
@@ -131456,7 +131465,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L343-L346"
+      "specLocation": "indices/_types/IndexSettings.ts#L344-L347"
     },
     {
       "kind": "interface",
@@ -131514,7 +131523,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L410-L412"
+      "specLocation": "indices/_types/IndexSettings.ts#L411-L413"
     },
     {
       "kind": "interface",
@@ -131535,7 +131544,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L65-L67"
+      "specLocation": "indices/_types/IndexSettings.ts#L66-L68"
     },
     {
       "kind": "interface",
@@ -131557,7 +131566,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L246-L249"
+      "specLocation": "indices/_types/IndexSettings.ts#L247-L250"
     },
     {
       "kind": "enum",
@@ -131650,7 +131659,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L236-L239"
+      "specLocation": "indices/_types/IndexSettings.ts#L237-L240"
     },
     {
       "kind": "interface",
@@ -131672,7 +131681,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L231-L234"
+      "specLocation": "indices/_types/IndexSettings.ts#L232-L235"
     },
     {
       "kind": "interface",
@@ -131702,7 +131711,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L251-L253"
+      "specLocation": "indices/_types/IndexSettings.ts#L252-L254"
     },
     {
       "kind": "interface",
@@ -131734,7 +131743,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L241-L244"
+      "specLocation": "indices/_types/IndexSettings.ts#L242-L245"
     },
     {
       "kind": "type_alias",
@@ -131742,7 +131751,7 @@
         "name": "SettingsSimilarity",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L171-L183",
+      "specLocation": "indices/_types/IndexSettings.ts#L172-L184",
       "type": {
         "kind": "union_of",
         "items": [
@@ -131859,7 +131868,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L189-L194"
+      "specLocation": "indices/_types/IndexSettings.ts#L190-L195"
     },
     {
       "kind": "interface",
@@ -131877,7 +131886,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L185-L187"
+      "specLocation": "indices/_types/IndexSettings.ts#L186-L188"
     },
     {
       "kind": "interface",
@@ -131906,7 +131915,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L196-L199"
+      "specLocation": "indices/_types/IndexSettings.ts#L197-L200"
     },
     {
       "kind": "interface",
@@ -131957,7 +131966,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L201-L206"
+      "specLocation": "indices/_types/IndexSettings.ts#L202-L207"
     },
     {
       "kind": "interface",
@@ -132008,7 +132017,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L208-L213"
+      "specLocation": "indices/_types/IndexSettings.ts#L209-L214"
     },
     {
       "kind": "interface",
@@ -132037,7 +132046,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L215-L218"
+      "specLocation": "indices/_types/IndexSettings.ts#L216-L219"
     },
     {
       "kind": "interface",
@@ -132066,7 +132075,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L220-L223"
+      "specLocation": "indices/_types/IndexSettings.ts#L221-L224"
     },
     {
       "kind": "interface",
@@ -132106,7 +132115,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L225-L229"
+      "specLocation": "indices/_types/IndexSettings.ts#L226-L230"
     },
     {
       "kind": "interface",
@@ -132160,7 +132169,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L508-L513"
+      "specLocation": "indices/_types/IndexSettings.ts#L509-L514"
     },
     {
       "kind": "interface",
@@ -132214,7 +132223,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L520-L525"
+      "specLocation": "indices/_types/IndexSettings.ts#L521-L526"
     },
     {
       "kind": "interface",
@@ -132246,7 +132255,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L515-L518"
+      "specLocation": "indices/_types/IndexSettings.ts#L516-L519"
     },
     {
       "kind": "interface",
@@ -132281,7 +132290,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L50-L63"
+      "specLocation": "indices/_types/IndexSettings.ts#L51-L64"
     },
     {
       "kind": "enum",
@@ -132300,7 +132309,7 @@
         "name": "SourceMode",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L502-L506"
+      "specLocation": "indices/_types/IndexSettings.ts#L503-L507"
     },
     {
       "kind": "interface",
@@ -132333,7 +132342,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L527-L536"
+      "specLocation": "indices/_types/IndexSettings.ts#L528-L537"
     },
     {
       "kind": "enum",
@@ -132360,7 +132369,7 @@
         "name": "StorageType",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L538-L566"
+      "specLocation": "indices/_types/IndexSettings.ts#L539-L567"
     },
     {
       "kind": "interface",
@@ -132517,7 +132526,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L348-L370"
+      "specLocation": "indices/_types/IndexSettings.ts#L349-L371"
     },
     {
       "kind": "enum",
@@ -132541,7 +132550,7 @@
         "name": "TranslogDurability",
         "namespace": "indices._types"
       },
-      "specLocation": "indices/_types/IndexSettings.ts#L372-L387"
+      "specLocation": "indices/_types/IndexSettings.ts#L373-L388"
     },
     {
       "kind": "interface",
@@ -132577,7 +132586,7 @@
           }
         }
       ],
-      "specLocation": "indices/_types/IndexSettings.ts#L389-L408"
+      "specLocation": "indices/_types/IndexSettings.ts#L390-L409"
     },
     {
       "kind": "enum",
@@ -195819,7 +195828,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L409-L411"
+      "specLocation": "security/_types/Privileges.ts#L413-L415"
     },
     {
       "kind": "interface",
@@ -196344,7 +196353,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L405-L407"
+      "specLocation": "security/_types/Privileges.ts#L409-L411"
     },
     {
       "kind": "enum",
@@ -196457,7 +196466,7 @@
         "name": "IndexPrivilege",
         "namespace": "security._types"
       },
-      "specLocation": "security/_types/Privileges.ts#L361-L403"
+      "specLocation": "security/_types/Privileges.ts#L365-L407"
     },
     {
       "kind": "interface",
@@ -196565,7 +196574,7 @@
         "name": "IndicesPrivilegesQuery",
         "namespace": "security._types"
       },
-      "specLocation": "security/_types/Privileges.ts#L316-L324",
+      "specLocation": "security/_types/Privileges.ts#L320-L328",
       "type": {
         "kind": "union_of",
         "items": [
@@ -196615,7 +196624,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L413-L415"
+      "specLocation": "security/_types/Privileges.ts#L417-L419"
     },
     {
       "kind": "interface",
@@ -196820,6 +196829,36 @@
       ],
       "specLocation": "security/_types/Privileges.ts#L244-L276"
     },
+    {
+      "kind": "interface",
+      "inherits": {
+        "type": {
+          "name": "UserIndicesPrivileges",
+          "namespace": "security._types"
+        }
+      },
+      "name": {
+        "name": "RemoteUserIndicesPrivileges",
+        "namespace": "security._types"
+      },
+      "properties": [
+        {
+          "name": "clusters",
+          "required": true,
+          "type": {
+            "kind": "array_of",
+            "value": {
+              "kind": "instance_of",
+              "type": {
+                "name": "string",
+                "namespace": "_builtins"
+              }
+            }
+          }
+        }
+      ],
+      "specLocation": "security/_types/Privileges.ts#L316-L318"
+    },
     {
       "kind": "interface",
       "name": {
@@ -196868,7 +196907,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L417-L427"
+      "specLocation": "security/_types/Privileges.ts#L421-L431"
     },
     {
       "kind": "interface",
@@ -197505,7 +197544,7 @@
         "name": "RoleTemplateInlineQuery",
         "namespace": "security._types"
       },
-      "specLocation": "security/_types/Privileges.ts#L358-L359",
+      "specLocation": "security/_types/Privileges.ts#L362-L363",
       "type": {
         "kind": "union_of",
         "items": [
@@ -197548,7 +197587,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L326-L336"
+      "specLocation": "security/_types/Privileges.ts#L330-L340"
     },
     {
       "kind": "interface",
@@ -197636,7 +197675,7 @@
         }
       ],
       "shortcutProperty": "source",
-      "specLocation": "security/_types/Privileges.ts#L338-L356"
+      "specLocation": "security/_types/Privileges.ts#L342-L360"
     },
     {
       "kind": "interface",
@@ -197715,7 +197754,7 @@
           }
         }
       ],
-      "specLocation": "security/_types/Privileges.ts#L429-L449"
+      "specLocation": "security/_types/Privileges.ts#L433-L453"
     },
     {
       "kind": "interface",
@@ -201767,9 +201806,20 @@
             }
           }
         },
+        {
+          "name": "description",
+          "required": false,
+          "type": {
+            "kind": "instance_of",
+            "type": {
+              "name": "string",
+              "namespace": "_builtins"
+            }
+          }
+        },
         {
           "name": "run_as",
-          "required": true,
+          "required": false,
           "type": {
             "kind": "array_of",
             "value": {
@@ -201881,7 +201931,7 @@
           }
         }
       ],
-      "specLocation": "security/get_role/types.ts#L32-L53"
+      "specLocation": "security/get_role/types.ts#L32-L54"
     },
     {
       "kind": "request",
@@ -202858,6 +202908,20 @@
               }
             }
           },
+          {
+            "name": "remote_cluster",
+            "required": false,
+            "type": {
+              "kind": "array_of",
+              "value": {
+                "kind": "instance_of",
+                "type": {
+                  "name": "RemoteClusterPrivileges",
+                  "namespace": "security._types"
+                }
+              }
+            }
+          },
           {
             "name": "global",
             "required": true,
@@ -202886,6 +202950,20 @@
               }
             }
           },
+          {
+            "name": "remote_indices",
+            "required": false,
+            "type": {
+              "kind": "array_of",
+              "value": {
+                "kind": "instance_of",
+                "type": {
+                  "name": "RemoteUserIndicesPrivileges",
+                  "namespace": "security._types"
+                }
+              }
+            }
+          },
           {
             "name": "run_as",
             "required": true,
@@ -202906,7 +202984,7 @@
         "name": "Response",
         "namespace": "security.get_user_privileges"
       },
-      "specLocation": "security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts#L26-L34"
+      "specLocation": "security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts#L28-L38"
     },
     {
       "kind": "interface",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 4cd362db0d..3e8ecc5f6d 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -11286,7 +11286,7 @@ export interface IndicesIndexSettingsKeys {
   routing_partition_size?: SpecUtilsStringified<integer>
   load_fixed_bitset_filters_eagerly?: boolean
   hidden?: boolean | string
-  auto_expand_replicas?: string
+  auto_expand_replicas?: SpecUtilsWithNullValue<string>
   merge?: IndicesMerge
   search?: IndicesSettingsSearch
   refresh_interval?: Duration
@@ -18309,6 +18309,10 @@ export interface SecurityRemoteIndicesPrivileges {
   allow_restricted_indices?: boolean
 }
 
+export interface SecurityRemoteUserIndicesPrivileges extends SecurityUserIndicesPrivileges {
+  clusters: string[]
+}
+
 export interface SecurityReplicationAccess {
   names: IndexName | IndexName[]
   allow_restricted_indices?: boolean
@@ -18822,7 +18826,8 @@ export interface SecurityGetRoleRole {
   remote_indices?: SecurityRemoteIndicesPrivileges[]
   remote_cluster?: SecurityRemoteClusterPrivileges[]
   metadata: Metadata
-  run_as: string[]
+  description?: string
+  run_as?: string[]
   transient_metadata?: Record<string, any>
   applications: SecurityApplicationPrivileges[]
   role_templates?: SecurityRoleTemplate[]
@@ -18933,8 +18938,10 @@ export interface SecurityGetUserPrivilegesRequest extends RequestBase {
 export interface SecurityGetUserPrivilegesResponse {
   applications: SecurityApplicationPrivileges[]
   cluster: string[]
+  remote_cluster?: SecurityRemoteClusterPrivileges[]
   global: SecurityGlobalPrivilege[]
   indices: SecurityUserIndicesPrivileges[]
+  remote_indices?: SecurityRemoteUserIndicesPrivileges[]
   run_as: string[]
 }
 
diff --git a/specification/indices/_types/IndexSettings.ts b/specification/indices/_types/IndexSettings.ts
index 2680da8bbc..92f7ceba17 100644
--- a/specification/indices/_types/IndexSettings.ts
+++ b/specification/indices/_types/IndexSettings.ts
@@ -22,6 +22,7 @@ import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Dictionary } from '@spec_utils/Dictionary'
 import { Stringified } from '@spec_utils/Stringified'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
+import { WithNullValue } from '@spec_utils/utils'
 import { Analyzer } from '@_types/analysis/analyzers'
 import { CharFilter } from '@_types/analysis/char_filters'
 import { Normalizer } from '@_types/analysis/normalizers'
@@ -95,7 +96,7 @@ export class IndexSettings
   /** @server_default false */
   hidden?: boolean | string // TODO should be bool only
   /** @server_default false */
-  auto_expand_replicas?: string
+  auto_expand_replicas?: WithNullValue<string>
   merge?: Merge
   search?: SettingsSearch
   /** @server_default 1s */
diff --git a/specification/security/_types/Privileges.ts b/specification/security/_types/Privileges.ts
index bef3580985..ff5618da41 100644
--- a/specification/security/_types/Privileges.ts
+++ b/specification/security/_types/Privileges.ts
@@ -313,6 +313,10 @@ export class UserIndicesPrivileges {
   allow_restricted_indices: boolean
 }
 
+export class RemoteUserIndicesPrivileges extends UserIndicesPrivileges {
+  clusters: string[]
+}
+
 /**
  * While creating or updating a role you can provide either a JSON structure or a string to the API.
  * However, the response provided by Elasticsearch will only be string with a json-as-text content.
diff --git a/specification/security/get_role/types.ts b/specification/security/get_role/types.ts
index 122b993380..b733b65fca 100644
--- a/specification/security/get_role/types.ts
+++ b/specification/security/get_role/types.ts
@@ -41,7 +41,8 @@ export class Role {
    */
   remote_cluster?: RemoteClusterPrivileges[]
   metadata: Metadata
-  run_as: string[]
+  description?: string
+  run_as?: string[]
   transient_metadata?: Dictionary<string, UserDefinedValue>
   applications: ApplicationPrivileges[]
   role_templates?: RoleTemplate[]
diff --git a/specification/security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts b/specification/security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts
index b9341ed6fe..090f6f1ede 100644
--- a/specification/security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts
+++ b/specification/security/get_user_privileges/SecurityGetUserPrivilegesResponse.ts
@@ -20,6 +20,8 @@
 import {
   ApplicationPrivileges,
   GlobalPrivilege,
+  RemoteClusterPrivileges,
+  RemoteUserIndicesPrivileges,
   UserIndicesPrivileges
 } from '@security/_types/Privileges'
 
@@ -27,8 +29,10 @@ export class Response {
   body: {
     applications: ApplicationPrivileges[]
     cluster: string[]
+    remote_cluster?: RemoteClusterPrivileges[]
     global: GlobalPrivilege[]
     indices: UserIndicesPrivileges[]
+    remote_indices?: RemoteUserIndicesPrivileges[]
     run_as: string[]
   }
 }