diff --git a/clients/client-m2/src/endpoint/ruleset.ts b/clients/client-m2/src/endpoint/ruleset.ts
index 728f539e78d0..dedef2d68677 100644
--- a/clients/client-m2/src/endpoint/ruleset.ts
+++ b/clients/client-m2/src/endpoint/ruleset.ts
@@ -25,5 +25,5 @@ m={[q]:"booleanEquals",[r]:[true,{[q]:"getAttr",[r]:[{[s]:d},"supportsFIPS"]}]},
 n={[q]:"booleanEquals",[r]:[true,{[q]:"getAttr",[r]:[{[s]:d},"supportsDualStack"]}]},
 o=[j],
 p=[k];
-const _data={version:"1.0",parameters:{Region:{required:a,type:c},UseDualStack:h,UseFIPS:h,Endpoint:{required:b,type:c}},rules:[{conditions:[{[q]:"aws.partition",[r]:[{[s]:"Region"}],assign:d}],type:e,rules:[{conditions:[{[q]:"isSet",[r]:[i]}],type:e,rules:[{conditions:o,error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:f},{type:e,rules:[{conditions:p,error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:f},{endpoint:{url:i,properties:l,headers:l},type:g}]}]},{conditions:[j,k],type:e,rules:[{conditions:[m,n],type:e,rules:[{endpoint:{url:"https://m2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:l,headers:l},type:g}]},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:f}]},{conditions:o,type:e,rules:[{conditions:[m],type:e,rules:[{type:e,rules:[{endpoint:{url:"https://m2-fips.{Region}.{PartitionResult#dnsSuffix}",properties:l,headers:l},type:g}]}]},{error:"FIPS is enabled but this partition does not support FIPS",type:f}]},{conditions:p,type:e,rules:[{conditions:[n],type:e,rules:[{endpoint:{url:"https://m2.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:l,headers:l},type:g}]},{error:"DualStack is enabled but this partition does not support DualStack",type:f}]},{endpoint:{url:"https://m2.{Region}.{PartitionResult#dnsSuffix}",properties:l,headers:l},type:g}]}]};
+const _data={version:"1.0",parameters:{Region:{required:a,type:c},UseDualStack:h,UseFIPS:h,Endpoint:{required:b,type:c}},rules:[{conditions:[{[q]:"aws.partition",[r]:[{[s]:"Region"}],assign:d}],type:e,rules:[{conditions:[{[q]:"isSet",[r]:[i]}],type:e,rules:[{conditions:o,error:"Invalid Configuration: FIPS and custom endpoint are not supported",type:f},{type:e,rules:[{conditions:p,error:"Invalid Configuration: Dualstack and custom endpoint are not supported",type:f},{endpoint:{url:i,properties:l,headers:l},type:g}]}]},{conditions:[j,k],type:e,rules:[{conditions:[m,n],type:e,rules:[{type:e,rules:[{endpoint:{url:"https://m2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:l,headers:l},type:g}]}]},{error:"FIPS and DualStack are enabled, but this partition does not support one or both",type:f}]},{conditions:o,type:e,rules:[{conditions:[m],type:e,rules:[{type:e,rules:[{endpoint:{url:"https://m2-fips.{Region}.{PartitionResult#dnsSuffix}",properties:l,headers:l},type:g}]}]},{error:"FIPS is enabled but this partition does not support FIPS",type:f}]},{conditions:p,type:e,rules:[{conditions:[n],type:e,rules:[{type:e,rules:[{endpoint:{url:"https://m2.{Region}.{PartitionResult#dualStackDnsSuffix}",properties:l,headers:l},type:g}]}]},{error:"DualStack is enabled but this partition does not support DualStack",type:f}]},{type:e,rules:[{endpoint:{url:"https://m2.{Region}.{PartitionResult#dnsSuffix}",properties:l,headers:l},type:g}]}]}]};
 export const ruleSet: RuleSetObject = _data;
diff --git a/clients/client-m2/src/models/models_0.ts b/clients/client-m2/src/models/models_0.ts
index fa948d9dc254..a77d88c90181 100644
--- a/clients/client-m2/src/models/models_0.ts
+++ b/clients/client-m2/src/models/models_0.ts
@@ -1001,6 +1001,80 @@ export interface GetBatchJobExecutionRequest {
   executionId: string | undefined;
 }
 
+/**
+ * <p>A batch job identifier in which the batch job to run is identified by the file name and
+ *          the relative path to the file name.</p>
+ */
+export interface FileBatchJobIdentifier {
+  /**
+   * <p>The file name for the batch job identifier.</p>
+   */
+  fileName: string | undefined;
+
+  /**
+   * <p>The relative path to the file name for the batch job identifier.</p>
+   */
+  folderPath?: string;
+}
+
+/**
+ * <p>A batch job identifier in which the batch job to run is identified by the script
+ *          name.</p>
+ */
+export interface ScriptBatchJobIdentifier {
+  /**
+   * <p>The name of the script containing the batch job definition.</p>
+   */
+  scriptName: string | undefined;
+}
+
+/**
+ * <p>Identifies a specific batch job.</p>
+ */
+export type BatchJobIdentifier =
+  | BatchJobIdentifier.FileBatchJobIdentifierMember
+  | BatchJobIdentifier.ScriptBatchJobIdentifierMember
+  | BatchJobIdentifier.$UnknownMember;
+
+export namespace BatchJobIdentifier {
+  /**
+   * <p>Specifies a file associated with a specific batch job.</p>
+   */
+  export interface FileBatchJobIdentifierMember {
+    fileBatchJobIdentifier: FileBatchJobIdentifier;
+    scriptBatchJobIdentifier?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * <p>A batch job identifier in which the batch job to run is identified by the script name.</p>
+   */
+  export interface ScriptBatchJobIdentifierMember {
+    fileBatchJobIdentifier?: never;
+    scriptBatchJobIdentifier: ScriptBatchJobIdentifier;
+    $unknown?: never;
+  }
+
+  export interface $UnknownMember {
+    fileBatchJobIdentifier?: never;
+    scriptBatchJobIdentifier?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    fileBatchJobIdentifier: (value: FileBatchJobIdentifier) => T;
+    scriptBatchJobIdentifier: (value: ScriptBatchJobIdentifier) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(value: BatchJobIdentifier, visitor: Visitor<T>): T => {
+    if (value.fileBatchJobIdentifier !== undefined) return visitor.fileBatchJobIdentifier(value.fileBatchJobIdentifier);
+    if (value.scriptBatchJobIdentifier !== undefined)
+      return visitor.scriptBatchJobIdentifier(value.scriptBatchJobIdentifier);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  };
+}
+
 export enum BatchJobType {
   JES2 = "JES2",
   JES3 = "JES3",
@@ -1069,6 +1143,16 @@ export interface GetBatchJobExecutionResponse {
    * <p>The reason for the reported status.</p>
    */
   statusReason?: string;
+
+  /**
+   * <p/>
+   */
+  returnCode?: string;
+
+  /**
+   * <p>Identifies a specific batch job.</p>
+   */
+  batchJobIdentifier?: BatchJobIdentifier;
 }
 
 export interface GetDataSetDetailsRequest {
@@ -1681,6 +1765,16 @@ export interface BatchJobExecutionSummary {
    * <p>The timestamp when this batch job execution ended.</p>
    */
   endTime?: Date;
+
+  /**
+   * <p/>
+   */
+  returnCode?: string;
+
+  /**
+   * <p>Identifies a specific batch job.</p>
+   */
+  batchJobIdentifier?: BatchJobIdentifier;
 }
 
 export interface ListBatchJobExecutionsResponse {
@@ -1905,80 +1999,6 @@ export interface StartApplicationRequest {
 
 export interface StartApplicationResponse {}
 
-/**
- * <p>A batch job identifier in which the batch job to run is identified by the file name and
- *          the relative path to the file name.</p>
- */
-export interface FileBatchJobIdentifier {
-  /**
-   * <p>The file name for the batch job identifier.</p>
-   */
-  fileName: string | undefined;
-
-  /**
-   * <p>The relative path to the file name for the batch job identifier.</p>
-   */
-  folderPath?: string;
-}
-
-/**
- * <p>A batch job identifier in which the batch job to run is identified by the script
- *          name.</p>
- */
-export interface ScriptBatchJobIdentifier {
-  /**
-   * <p>The name of the script containing the batch job definition.</p>
-   */
-  scriptName: string | undefined;
-}
-
-/**
- * <p>Identifies a specific batch job.</p>
- */
-export type BatchJobIdentifier =
-  | BatchJobIdentifier.FileBatchJobIdentifierMember
-  | BatchJobIdentifier.ScriptBatchJobIdentifierMember
-  | BatchJobIdentifier.$UnknownMember;
-
-export namespace BatchJobIdentifier {
-  /**
-   * <p>Specifies a file associated with a specific batch job.</p>
-   */
-  export interface FileBatchJobIdentifierMember {
-    fileBatchJobIdentifier: FileBatchJobIdentifier;
-    scriptBatchJobIdentifier?: never;
-    $unknown?: never;
-  }
-
-  /**
-   * <p>A batch job identifier in which the batch job to run is identified by the script name.</p>
-   */
-  export interface ScriptBatchJobIdentifierMember {
-    fileBatchJobIdentifier?: never;
-    scriptBatchJobIdentifier: ScriptBatchJobIdentifier;
-    $unknown?: never;
-  }
-
-  export interface $UnknownMember {
-    fileBatchJobIdentifier?: never;
-    scriptBatchJobIdentifier?: never;
-    $unknown: [string, any];
-  }
-
-  export interface Visitor<T> {
-    fileBatchJobIdentifier: (value: FileBatchJobIdentifier) => T;
-    scriptBatchJobIdentifier: (value: ScriptBatchJobIdentifier) => T;
-    _: (name: string, value: any) => T;
-  }
-
-  export const visit = <T>(value: BatchJobIdentifier, visitor: Visitor<T>): T => {
-    if (value.fileBatchJobIdentifier !== undefined) return visitor.fileBatchJobIdentifier(value.fileBatchJobIdentifier);
-    if (value.scriptBatchJobIdentifier !== undefined)
-      return visitor.scriptBatchJobIdentifier(value.scriptBatchJobIdentifier);
-    return visitor._(value.$unknown[0], value.$unknown[1]);
-  };
-}
-
 export interface StartBatchJobRequest {
   /**
    * <p>The unique identifier of the application associated with this batch job.</p>
@@ -2848,11 +2868,37 @@ export const GetBatchJobExecutionRequestFilterSensitiveLog = (obj: GetBatchJobEx
   ...obj,
 });
 
+/**
+ * @internal
+ */
+export const FileBatchJobIdentifierFilterSensitiveLog = (obj: FileBatchJobIdentifier): any => ({
+  ...obj,
+});
+
+/**
+ * @internal
+ */
+export const ScriptBatchJobIdentifierFilterSensitiveLog = (obj: ScriptBatchJobIdentifier): any => ({
+  ...obj,
+});
+
+/**
+ * @internal
+ */
+export const BatchJobIdentifierFilterSensitiveLog = (obj: BatchJobIdentifier): any => {
+  if (obj.fileBatchJobIdentifier !== undefined)
+    return { fileBatchJobIdentifier: FileBatchJobIdentifierFilterSensitiveLog(obj.fileBatchJobIdentifier) };
+  if (obj.scriptBatchJobIdentifier !== undefined)
+    return { scriptBatchJobIdentifier: ScriptBatchJobIdentifierFilterSensitiveLog(obj.scriptBatchJobIdentifier) };
+  if (obj.$unknown !== undefined) return { [obj.$unknown[0]]: "UNKNOWN" };
+};
+
 /**
  * @internal
  */
 export const GetBatchJobExecutionResponseFilterSensitiveLog = (obj: GetBatchJobExecutionResponse): any => ({
   ...obj,
+  ...(obj.batchJobIdentifier && { batchJobIdentifier: BatchJobIdentifierFilterSensitiveLog(obj.batchJobIdentifier) }),
 });
 
 /**
@@ -3017,6 +3063,7 @@ export const ListBatchJobExecutionsRequestFilterSensitiveLog = (obj: ListBatchJo
  */
 export const BatchJobExecutionSummaryFilterSensitiveLog = (obj: BatchJobExecutionSummary): any => ({
   ...obj,
+  ...(obj.batchJobIdentifier && { batchJobIdentifier: BatchJobIdentifierFilterSensitiveLog(obj.batchJobIdentifier) }),
 });
 
 /**
@@ -3024,6 +3071,9 @@ export const BatchJobExecutionSummaryFilterSensitiveLog = (obj: BatchJobExecutio
  */
 export const ListBatchJobExecutionsResponseFilterSensitiveLog = (obj: ListBatchJobExecutionsResponse): any => ({
   ...obj,
+  ...(obj.batchJobExecutions && {
+    batchJobExecutions: obj.batchJobExecutions.map((item) => BatchJobExecutionSummaryFilterSensitiveLog(item)),
+  }),
 });
 
 /**
@@ -3103,31 +3153,6 @@ export const StartApplicationResponseFilterSensitiveLog = (obj: StartApplication
   ...obj,
 });
 
-/**
- * @internal
- */
-export const FileBatchJobIdentifierFilterSensitiveLog = (obj: FileBatchJobIdentifier): any => ({
-  ...obj,
-});
-
-/**
- * @internal
- */
-export const ScriptBatchJobIdentifierFilterSensitiveLog = (obj: ScriptBatchJobIdentifier): any => ({
-  ...obj,
-});
-
-/**
- * @internal
- */
-export const BatchJobIdentifierFilterSensitiveLog = (obj: BatchJobIdentifier): any => {
-  if (obj.fileBatchJobIdentifier !== undefined)
-    return { fileBatchJobIdentifier: FileBatchJobIdentifierFilterSensitiveLog(obj.fileBatchJobIdentifier) };
-  if (obj.scriptBatchJobIdentifier !== undefined)
-    return { scriptBatchJobIdentifier: ScriptBatchJobIdentifierFilterSensitiveLog(obj.scriptBatchJobIdentifier) };
-  if (obj.$unknown !== undefined) return { [obj.$unknown[0]]: "UNKNOWN" };
-};
-
 /**
  * @internal
  */
diff --git a/clients/client-m2/src/protocols/Aws_restJson1.ts b/clients/client-m2/src/protocols/Aws_restJson1.ts
index 66428a904116..4bc89b325640 100644
--- a/clients/client-m2/src/protocols/Aws_restJson1.ts
+++ b/clients/client-m2/src/protocols/Aws_restJson1.ts
@@ -1798,6 +1798,12 @@ export const deserializeAws_restJson1GetBatchJobExecutionCommand = async (
   if (data.applicationId != null) {
     contents.applicationId = __expectString(data.applicationId);
   }
+  if (data.batchJobIdentifier != null) {
+    contents.batchJobIdentifier = deserializeAws_restJson1BatchJobIdentifier(
+      __expectUnion(data.batchJobIdentifier),
+      context
+    );
+  }
   if (data.endTime != null) {
     contents.endTime = __expectNonNull(__parseEpochTimestamp(__expectNumber(data.endTime)));
   }
@@ -1816,6 +1822,9 @@ export const deserializeAws_restJson1GetBatchJobExecutionCommand = async (
   if (data.jobUser != null) {
     contents.jobUser = __expectString(data.jobUser);
   }
+  if (data.returnCode != null) {
+    contents.returnCode = __expectString(data.returnCode);
+  }
   if (data.startTime != null) {
     contents.startTime = __expectNonNull(__parseEpochTimestamp(__expectNumber(data.startTime)));
   }
@@ -3630,12 +3639,17 @@ const deserializeAws_restJson1BatchJobExecutionSummary = (
 ): BatchJobExecutionSummary => {
   return {
     applicationId: __expectString(output.applicationId),
+    batchJobIdentifier:
+      output.batchJobIdentifier != null
+        ? deserializeAws_restJson1BatchJobIdentifier(__expectUnion(output.batchJobIdentifier), context)
+        : undefined,
     endTime:
       output.endTime != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.endTime))) : undefined,
     executionId: __expectString(output.executionId),
     jobId: __expectString(output.jobId),
     jobName: __expectString(output.jobName),
     jobType: __expectString(output.jobType),
+    returnCode: __expectString(output.returnCode),
     startTime:
       output.startTime != null ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.startTime))) : undefined,
     status: __expectString(output.status),
@@ -3657,6 +3671,23 @@ const deserializeAws_restJson1BatchJobExecutionSummaryList = (
   return retVal;
 };
 
+const deserializeAws_restJson1BatchJobIdentifier = (output: any, context: __SerdeContext): BatchJobIdentifier => {
+  if (output.fileBatchJobIdentifier != null) {
+    return {
+      fileBatchJobIdentifier: deserializeAws_restJson1FileBatchJobIdentifier(output.fileBatchJobIdentifier, context),
+    };
+  }
+  if (output.scriptBatchJobIdentifier != null) {
+    return {
+      scriptBatchJobIdentifier: deserializeAws_restJson1ScriptBatchJobIdentifier(
+        output.scriptBatchJobIdentifier,
+        context
+      ),
+    };
+  }
+  return { $unknown: Object.entries(output)[0] };
+};
+
 const deserializeAws_restJson1DatasetDetailOrgAttributes = (
   output: any,
   context: __SerdeContext
@@ -3844,6 +3875,16 @@ const deserializeAws_restJson1FileBatchJobDefinition = (
   } as any;
 };
 
+const deserializeAws_restJson1FileBatchJobIdentifier = (
+  output: any,
+  context: __SerdeContext
+): FileBatchJobIdentifier => {
+  return {
+    fileName: __expectString(output.fileName),
+    folderPath: __expectString(output.folderPath),
+  } as any;
+};
+
 const deserializeAws_restJson1FsxStorageConfiguration = (
   output: any,
   context: __SerdeContext
@@ -3935,6 +3976,15 @@ const deserializeAws_restJson1ScriptBatchJobDefinition = (
   } as any;
 };
 
+const deserializeAws_restJson1ScriptBatchJobIdentifier = (
+  output: any,
+  context: __SerdeContext
+): ScriptBatchJobIdentifier => {
+  return {
+    scriptName: __expectString(output.scriptName),
+  } as any;
+};
+
 const deserializeAws_restJson1StorageConfiguration = (output: any, context: __SerdeContext): StorageConfiguration => {
   if (output.efs != null) {
     return {
diff --git a/codegen/sdk-codegen/aws-models/m2.json b/codegen/sdk-codegen/aws-models/m2.json
index a158a17f78dd..4c1058195d80 100644
--- a/codegen/sdk-codegen/aws-models/m2.json
+++ b/codegen/sdk-codegen/aws-models/m2.json
@@ -423,18 +423,15 @@
         "aws.iam#defineConditionKeys": {
           "aws:ResourceTag/${TagKey}": {
             "type": "String",
-            "documentation": "Filters access by a tag key and value pair of a resource",
-            "externalDocumentation": "${DocHomeURL}IAM/latest/UserGuide/reference_policies_condition-keys.html#condition-keys-resourcetag"
+            "documentation": "Filters access by a tag key and value pair of a resource"
           },
           "aws:RequestTag/${TagKey}": {
             "type": "String",
-            "documentation": "Filters access by a tag key and value pair that is allowed in the request",
-            "externalDocumentation": "${DocHomeURL}IAM/latest/UserGuide/reference_policies_condition-keys.html#condition-keys-requesttag"
+            "documentation": "Filters access by a tag key and value pair that is allowed in the request"
           },
           "aws:TagKeys": {
             "type": "String",
-            "documentation": "Filters access by a list of tag keys that are allowed in the request",
-            "externalDocumentation": "${DocHomeURL}IAM/latest/UserGuide/reference_policies_condition-keys.html#condition-keys-tagkeys"
+            "documentation": "Filters access by a list of tag keys that are allowed in the request"
           }
         },
         "aws.protocols#restJson1": {},
@@ -612,12 +609,18 @@
                       "rules": [
                         {
                           "conditions": [],
-                          "endpoint": {
-                            "url": "https://m2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                            "properties": {},
-                            "headers": {}
-                          },
-                          "type": "endpoint"
+                          "type": "tree",
+                          "rules": [
+                            {
+                              "conditions": [],
+                              "endpoint": {
+                                "url": "https://m2-fips.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                "properties": {},
+                                "headers": {}
+                              },
+                              "type": "endpoint"
+                            }
+                          ]
                         }
                       ]
                     },
@@ -722,12 +725,18 @@
                       "rules": [
                         {
                           "conditions": [],
-                          "endpoint": {
-                            "url": "https://m2.{Region}.{PartitionResult#dualStackDnsSuffix}",
-                            "properties": {},
-                            "headers": {}
-                          },
-                          "type": "endpoint"
+                          "type": "tree",
+                          "rules": [
+                            {
+                              "conditions": [],
+                              "endpoint": {
+                                "url": "https://m2.{Region}.{PartitionResult#dualStackDnsSuffix}",
+                                "properties": {},
+                                "headers": {}
+                              },
+                              "type": "endpoint"
+                            }
+                          ]
                         }
                       ]
                     },
@@ -740,12 +749,18 @@
                 },
                 {
                   "conditions": [],
-                  "endpoint": {
-                    "url": "https://m2.{Region}.{PartitionResult#dnsSuffix}",
-                    "properties": {},
-                    "headers": {}
-                  },
-                  "type": "endpoint"
+                  "type": "tree",
+                  "rules": [
+                    {
+                      "conditions": [],
+                      "endpoint": {
+                        "url": "https://m2.{Region}.{PartitionResult#dnsSuffix}",
+                        "properties": {},
+                        "headers": {}
+                      },
+                      "type": "endpoint"
+                    }
+                  ]
                 }
               ]
             }
@@ -754,94 +769,94 @@
         "smithy.rules#endpointTests": {
           "testCases": [
             {
-              "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled",
+              "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.ap-south-1.api.aws"
+                  "url": "https://m2-fips.us-isob-east-1.sc2s.sgov.gov"
                 }
               },
               "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "ap-south-1"
+                "Region": "us-isob-east-1",
+                "UseDualStack": false,
+                "UseFIPS": true
               }
             },
             {
-              "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled",
+              "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.ap-south-1.amazonaws.com"
+                  "url": "https://m2.us-isob-east-1.sc2s.sgov.gov"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "us-isob-east-1",
                 "UseDualStack": false,
-                "Region": "ap-south-1"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled",
+              "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2.ap-south-1.api.aws"
+                  "url": "https://m2-fips.us-gov-east-1.api.aws"
                 }
               },
               "params": {
-                "UseFIPS": false,
+                "Region": "us-gov-east-1",
                 "UseDualStack": true,
-                "Region": "ap-south-1"
+                "UseFIPS": true
               }
             },
             {
-              "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled",
+              "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2.ap-south-1.amazonaws.com"
+                  "url": "https://m2-fips.us-gov-east-1.amazonaws.com"
                 }
               },
               "params": {
-                "UseFIPS": false,
+                "Region": "us-gov-east-1",
                 "UseDualStack": false,
-                "Region": "ap-south-1"
+                "UseFIPS": true
               }
             },
             {
-              "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled",
+              "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.ca-central-1.api.aws"
+                  "url": "https://m2.us-gov-east-1.api.aws"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "us-gov-east-1",
                 "UseDualStack": true,
-                "Region": "ca-central-1"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled",
+              "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.ca-central-1.amazonaws.com"
+                  "url": "https://m2.us-gov-east-1.amazonaws.com"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "us-gov-east-1",
                 "UseDualStack": false,
-                "Region": "ca-central-1"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled",
+              "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2.ca-central-1.api.aws"
+                  "url": "https://m2.sa-east-1.amazonaws.com"
                 }
               },
               "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "ca-central-1"
+                "Region": "sa-east-1",
+                "UseDualStack": false,
+                "UseFIPS": false
               }
             },
             {
@@ -852,48 +867,22 @@
                 }
               },
               "params": {
-                "UseFIPS": false,
+                "Region": "ca-central-1",
                 "UseDualStack": false,
-                "Region": "ca-central-1"
-              }
-            },
-            {
-              "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.eu-central-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "eu-central-1"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled",
+              "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.eu-central-1.amazonaws.com"
+                  "url": "https://m2.us-east-1.amazonaws.com"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "us-east-1",
                 "UseDualStack": false,
-                "Region": "eu-central-1"
-              }
-            },
-            {
-              "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.eu-central-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "eu-central-1"
+                "UseFIPS": false
               }
             },
             {
@@ -904,204 +893,22 @@
                 }
               },
               "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-central-1"
-              }
-            },
-            {
-              "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.us-west-2.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "us-west-2"
-              }
-            },
-            {
-              "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.us-west-2.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "us-west-2"
-              }
-            },
-            {
-              "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.us-west-2.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "us-west-2"
-              }
-            },
-            {
-              "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.us-west-2.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "us-west-2"
-              }
-            },
-            {
-              "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.eu-west-3.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "eu-west-3"
-              }
-            },
-            {
-              "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.eu-west-3.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "eu-west-3"
-              }
-            },
-            {
-              "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.eu-west-3.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "eu-west-3"
-              }
-            },
-            {
-              "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.eu-west-3.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-west-3"
-              }
-            },
-            {
-              "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.eu-west-2.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "eu-west-2"
-              }
-            },
-            {
-              "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.eu-west-2.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "eu-west-2"
-              }
-            },
-            {
-              "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.eu-west-2.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "eu-west-2"
-              }
-            },
-            {
-              "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.eu-west-2.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
+                "Region": "eu-central-1",
                 "UseDualStack": false,
-                "Region": "eu-west-2"
-              }
-            },
-            {
-              "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.eu-west-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "eu-west-1"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled",
+              "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.eu-west-1.amazonaws.com"
+                  "url": "https://m2.ap-southeast-2.amazonaws.com"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "ap-southeast-2",
                 "UseDualStack": false,
-                "Region": "eu-west-1"
-              }
-            },
-            {
-              "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.eu-west-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "eu-west-1"
+                "UseFIPS": false
               }
             },
             {
@@ -1112,269 +919,139 @@
                 }
               },
               "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "eu-west-1"
