diff --git a/codegen/sdk-codegen/aws-models/account.json b/codegen/sdk-codegen/aws-models/account.json
index 9f95e760b9a..c342fe4cab3 100644
--- a/codegen/sdk-codegen/aws-models/account.json
+++ b/codegen/sdk-codegen/aws-models/account.json
@@ -19,19 +19,11 @@
         },
         "com.amazonaws.account#Account": {
             "type": "service",
-            "version": "2021-02-01",
-            "resources": [
-                {
-                    "target": "com.amazonaws.account#AlternateContactResource"
-                }
-            ],
             "traits": {
                 "aws.api#service": {
                     "sdkId": "Account",
                     "arnNamespace": "account",
-                    "cloudFormationName": "Account",
-                    "cloudTrailEventSource": "CLOUDTRAIL_EVENT_SOURCE",
-                    "endpointPrefix": "account"
+                    "cloudTrailEventSource": "CLOUDTRAIL_EVENT_SOURCE"
                 },
                 "aws.auth#sigv4": {
                     "name": "account"
@@ -44,8 +36,20 @@
                     "outputToken": "NextToken",
                     "pageSize": "MaxResults"
                 },
+                "smithy.api#suppress": [
+                    "EventSource"
+                ],
                 "smithy.api#title": "AWS Account"
-            }
+            },
+            "version": "2021-02-01",
+            "resources": [
+                {
+                    "target": "com.amazonaws.account#AlternateContactResource"
+                },
+                {
+                    "target": "com.amazonaws.account#ContactInformationResource"
+                }
+            ]
         },
         "com.amazonaws.account#AccountId": {
             "type": "string",
@@ -53,6 +57,16 @@
                 "smithy.api#pattern": "^\\d{12}$"
             }
         },
+        "com.amazonaws.account#AddressLine": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 60
+                },
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.account#AlternateContact": {
             "type": "structure",
             "members": {
@@ -109,10 +123,7 @@
             },
             "traits": {
                 "aws.api#arn": {
-                    "template": "AlternateContact/{AlternateContactType}",
-                    "absolute": false,
-                    "noAccount": false,
-                    "noRegion": false
+                    "template": "AlternateContact/{AlternateContactType}"
                 }
             }
         },
@@ -135,11 +146,155 @@
                 ]
             }
         },
+        "com.amazonaws.account#City": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 50
+                },
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.account#CompanyName": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 50
+                },
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.account#ContactInformation": {
+            "type": "structure",
+            "members": {
+                "FullName": {
+                    "target": "com.amazonaws.account#FullName",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The full name of the primary contact address.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "AddressLine1": {
+                    "target": "com.amazonaws.account#AddressLine",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The first line of the primary contact address.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "AddressLine2": {
+                    "target": "com.amazonaws.account#AddressLine",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The second line of the primary contact address, if any.</p>"
+                    }
+                },
+                "AddressLine3": {
+                    "target": "com.amazonaws.account#AddressLine",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The third line of the primary contact address, if any.</p>"
+                    }
+                },
+                "City": {
+                    "target": "com.amazonaws.account#City",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The city of the primary contact address.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "StateOrRegion": {
+                    "target": "com.amazonaws.account#StateOrRegion",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The state or region of the primary contact address. This field is required in selected countries.</p>"
+                    }
+                },
+                "DistrictOrCounty": {
+                    "target": "com.amazonaws.account#DistrictOrCounty",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The district or county of the primary contact address, if any.</p>"
+                    }
+                },
+                "PostalCode": {
+                    "target": "com.amazonaws.account#PostalCode",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The postal code of the primary contact address.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "CountryCode": {
+                    "target": "com.amazonaws.account#CountryCode",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The ISO-3166 two-letter country code for the primary contact address.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "PhoneNumber": {
+                    "target": "com.amazonaws.account#ContactInformationPhoneNumber",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The phone number of the primary contact information. The number will be validated and, in some countries, checked for activation.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "CompanyName": {
+                    "target": "com.amazonaws.account#CompanyName",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name of the company associated with the primary contact information, if any.</p>"
+                    }
+                },
+                "WebsiteUrl": {
+                    "target": "com.amazonaws.account#WebsiteUrl",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The URL of the website associated with the primary contact information, if any.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Contains the details of the primary contact information associated with an Amazon Web Services account.</p>"
+            }
+        },
+        "com.amazonaws.account#ContactInformationPhoneNumber": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 20
+                },
+                "smithy.api#pattern": "^[+][\\s0-9()-]+$",
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.account#ContactInformationResource": {
+            "type": "resource",
+            "put": {
+                "target": "com.amazonaws.account#PutContactInformation"
+            },
+            "read": {
+                "target": "com.amazonaws.account#GetContactInformation"
+            },
+            "traits": {
+                "aws.api#arn": {
+                    "template": "ContactInformation"
+                }
+            }
+        },
+        "com.amazonaws.account#CountryCode": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 2,
+                    "max": 2
+                },
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.account#DeleteAlternateContact": {
             "type": "operation",
             "input": {
                 "target": "com.amazonaws.account#DeleteAlternateContactRequest"
             },
+            "output": {
+                "target": "smithy.api#Unit"
+            },
             "errors": [
                 {
                     "target": "com.amazonaws.account#AccessDeniedException"
@@ -158,10 +313,10 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Deletes the specified alternate contact from an Amazon Web Services account.</p>\n        <p>For complete details about how to use the alternate contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Access or\n                updating the alternate contacts</a>.</p>",
+                "smithy.api#documentation": "<p>Deletes the specified alternate contact from an Amazon Web Services account.</p>\n        <p>For complete details about how to use the alternate contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Access or\n                updating the alternate contacts</a>.</p>\n        <note>\n            <p>Before you can update the alternate contact information for an \n     Amazon Web Services account that is managed by Organizations, you must first enable integration between Amazon Web Services Account Management\n     and Organizations.  For more information, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/using-orgs-trusted-access.html\">Enabling trusted access for \n     Amazon Web Services Account Management</a>.</p>\n         </note>",
                 "smithy.api#http": {
-                    "method": "POST",
                     "uri": "/deleteAlternateContact",
+                    "method": "POST",
                     "code": 200
                 },
                 "smithy.api#idempotent": {}
@@ -183,6 +338,19 @@
                         "smithy.api#documentation": "<p>Specifies the 12 digit account ID number of the Amazon Web Services account that \n        you want to access or modify with this operation.</p>\n         <p>If you do not specify this parameter, it defaults to the Amazon Web Services account of the \n        identity used to call the operation.</p>\n         <p>To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account, and \n        the specified account ID must be a member account in the same organization. The\n        organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features \n        enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the \n        Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account \n        assigned.</p>\n         <note>\n            <p>The management account can't specify its own <code>AccountId</code>; it must call\n            the operation in standalone context by not including the <code>AccountId</code> \n            parameter.</p>\n         </note>\n         <p>To call this operation on an account that is not a member of an organization, then \n        don't specify this parameter, and call the operation using an identity belonging to\n        the account whose contacts you wish to retrieve or modify.</p>"
                     }
                 }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.account#DistrictOrCounty": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 50
+                },
+                "smithy.api#sensitive": {}
             }
         },
         "com.amazonaws.account#EmailAddress": {
@@ -192,7 +360,17 @@
                     "min": 1,
                     "max": 64
                 },
-                "smithy.api#pattern": "[\\w+=,.-]+@[\\w.-]+\\.[\\w]+",
+                "smithy.api#pattern": "^[\\s]*[\\w+=.#!&-]+@[\\w.-]+\\.[\\w]+[\\s]*$",
+                "smithy.api#sensitive": {}
+            }
+        },
+        "com.amazonaws.account#FullName": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 50
+                },
                 "smithy.api#sensitive": {}
             }
         },
@@ -222,13 +400,16 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Retrieves the specified alternate contact attached to an Amazon Web Services account.</p>\n        <p>For complete details about how to use the alternate contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Access or\n            updating the alternate contacts</a>.</p>",
+                "smithy.api#documentation": "<p>Retrieves the specified alternate contact attached to an Amazon Web Services account.</p>\n        <p>For complete details about how to use the alternate contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Access or\n                updating the alternate contacts</a>.</p>\n        <note>\n            <p>Before you can update the alternate contact information for an \n     Amazon Web Services account that is managed by Organizations, you must first enable integration between Amazon Web Services Account Management\n     and Organizations.  For more information, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/using-orgs-trusted-access.html\">Enabling trusted access for \n     Amazon Web Services Account Management</a>.</p>\n         </note>",
                 "smithy.api#http": {
-                    "method": "POST",
                     "uri": "/getAlternateContact",
+                    "method": "POST",
                     "code": 200
                 },
-                "smithy.api#readonly": {}
+                "smithy.api#readonly": {},
+                "smithy.api#suppress": [
+                    "HttpMethodSemantics"
+                ]
             }
         },
         "com.amazonaws.account#GetAlternateContactRequest": {
@@ -247,6 +428,9 @@
                         "smithy.api#documentation": "<p>Specifies the 12 digit account ID number of the Amazon Web Services account that \n        you want to access or modify with this operation.</p>\n         <p>If you do not specify this parameter, it defaults to the Amazon Web Services account of the \n        identity used to call the operation.</p>\n         <p>To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account, and \n        the specified account ID must be a member account in the same organization. The\n        organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features \n        enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the \n        Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account \n        assigned.</p>\n         <note>\n            <p>The management account can't specify its own <code>AccountId</code>; it must call\n            the operation in standalone context by not including the <code>AccountId</code> \n            parameter.</p>\n         </note>\n         <p>To call this operation on an account that is not a member of an organization, then \n        don't specify this parameter, and call the operation using an identity belonging to\n        the account whose contacts you wish to retrieve or modify.</p>"
                     }
                 }
+            },
+            "traits": {
+                "smithy.api#input": {}
             }
         },
         "com.amazonaws.account#GetAlternateContactResponse": {
@@ -258,6 +442,75 @@
                         "smithy.api#documentation": "<p>A structure that contains the details for the specified alternate contact.</p>"
                     }
                 }