-              }
-            },
-            {
-              "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.ap-northeast-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "ap-northeast-1"
-              }
-            },
-            {
-              "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.ap-northeast-1.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "ap-northeast-1"
-              }
-            },
-            {
-              "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.ap-northeast-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "ap-northeast-1"
-              }
-            },
-            {
-              "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.ap-northeast-1.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
-                "Region": "ap-northeast-1"
-              }
-            },
-            {
-              "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.sa-east-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "sa-east-1"
-              }
-            },
-            {
-              "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.sa-east-1.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": false,
-                "Region": "sa-east-1"
-              }
-            },
-            {
-              "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.sa-east-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "sa-east-1"
-              }
-            },
-            {
-              "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.sa-east-1.amazonaws.com"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
+                "Region": "eu-west-1",
                 "UseDualStack": false,
-                "Region": "sa-east-1"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2-fips.ap-southeast-1.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": true,
-                "UseDualStack": true,
-                "Region": "ap-southeast-1"
-              }
-            },
-            {
-              "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled",
+              "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.ap-southeast-1.amazonaws.com"
+                  "url": "https://m2.us-west-2.amazonaws.com"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "us-west-2",
                 "UseDualStack": false,
-                "Region": "ap-southeast-1"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled",
+              "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2.ap-southeast-1.api.aws"
+                  "url": "https://m2-fips.us-east-1.api.aws"
                 }
               },
               "params": {
-                "UseFIPS": false,
+                "Region": "us-east-1",
                 "UseDualStack": true,
-                "Region": "ap-southeast-1"
+                "UseFIPS": true
               }
             },
             {
-              "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled",
+              "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2.ap-southeast-1.amazonaws.com"
+                  "url": "https://m2-fips.us-east-1.amazonaws.com"
                 }
               },
               "params": {
-                "UseFIPS": false,
+                "Region": "us-east-1",
                 "UseDualStack": false,
-                "Region": "ap-southeast-1"
+                "UseFIPS": true
               }
             },
             {
-              "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled",
+              "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.ap-southeast-2.api.aws"
+                  "url": "https://m2.us-east-1.api.aws"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "us-east-1",
                 "UseDualStack": true,
-                "Region": "ap-southeast-2"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled",
+              "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.ap-southeast-2.amazonaws.com"
+                  "url": "https://m2-fips.us-iso-east-1.c2s.ic.gov"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "us-iso-east-1",
                 "UseDualStack": false,
-                "Region": "ap-southeast-2"
+                "UseFIPS": true
               }
             },
             {
-              "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled",
+              "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2.ap-southeast-2.api.aws"
-                }
-              },
-              "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
-                "Region": "ap-southeast-2"
-              }
-            },
-            {
-              "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled",
-              "expect": {
-                "endpoint": {
-                  "url": "https://m2.ap-southeast-2.amazonaws.com"
+                  "url": "https://m2.us-iso-east-1.c2s.ic.gov"
                 }
               },
               "params": {
-                "UseFIPS": false,
+                "Region": "us-iso-east-1",
                 "UseDualStack": false,
-                "Region": "ap-southeast-2"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled",
+              "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.us-east-1.api.aws"
+                  "url": "https://m2-fips.cn-north-1.api.amazonwebservices.com.cn"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "cn-north-1",
                 "UseDualStack": true,
-                "Region": "us-east-1"
+                "UseFIPS": true
               }
             },
             {
-              "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled",
+              "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2-fips.us-east-1.amazonaws.com"
+                  "url": "https://m2-fips.cn-north-1.amazonaws.com.cn"
                 }
               },
               "params": {
-                "UseFIPS": true,
+                "Region": "cn-north-1",
                 "UseDualStack": false,
-                "Region": "us-east-1"
+                "UseFIPS": true
               }
             },
             {
-              "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled",
+              "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2.us-east-1.api.aws"
+                  "url": "https://m2.cn-north-1.api.amazonwebservices.com.cn"
                 }
               },
               "params": {
-                "UseFIPS": false,
+                "Region": "cn-north-1",
                 "UseDualStack": true,
-                "Region": "us-east-1"
+                "UseFIPS": false
               }
             },
             {
-              "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled",
+              "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled",
               "expect": {
                 "endpoint": {
-                  "url": "https://m2.us-east-1.amazonaws.com"
+                  "url": "https://m2.cn-north-1.amazonaws.com.cn"
                 }
               },
               "params": {
-                "UseFIPS": false,
+                "Region": "cn-north-1",
                 "UseDualStack": false,
-                "Region": "us-east-1"
+                "UseFIPS": false
               }
             },
             {
@@ -1385,9 +1062,9 @@
                 }
               },
               "params": {
-                "UseFIPS": false,
-                "UseDualStack": false,
                 "Region": "us-east-1",
+                "UseDualStack": false,
+                "UseFIPS": false,
                 "Endpoint": "https://example.com"
               }
             },