+            },
+            "traits": {
+                "smithy.api#output": {}
+            }
+        },
+        "com.amazonaws.account#GetContactInformation": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.account#GetContactInformationRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.account#GetContactInformationResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.account#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.account#InternalServerException"
+                },
+                {
+                    "target": "com.amazonaws.account#ResourceNotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.account#TooManyRequestsException"
+                },
+                {
+                    "target": "com.amazonaws.account#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Retrieves the primary contact information of an Amazon Web Services account.</p>\n        <p>For complete details about how to use the primary contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Update\n                the primary and alternate contact information</a>.</p>",
+                "smithy.api#http": {
+                    "uri": "/getContactInformation",
+                    "method": "POST",
+                    "code": 200
+                },
+                "smithy.api#readonly": {},
+                "smithy.api#suppress": [
+                    "HttpMethodSemantics"
+                ]
+            }
+        },
+        "com.amazonaws.account#GetContactInformationRequest": {
+            "type": "structure",
+            "members": {
+                "AccountId": {
+                    "target": "com.amazonaws.account#AccountId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access\n            or modify with this operation. If you don't specify this parameter, it defaults to the\n            Amazon Web Services account of the identity used to call the operation. To use this parameter, the\n            caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's\n                management account</a> or a delegated administrator account. The specified\n            account ID must also be a member account in the same organization. The organization must have\n                <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features\n                enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled\n            for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account\n            assigned.</p>\n        <note>\n            <p>The management account can't specify its own <code>AccountId</code>. It must call\n                the operation in standalone context by not including the <code>AccountId</code>\n                parameter.</p>\n        </note>\n        <p>To call this operation on an account that is not a member of an organization, don't\n            specify this parameter. Instead, call the operation using an identity belonging to\n            the account whose contacts you wish to retrieve or modify.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.account#GetContactInformationResponse": {
+            "type": "structure",
+            "members": {
+                "ContactInformation": {
+                    "target": "com.amazonaws.account#ContactInformation",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Contains the details of the primary contact information associated with an Amazon Web Services account.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#output": {}
             }
         },
         "com.amazonaws.account#InternalServerException": {
@@ -298,11 +551,24 @@
                 "smithy.api#sensitive": {}
             }
         },
+        "com.amazonaws.account#PostalCode": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 20
+                },
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.account#PutAlternateContact": {
             "type": "operation",
             "input": {
                 "target": "com.amazonaws.account#PutAlternateContactRequest"
             },
+            "output": {
+                "target": "smithy.api#Unit"
+            },
             "errors": [
                 {
                     "target": "com.amazonaws.account#AccessDeniedException"
@@ -318,10 +584,10 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Modifies the specified alternate contact attached to an Amazon Web Services account.</p>\n        <p>For complete details about how to use the alternate contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Access or\n            updating the alternate contacts</a>.</p>",
+                "smithy.api#documentation": "<p>Modifies the specified alternate contact attached to an Amazon Web Services account.</p>\n        <p>For complete details about how to use the alternate contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Access or\n                updating the alternate contacts</a>.</p>\n        <note>\n            <p>Before you can update the alternate contact information for an \n     Amazon Web Services account that is managed by Organizations, you must first enable integration between Amazon Web Services Account Management\n     and Organizations.  For more information, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/using-orgs-trusted-access.html\">Enabling trusted access for \n     Amazon Web Services Account Management</a>.</p>\n         </note>",
                 "smithy.api#http": {
-                    "method": "POST",
                     "uri": "/putAlternateContact",
+                    "method": "POST",
                     "code": 200
                 },
                 "smithy.api#idempotent": {}
@@ -371,6 +637,62 @@
                         "smithy.api#documentation": "<p>Specifies the 12 digit account ID number of the Amazon Web Services account that \n        you want to access or modify with this operation.</p>\n         <p>If you do not specify this parameter, it defaults to the Amazon Web Services account of the \n        identity used to call the operation.</p>\n         <p>To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account, and \n        the specified account ID must be a member account in the same organization. The\n        organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features \n        enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the \n        Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account \n        assigned.</p>\n         <note>\n            <p>The management account can't specify its own <code>AccountId</code>; it must call\n            the operation in standalone context by not including the <code>AccountId</code> \n            parameter.</p>\n         </note>\n         <p>To call this operation on an account that is not a member of an organization, then \n        don't specify this parameter, and call the operation using an identity belonging to\n        the account whose contacts you wish to retrieve or modify.</p>"
                     }
                 }
+            },
+            "traits": {
+                "smithy.api#input": {}
+            }
+        },
+        "com.amazonaws.account#PutContactInformation": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.account#PutContactInformationRequest"
+            },
+            "output": {
+                "target": "smithy.api#Unit"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.account#AccessDeniedException"
+                },
+                {
+                    "target": "com.amazonaws.account#InternalServerException"
+                },
+                {
+                    "target": "com.amazonaws.account#TooManyRequestsException"
+                },
+                {
+                    "target": "com.amazonaws.account#ValidationException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Updates the primary contact information of an Amazon Web Services account.</p>\n        <p>For complete details about how to use the primary contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Update\n            the primary and alternate contact information</a>.</p>",
+                "smithy.api#http": {
+                    "uri": "/putContactInformation",
+                    "method": "POST",
+                    "code": 200
+                },
+                "smithy.api#idempotent": {}
+            }
+        },
+        "com.amazonaws.account#PutContactInformationRequest": {
+            "type": "structure",
+            "members": {
+                "ContactInformation": {
+                    "target": "com.amazonaws.account#ContactInformation",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Contains the details of the primary contact information associated with an Amazon Web Services account.</p>",
+                        "smithy.api#required": {}
+                    }
+                },
+                "AccountId": {
+                    "target": "com.amazonaws.account#AccountId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access\n            or modify with this operation. If you don't specify this parameter, it defaults to the\n            Amazon Web Services account of the identity used to call the operation. To use this parameter, the\n            caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's\n                management account</a> or a delegated administrator account. The specified\n            account ID must also be a member account in the same organization. The organization must have\n            <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features\n                enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled\n            for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account\n            assigned.</p>\n        <note>\n            <p>The management account can't specify its own <code>AccountId</code>. It must call\n                the operation in standalone context by not including the <code>AccountId</code>\n                parameter.</p>\n        </note>\n        <p>To call this operation on an account that is not a member of an organization, don't\n            specify this parameter. Instead, call the operation using an identity belonging to\n            the account whose contacts you wish to retrieve or modify.</p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#input": {}
             }
         },
         "com.amazonaws.account#ResourceNotFoundException": {
@@ -389,6 +711,16 @@
                 "smithy.api#httpError": 404
             }
         },
+        "com.amazonaws.account#StateOrRegion": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 50
+                },
+                "smithy.api#sensitive": {}
+            }
+        },
         "com.amazonaws.account#Title": {
             "type": "string",
             "traits": {
@@ -433,6 +765,16 @@
                 "smithy.api#error": "client",
                 "smithy.api#httpError": 400
             }
+        },
+        "com.amazonaws.account#WebsiteUrl": {
+            "type": "string",
+            "traits": {
+                "smithy.api#length": {
+                    "min": 1,
+                    "max": 256
+                },
+                "smithy.api#sensitive": {}
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/codegen/sdk-codegen/aws-models/ec2.json b/codegen/sdk-codegen/aws-models/ec2.json
index 4d64eac8e42..09177545928 100644
--- a/codegen/sdk-codegen/aws-models/ec2.json
+++ b/codegen/sdk-codegen/aws-models/ec2.json
@@ -48367,6 +48367,10 @@
                     {
                         "value": "c7g.16xlarge",
                         "name": "c7g_16xlarge"
+                    },
+                    {
+                        "value": "mac2.metal",
+                        "name": "mac2_metal"
                     }
                 ]
             }
diff --git a/codegen/sdk-codegen/aws-models/iotdeviceadvisor.json b/codegen/sdk-codegen/aws-models/iotdeviceadvisor.json
index 5047ac1e5a0..077844bed4e 100644
--- a/codegen/sdk-codegen/aws-models/iotdeviceadvisor.json
+++ b/codegen/sdk-codegen/aws-models/iotdeviceadvisor.json
@@ -624,7 +624,7 @@
                     "name": "iotdeviceadvisor"
                 },
                 "aws.protocols#restJson1": {},