@@ -1397,9 +1074,9 @@
                 "error": "Invalid Configuration: FIPS and custom endpoint are not supported"
               },
               "params": {
-                "UseFIPS": true,
-                "UseDualStack": false,
                 "Region": "us-east-1",
+                "UseDualStack": false,
+                "UseFIPS": true,
                 "Endpoint": "https://example.com"
               }
             },
@@ -1409,9 +1086,9 @@
                 "error": "Invalid Configuration: Dualstack and custom endpoint are not supported"
               },
               "params": {
-                "UseFIPS": false,
-                "UseDualStack": true,
                 "Region": "us-east-1",
+                "UseDualStack": true,
+                "UseFIPS": false,
                 "Endpoint": "https://example.com"
               }
             }
@@ -1543,6 +1220,15 @@
           "traits": {
             "smithy.api#documentation": "<p>The timestamp when this batch job execution ended.</p>"
           }
+        },
+        "returnCode": {
+          "target": "smithy.api#String",
+          "traits": {
+            "smithy.api#documentation": "<p/>"
+          }
+        },
+        "batchJobIdentifier": {
+          "target": "com.amazonaws.m2#BatchJobIdentifier"
         }
       },
       "traits": {
@@ -1671,9 +1357,6 @@
         "smithy.api#http": {
           "method": "POST",
           "uri": "/applications/{applicationId}/batch-job-executions/{executionId}/cancel",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         }
       }