-                "smithy.api#documentation": "<p>Amazon Web Services IoT Core Device Advisor is a cloud-based, fully managed test capability for\n            validating IoT devices during device software development. Device Advisor provides\n            pre-built tests that you can use to validate IoT devices for reliable and secure\n            connectivity with Amazon Web Services IoT Core before deploying devices to production. By using Device Advisor,\n            you can confirm that your devices can connect to Amazon Web Services IoT Core, follow security\n            best practices and, if applicable, receive software updates from IoT Device Management.\n            You can also download signed qualification reports to submit to the Amazon Web Services Partner Network\n            to get your device qualified for the Amazon Web Services Partner Device Catalog without the need to send\n            your device in and wait for it to be tested.</p>",
+                "smithy.api#documentation": "<p>Amazon Web Services IoT Core Device Advisor is a cloud-based, fully managed test capability for validating IoT\n            devices during device software development. Device Advisor provides pre-built tests that you\n            can use to validate IoT devices for reliable and secure connectivity with Amazon Web Services IoT Core\n            before deploying devices to production. By using Device Advisor, you can confirm that your\n            devices can connect to Amazon Web Services IoT Core, follow security best practices and, if applicable,\n            receive software updates from IoT Device Management. You can also download signed\n            qualification reports to submit to the Amazon Web Services Partner Network to get your device\n            qualified for the Amazon Web Services Partner Device Catalog without the need to send your device in\n            and wait for it to be tested.</p>",
                 "smithy.api#title": "AWS IoT Core Device Advisor"
             },
             "version": "2020-09-18",
@@ -673,6 +673,9 @@
                 }
             ]
         },
+        "com.amazonaws.iotdeviceadvisor#IsLongDurationTestBoolean": {
+            "type": "boolean"
+        },
         "com.amazonaws.iotdeviceadvisor#ListSuiteDefinitions": {
             "type": "operation",
             "input": {
@@ -728,7 +731,7 @@
                 "suiteDefinitionInformationList": {
                     "target": "com.amazonaws.iotdeviceadvisor#SuiteDefinitionInformationList",
                     "traits": {
-                        "smithy.api#documentation": "<p>An array of objects that provide summaries of information about the suite definitions in the list.</p>"
+                        "smithy.api#documentation": "<p>An array of objects that provide summaries of information about the suite definitions\n            in the list.</p>"
                     }
                 },
                 "nextToken": {
@@ -808,7 +811,7 @@
                 "suiteRunsList": {
                     "target": "com.amazonaws.iotdeviceadvisor#SuiteRunsList",
                     "traits": {
-                        "smithy.api#documentation": "<p>An array of objects that provide summaries of information about the suite runs in the list.</p>"
+                        "smithy.api#documentation": "<p>An array of objects that provide summaries of information about the suite runs in the\n            list.</p>"
                     }
                 },
                 "nextToken": {
@@ -895,6 +898,21 @@
         "com.amazonaws.iotdeviceadvisor#ParallelRun": {
             "type": "boolean"
         },
+        "com.amazonaws.iotdeviceadvisor#Protocol": {
+            "type": "string",
+            "traits": {
+                "smithy.api#enum": [
+                    {
+                        "value": "MqttV3_1_1",
+                        "name": "MqttV3_1_1"
+                    },
+                    {
+                        "value": "MqttV5",
+                        "name": "MqttV5"
+                    }
+                ]
+            }
+        },
         "com.amazonaws.iotdeviceadvisor#QualificationReportDownloadUrl": {
             "type": "string"
         },
@@ -955,7 +973,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Starts a Device Advisor test suite run.</p> \n        <p>Requires permission to access the <a href=\"https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsiot.html#awsiot-actions-as-permissions\">StartSuiteRun</a> action.</p>",
+                "smithy.api#documentation": "<p>Starts a Device Advisor test suite run.</p>\n        <p>Requires permission to access the <a href=\"https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsiot.html#awsiot-actions-as-permissions\">StartSuiteRun</a> action.</p>",
                 "smithy.api#http": {
                     "method": "POST",
                     "uri": "/suiteDefinitions/{suiteDefinitionId}/suiteRuns",
@@ -1152,6 +1170,12 @@
                         "smithy.api#documentation": "<p>Gets the tests intended for qualification in a suite.</p>"
                     }
                 },
+                "isLongDurationTest": {
+                    "target": "com.amazonaws.iotdeviceadvisor#IsLongDurationTestBoolean",
+                    "traits": {
+                        "smithy.api#documentation": "<p> Verifies if the test suite is a long duration test. </p>"
+                    }
+                },
                 "rootGroup": {
                     "target": "com.amazonaws.iotdeviceadvisor#RootGroup",
                     "traits": {
@@ -1163,6 +1187,12 @@
                     "traits": {
                         "smithy.api#documentation": "<p>Gets the device permission ARN.</p>"
                     }
+                },
+                "protocol": {
+                    "target": "com.amazonaws.iotdeviceadvisor#Protocol",
+                    "traits": {
+                        "smithy.api#documentation": "<p> Gets the MQTT protocol that is configured in the suite definition.</p>"
+                    }
                 }
             },
             "traits": {
@@ -1196,6 +1226,18 @@
                         "smithy.api#documentation": "<p>Specifies if the test suite is intended for qualification.</p>"
                     }
                 },
+                "isLongDurationTest": {
+                    "target": "com.amazonaws.iotdeviceadvisor#IsLongDurationTestBoolean",
+                    "traits": {
+                        "smithy.api#documentation": "<p> Verifies if the test suite is a long duration test. </p>"
+                    }
+                },
+                "protocol": {
+                    "target": "com.amazonaws.iotdeviceadvisor#Protocol",
+                    "traits": {
+                        "smithy.api#documentation": "<p> Gets the MQTT protocol that is configured in the suite definition.</p>"
+                    }
+                },
                 "createdAt": {
                     "target": "com.amazonaws.iotdeviceadvisor#Timestamp",
                     "traits": {
@@ -1383,6 +1425,9 @@
                 "target": "com.amazonaws.iotdeviceadvisor#SuiteRunInformation"
             }
         },
+        "com.amazonaws.iotdeviceadvisor#SystemMessage": {
+            "type": "string"
+        },
         "com.amazonaws.iotdeviceadvisor#TagKeyList": {
             "type": "list",
             "member": {
@@ -1489,7 +1534,7 @@
                 "status": {
                     "target": "com.amazonaws.iotdeviceadvisor#Status",
                     "traits": {
-                        "smithy.api#documentation": "<p>Provides the test case run status. Status is one of the following:</p>\n        <ul>\n            <li>\n               <p>\n                  <code>PASS</code>: Test passed.</p>\n            </li>\n            <li>\n               <p>\n                  <code>FAIL</code>: Test failed.</p>\n            </li>\n            <li>\n               <p>\n                  <code>PENDING</code>: Test has not started running but is scheduled.</p>\n            </li>\n            <li>\n               <p>\n                  <code>RUNNING</code>: Test is running.</p>\n            </li>\n            <li>\n               <p>\n                  <code>STOPPING</code>: Test is performing cleanup steps. You will see this status only if you stop a suite run.</p>\n            </li>\n            <li>\n               <p>\n                  <code>STOPPED</code> Test is stopped. You will see this status only if you stop a suite run.</p>\n            </li>\n            <li>\n               <p>\n                  <code>PASS_WITH_WARNINGS</code>: Test passed with warnings.</p>\n            </li>\n            <li>\n               <p>\n                  <code>ERORR</code>: Test faced an error when running due to an internal issue.</p>\n            </li>\n         </ul>"
+                        "smithy.api#documentation": "<p>Provides the test case run status. Status is one of the following:</p>\n        <ul>\n            <li>\n                <p>\n                  <code>PASS</code>: Test passed.</p>\n            </li>\n            <li>\n                <p>\n                  <code>FAIL</code>: Test failed.</p>\n            </li>\n            <li>\n                <p>\n                  <code>PENDING</code>: Test has not started running but is scheduled.</p>\n            </li>\n            <li>\n                <p>\n                  <code>RUNNING</code>: Test is running.</p>\n            </li>\n            <li>\n                <p>\n                  <code>STOPPING</code>: Test is performing cleanup steps. You will see this\n                    status only if you stop a suite run.</p>\n            </li>\n            <li>\n                <p>\n                  <code>STOPPED</code> Test is stopped. You will see this status only if you\n                    stop a suite run.</p>\n            </li>\n            <li>\n                <p>\n                  <code>PASS_WITH_WARNINGS</code>: Test passed with warnings.</p>\n            </li>\n            <li>\n                <p>\n                  <code>ERORR</code>: Test faced an error when running due to an internal\n                    issue.</p>\n            </li>\n         </ul>"
                     }
                 },
                 "startTime": {
@@ -1521,6 +1566,12 @@
                     "traits": {
                         "smithy.api#documentation": "<p>Provides test case run failure result.</p>"
                     }
+                },
+                "testScenarios": {
+                    "target": "com.amazonaws.iotdeviceadvisor#TestCaseScenariosList",
+                    "traits": {
+                        "smithy.api#documentation": "<p> Provides the test scenarios for the test case run. </p>"
+                    }
                 }
             },
             "traits": {
@@ -1536,6 +1587,111 @@
                 "smithy.api#documentation": "<p>Tests under each group result.</p>"
             }
         },
+        "com.amazonaws.iotdeviceadvisor#TestCaseScenario": {
+            "type": "structure",
+            "members": {
+                "testCaseScenarioId": {
+                    "target": "com.amazonaws.iotdeviceadvisor#TestCaseScenarioId",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Provides test case scenario ID.</p>"
+                    }
+                },
+                "testCaseScenarioType": {
+                    "target": "com.amazonaws.iotdeviceadvisor#TestCaseScenarioType",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Provides test case scenario type. Type is one of the following:</p>\n        <ul>\n            <li>\n                <p>Advanced</p>\n            </li>\n            <li>\n                <p>Basic</p>\n            </li>\n         </ul>"
+                    }
+                },
+                "status": {
+                    "target": "com.amazonaws.iotdeviceadvisor#TestCaseScenarioStatus",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Provides the test case scenario status. Status is one of the following:</p>\n        <ul>\n            <li>\n                <p>\n                  <code>PASS</code>: Test passed.</p>\n            </li>\n            <li>\n                <p>\n                  <code>FAIL</code>: Test failed.</p>\n            </li>\n            <li>\n                <p>\n                  <code>PENDING</code>: Test has not started running but is scheduled.</p>\n            </li>\n            <li>\n                <p>\n                  <code>RUNNING</code>: Test is running.</p>\n            </li>\n            <li>\n                <p>\n                  <code>STOPPING</code>: Test is performing cleanup steps. You will see this\n                    status only if you stop a suite run.</p>\n            </li>\n            <li>\n                <p>\n                  <code>STOPPED</code> Test is stopped. You will see this status only if you\n                    stop a suite run.</p>\n            </li>\n            <li>\n                <p>\n                  <code>PASS_WITH_WARNINGS</code>: Test passed with warnings.</p>\n            </li>\n            <li>\n                <p>\n                  <code>ERORR</code>: Test faced an error when running due to an internal\n                    issue.</p>\n            </li>\n         </ul>"
+                    }
+                },
+                "failure": {
+                    "target": "com.amazonaws.iotdeviceadvisor#Failure",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Provides test case scenario failure result.</p>"
+                    }
+                },
+                "systemMessage": {
+                    "target": "com.amazonaws.iotdeviceadvisor#SystemMessage",
+                    "traits": {
+                        "smithy.api#documentation": "<p>\n            \n        </p>"
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "<p>Provides test case scenario.</p>"
+            }
+        },
+        "com.amazonaws.iotdeviceadvisor#TestCaseScenarioId": {
+            "type": "string"
+        },
+        "com.amazonaws.iotdeviceadvisor#TestCaseScenarioStatus": {
+            "type": "string",
+            "traits": {
+                "smithy.api#enum": [
+                    {
+                        "value": "PASS",
+                        "name": "PASS"
+                    },
+                    {
+                        "value": "FAIL",
+                        "name": "FAIL"
+                    },
+                    {
+                        "value": "CANCELED",
+                        "name": "CANCELED"
+                    },
+                    {
+                        "value": "PENDING",
+                        "name": "PENDING"
+                    },
+                    {
+                        "value": "RUNNING",
+                        "name": "RUNNING"
+                    },
+                    {
+                        "value": "STOPPING",
+                        "name": "STOPPING"
+                    },
+                    {
+                        "value": "STOPPED",
+                        "name": "STOPPED"
+                    },
+                    {
+                        "value": "PASS_WITH_WARNINGS",
+                        "name": "PASS_WITH_WARNINGS"
+                    },
+                    {
+                        "value": "ERROR",
+                        "name": "ERROR"
+                    }
+                ]
+            }
+        },
+        "com.amazonaws.iotdeviceadvisor#TestCaseScenarioType": {
+            "type": "string",
+            "traits": {
+                "smithy.api#enum": [
+                    {
+                        "value": "Advanced",
+                        "name": "Advanced"
+                    },
+                    {
+                        "value": "Basic",
+                        "name": "Basic"
+                    }
+                ]
+            }
+        },
+        "com.amazonaws.iotdeviceadvisor#TestCaseScenariosList": {
+            "type": "list",
+            "member": {
+                "target": "com.amazonaws.iotdeviceadvisor#TestCaseScenario"
+            }
+        },
         "com.amazonaws.iotdeviceadvisor#TestResult": {
             "type": "structure",
             "members": {
@@ -1641,7 +1797,7 @@
                 }
             ],
             "traits": {
-                "smithy.api#documentation": "<p>Updates a Device Advisor test suite.</p> \n        <p>Requires permission to access the <a href=\"https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsiot.html#awsiot-actions-as-permissions\">UpdateSuiteDefinition</a> action.</p>",
+                "smithy.api#documentation": "<p>Updates a Device Advisor test suite.</p>\n        <p>Requires permission to access the <a href=\"https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsiot.html#awsiot-actions-as-permissions\">UpdateSuiteDefinition</a> action.</p>",
                 "smithy.api#http": {
                     "method": "PATCH",
                     "uri": "/suiteDefinitions/{suiteDefinitionId}",
diff --git a/codegen/sdk-codegen/aws-models/medialive.json b/codegen/sdk-codegen/aws-models/medialive.json
index 2c7348d7780..c96275ec0d5 100644
--- a/codegen/sdk-codegen/aws-models/medialive.json
+++ b/codegen/sdk-codegen/aws-models/medialive.json
@@ -14345,12 +14345,18 @@
                 {
                     "target": "com.amazonaws.medialive#PurchaseOffering"
                 },
+                {
+                    "target": "com.amazonaws.medialive#RebootInputDevice"
+                },
                 {
                     "target": "com.amazonaws.medialive#RejectInputDeviceTransfer"
                 },
                 {
                     "target": "com.amazonaws.medialive#StartChannel"
                 },
+                {
+                    "target": "com.amazonaws.medialive#StartInputDeviceMaintenanceWindow"
+                },
                 {
                     "target": "com.amazonaws.medialive#StartMultiplex"
                 },
@@ -16459,6 +16465,95 @@
                 "smithy.api#documentation": "Raw Settings"
             }
         },