@@ -3441,9 +3124,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications/{applicationId}/batch-job-executions/{executionId}",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#readonly": {}
@@ -3536,6 +3216,15 @@
           "traits": {
             "smithy.api#documentation": "<p>The reason for the reported status.</p>"
           }
+        },
+        "returnCode": {
+          "target": "smithy.api#String",
+          "traits": {
+            "smithy.api#documentation": "<p/>"
+          }
+        },
+        "batchJobIdentifier": {
+          "target": "com.amazonaws.m2#BatchJobIdentifier"
         }
       }
     },
@@ -3570,9 +3259,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications/{applicationId}/datasets/{dataSetName}",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#readonly": {}
@@ -4146,9 +3832,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications/{applicationId}/versions",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {
@@ -4240,9 +3923,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {
@@ -4348,9 +4028,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications/{applicationId}/batch-job-definitions",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {
@@ -4452,9 +4129,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications/{applicationId}/batch-job-executions",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {
@@ -4578,9 +4252,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications/{applicationId}/dataset-import-tasks",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {
@@ -4675,9 +4346,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications/{applicationId}/datasets",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {
@@ -4779,9 +4447,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/applications/{applicationId}/deployments",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {
@@ -4873,9 +4538,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/engine-versions",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {
@@ -4960,9 +4622,6 @@
         "smithy.api#http": {
           "method": "GET",
           "uri": "/environments",
-          "headers": {
-            "Content-Type": "application/x-amz-json-1.1"
-          },
           "code": 200
         },
         "smithy.api#paginated": {