+        "com.amazonaws.medialive#RebootInputDevice": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.medialive#RebootInputDeviceRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.medialive#RebootInputDeviceResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.medialive#BadGatewayException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#BadRequestException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#ForbiddenException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#GatewayTimeoutException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#InternalServerErrorException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#NotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#TooManyRequestsException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#UnprocessableEntityException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "Send a reboot command to the specified input device. The device will begin rebooting within a few seconds of sending the command. When the reboot is complete, the device’s connection status will change to connected.",
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/prod/inputDevices/{InputDeviceId}/reboot",
+                    "code": 200
+                }
+            }
+        },
+        "com.amazonaws.medialive#RebootInputDeviceForce": {
+            "type": "string",
+            "traits": {
+                "smithy.api#documentation": "Whether or not to force reboot the input device.",
+                "smithy.api#enum": [
+                    {
+                        "value": "NO",
+                        "name": "NO"
+                    },
+                    {
+                        "value": "YES",
+                        "name": "YES"
+                    }
+                ]
+            }
+        },
+        "com.amazonaws.medialive#RebootInputDeviceRequest": {
+            "type": "structure",
+            "members": {
+                "Force": {
+                    "target": "com.amazonaws.medialive#RebootInputDeviceForce",
+                    "traits": {
+                        "smithy.api#documentation": "Force a reboot of an input device. If the device is streaming, it will stop streaming and begin rebooting within a few seconds of sending the command. If the device was streaming prior to the reboot, the device will resume streaming when the reboot completes.",
+                        "smithy.api#jsonName": "force"
+                    }
+                },
+                "InputDeviceId": {
+                    "target": "com.amazonaws.medialive#__string",
+                    "traits": {
+                        "smithy.api#documentation": "The unique ID of the input device to reboot. For example, hd-123456789abcdef.",
+                        "smithy.api#httpLabel": {},
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "A request to reboot an AWS Elemental device."
+            }
+        },
+        "com.amazonaws.medialive#RebootInputDeviceResponse": {
+            "type": "structure",
+            "members": {},
+            "traits": {
+                "smithy.api#documentation": "Placeholder documentation for RebootInputDeviceResponse"
+            }
+        },
         "com.amazonaws.medialive#Rec601Settings": {
             "type": "structure",
             "members": {},
@@ -18243,6 +18338,72 @@
                 "smithy.api#documentation": "Placeholder documentation for StartChannelResponse"
             }
         },
+        "com.amazonaws.medialive#StartInputDeviceMaintenanceWindow": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.medialive#StartInputDeviceMaintenanceWindowRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.medialive#StartInputDeviceMaintenanceWindowResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.medialive#BadGatewayException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#BadRequestException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#ForbiddenException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#GatewayTimeoutException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#InternalServerErrorException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#NotFoundException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#TooManyRequestsException"
+                },
+                {
+                    "target": "com.amazonaws.medialive#UnprocessableEntityException"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "Start a maintenance window for the specified input device. Starting a maintenance window will give the device up to two hours to install software. If the device was streaming prior to the maintenance, it will resume streaming when the software is fully installed. Devices automatically install updates while they are powered on and their MediaLive channels are stopped. A maintenance window allows you to update a device without having to stop MediaLive channels that use the device. The device must remain powered on and connected to the internet for the duration of the maintenance.",
+                "smithy.api#http": {
+                    "method": "POST",
+                    "uri": "/prod/inputDevices/{InputDeviceId}/startInputDeviceMaintenanceWindow",
+                    "code": 200
+                }
+            }
+        },
+        "com.amazonaws.medialive#StartInputDeviceMaintenanceWindowRequest": {
+            "type": "structure",
+            "members": {
+                "InputDeviceId": {
+                    "target": "com.amazonaws.medialive#__string",
+                    "traits": {
+                        "smithy.api#documentation": "The unique ID of the input device to start a maintenance window for. For example, hd-123456789abcdef.",
+                        "smithy.api#httpLabel": {},
+                        "smithy.api#required": {}
+                    }
+                }
+            },
+            "traits": {
+                "smithy.api#documentation": "Placeholder documentation for StartInputDeviceMaintenanceWindowRequest"
+            }
+        },
+        "com.amazonaws.medialive#StartInputDeviceMaintenanceWindowResponse": {
+            "type": "structure",
+            "members": {},
+            "traits": {
+                "smithy.api#documentation": "Placeholder documentation for StartInputDeviceMaintenanceWindowResponse"
+            }
+        },
         "com.amazonaws.medialive#StartMultiplex": {
             "type": "operation",
             "input": {
diff --git a/codegen/sdk-codegen/aws-models/rds.json b/codegen/sdk-codegen/aws-models/rds.json
index f1d84c8b539..137ca274ccb 100644
--- a/codegen/sdk-codegen/aws-models/rds.json
+++ b/codegen/sdk-codegen/aws-models/rds.json
@@ -99,6 +99,29 @@
                 "target": "com.amazonaws.rds#String"
             }
         },
+        "com.amazonaws.rds#ActivityStreamPolicyStatus": {
+            "type": "string",
+            "traits": {
+                "smithy.api#enum": [
+                    {
+                        "value": "locked",
+                        "name": "locked"
+                    },
+                    {
+                        "value": "unlocked",
+                        "name": "unlocked"
+                    },
+                    {
+                        "value": "locking-policy",
+                        "name": "locking_policy"
+                    },
+                    {
+                        "value": "unlocking-policy",
+                        "name": "unlocking_policy"
+                    }
+                ]
+            }
+        },
         "com.amazonaws.rds#ActivityStreamStatus": {
             "type": "string",
             "traits": {
@@ -612,6 +635,9 @@
                 {
                     "target": "com.amazonaws.rds#ListTagsForResource"
                 },
+                {
+                    "target": "com.amazonaws.rds#ModifyActivityStream"
+                },
                 {
                     "target": "com.amazonaws.rds#ModifyCertificates"
                 },
@@ -839,6 +865,21 @@
                 }
             }
         },
+        "com.amazonaws.rds#AuditPolicyState": {
+            "type": "string",
+            "traits": {
+                "smithy.api#enum": [
+                    {
+                        "value": "locked",
+                        "name": "LOCKED_POLICY"
+                    },
+                    {
+                        "value": "unlocked",
+                        "name": "UNLOCKED_POLICY"
+                    }
+                ]
+            }
+        },
         "com.amazonaws.rds#AuthScheme": {
             "type": "string",
             "traits": {
@@ -3311,7 +3352,7 @@
                 "EngineFamily": {
                     "target": "com.amazonaws.rds#EngineFamily",
                     "traits": {
-                        "smithy.api#documentation": "<p>The kinds of databases that the proxy can connect to. \n          This value determines which database network protocol the proxy recognizes when it interprets\n        network traffic to and from the database. For Aurora MySQL, RDS for MariaDB, and RDS for MySQL databases, specify <code>MYSQL</code>. \n        For Aurora PostgreSQL and RDS for PostgreSQL databases, specify <code>POSTGRESQL</code>.</p>",
+                        "smithy.api#documentation": "<p>The kinds of databases that the proxy can connect to. \n          This value determines which database network protocol the proxy recognizes when it interprets\n        network traffic to and from the database. For Aurora MySQL and RDS for MySQL databases, specify <code>MYSQL</code>. \n        For Aurora PostgreSQL and RDS for PostgreSQL databases, specify <code>POSTGRESQL</code>.</p>",
                         "smithy.api#required": {}
                     }
                 },
@@ -5852,6 +5893,12 @@
                     "traits": {
                         "smithy.api#documentation": "<p>The network type of the DB instance.</p>\n        <p>Valid values:</p>\n        <ul>\n            <li>\n                <p>\n                  <code>IPV4</code>\n               </p>\n            </li>\n            <li>\n                <p>\n                  <code>DUAL</code>\n               </p>\n            </li>\n         </ul>\n        <p>The network type is determined by the <code>DBSubnetGroup</code> specified for the DB instance. \n            A <code>DBSubnetGroup</code> can support only the IPv4 protocol or the IPv4 and the IPv6 \n            protocols (<code>DUAL</code>).</p>\n        <p>For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html\">\n            Working with a DB instance in a VPC</a> in the \n            <i>Amazon RDS User Guide</i> and \n            <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html\">\n                Working with a DB instance in a VPC</a> in the \n            <i>Amazon Aurora User Guide.</i>\n         </p>"
                     }
+                },
+                "ActivityStreamPolicyStatus": {
+                    "target": "com.amazonaws.rds#ActivityStreamPolicyStatus",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The status of the policy state of the activity stream.</p>"
+                    }
                 }
             },
             "traits": {
@@ -6520,7 +6567,7 @@
                 "EngineFamily": {
                     "target": "com.amazonaws.rds#String",
                     "traits": {
-                        "smithy.api#documentation": "<p>The kinds of databases that the proxy can connect to. This value determines which database network protocol \n        the proxy recognizes when it interprets network traffic to and from the database. <code>MYSQL</code> supports Aurora MySQL, \n        RDS for MariaDB, and RDS for MySQL databases. <code>POSTGRESQL</code> supports Aurora PostgreSQL and RDS for PostgreSQL databases.</p>"
+                        "smithy.api#documentation": "<p>The kinds of databases that the proxy can connect to. This value determines which database network protocol \n        the proxy recognizes when it interprets network traffic to and from the database. <code>MYSQL</code> supports Aurora MySQL \n        and RDS for MySQL databases. <code>POSTGRESQL</code> supports Aurora PostgreSQL and RDS for PostgreSQL databases.</p>"
                     }
                 },
                 "VpcId": {
@@ -13262,6 +13309,87 @@
                 }
             }
         },
+        "com.amazonaws.rds#ModifyActivityStream": {
+            "type": "operation",
+            "input": {
+                "target": "com.amazonaws.rds#ModifyActivityStreamRequest"
+            },
+            "output": {
+                "target": "com.amazonaws.rds#ModifyActivityStreamResponse"
+            },
+            "errors": [
+                {
+                    "target": "com.amazonaws.rds#DBInstanceNotFoundFault"
+                },
+                {
+                    "target": "com.amazonaws.rds#InvalidDBInstanceStateFault"
+                },
+                {
+                    "target": "com.amazonaws.rds#ResourceNotFoundFault"
+                }
+            ],
+            "traits": {
+                "smithy.api#documentation": "<p>Changes the audit policy state of a database activity stream to either locked (default) or unlocked. A locked policy is read-only,\n            whereas an unlocked policy is read/write. If your activity stream is started and locked, you can unlock it, customize your audit policy,\n            and then lock your activity stream. Restarting the activity stream isn't required. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/DBActivityStreams.Modifying.html\"> Modifying a database activity stream</a> in the\n                <i>Amazon RDS User Guide</i>. </p>\n        <p>This operation is supported for RDS for Oracle only.</p>"
+            }
+        },
+        "com.amazonaws.rds#ModifyActivityStreamRequest": {
+            "type": "structure",
+            "members": {
+                "ResourceArn": {
+                    "target": "com.amazonaws.rds#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The Amazon Resource Name (ARN) of the RDS for Oracle DB instance,\n            for example, <code>arn:aws:rds:us-east-1:12345667890:instance:my-orcl-db</code>.</p>"
+                    }
+                },
+                "AuditPolicyState": {
+                    "target": "com.amazonaws.rds#AuditPolicyState",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The audit policy state. When a policy is unlocked, it is read/write. When it is locked, it is\n            read-only. You can edit your audit policy only when the activity stream is unlocked or stopped.</p>"
+                    }
+                }
+            }
+        },
+        "com.amazonaws.rds#ModifyActivityStreamResponse": {
+            "type": "structure",
+            "members": {
+                "KmsKeyId": {
+                    "target": "com.amazonaws.rds#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The Amazon Web Services KMS key identifier for encryption of messages in the database activity stream.</p>"
+                    }
+                },
+                "KinesisStreamName": {
+                    "target": "com.amazonaws.rds#String",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The name of the Amazon Kinesis data stream to be used for the database activity stream.</p>"
+                    }
+                },
+                "Status": {
+                    "target": "com.amazonaws.rds#ActivityStreamStatus",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The status of the modification to the database activity stream.</p>"
+                    }
+                },
+                "Mode": {
+                    "target": "com.amazonaws.rds#ActivityStreamMode",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The mode of the database activity stream.</p>"
+                    }
+                },
+                "EngineNativeAuditFieldsIncluded": {
+                    "target": "com.amazonaws.rds#BooleanOptional",
+                    "traits": {
+                        "smithy.api#documentation": "<p>Indicates whether engine-native audit fields are included in the database activity stream.</p>"
+                    }
+                },
+                "PolicyStatus": {
+                    "target": "com.amazonaws.rds#ActivityStreamPolicyStatus",
+                    "traits": {
+                        "smithy.api#documentation": "<p>The status of the modification to the policy state of the database activity stream.</p>"
+                    }
+                }
+            }
+        },
         "com.amazonaws.rds#ModifyCertificates": {
             "type": "operation",
             "input": {
diff --git a/codegen/sdk-codegen/aws-models/transcribe.json b/codegen/sdk-codegen/aws-models/transcribe.json
index f06a4db765b..21b1b34933c 100644
--- a/codegen/sdk-codegen/aws-models/transcribe.json
+++ b/codegen/sdk-codegen/aws-models/transcribe.json
@@ -1977,10 +1977,6 @@
                         "value": "ar-SA",
                         "name": "AR_SA"
                     },
-                    {
-                        "value": "cy-GB",
-                        "name": "CY_GB"
-                    },
                     {
                         "value": "da-DK",
                         "name": "DA_DK"
@@ -2041,14 +2037,6 @@
                         "value": "fr-FR",
                         "name": "FR_FR"
                     },
-                    {
-                        "value": "ga-IE",
-                        "name": "GA_IE"
-                    },
-                    {
-                        "value": "gd-GB",
-                        "name": "GD_GB"
-                    },
                     {
                         "value": "he-IL",
                         "name": "HE_IL"
@@ -5182,7 +5170,8 @@
                 "VocabularyFileUri": {
                     "target": "com.amazonaws.transcribe#Uri",
                     "traits": {
-                        "smithy.api#documentation": "<p>The Amazon S3 location of the text file that contains your custom medical \n            vocabulary. The URI must be located in the same Amazon Web Services Region as the resource \n            you're calling.</p>\n        <p>Here's an example URI path:\n            <code>s3://DOC-EXAMPLE-BUCKET/my-vocab-file.txt</code>\n         </p>"
+                        "smithy.api#documentation": "<p>The Amazon S3 location of the text file that contains your custom medical \n            vocabulary. The URI must be located in the same Amazon Web Services Region as the resource \n            you're calling.</p>\n        <p>Here's an example URI path:\n            <code>s3://DOC-EXAMPLE-BUCKET/my-vocab-file.txt</code>\n         </p>",
+                        "smithy.api#required": {}
                     }
                 }
             }