diff --git a/VERSION b/VERSION
index 3da91b0c5e5..6dcedb67808 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.11.181
\ No newline at end of file
+1.11.182
\ No newline at end of file
diff --git a/generated/src/aws-cpp-sdk-apigatewayv2/include/aws/apigatewayv2/ApiGatewayV2Client.h b/generated/src/aws-cpp-sdk-apigatewayv2/include/aws/apigatewayv2/ApiGatewayV2Client.h
index dba11aca348..b08af836759 100644
--- a/generated/src/aws-cpp-sdk-apigatewayv2/include/aws/apigatewayv2/ApiGatewayV2Client.h
+++ b/generated/src/aws-cpp-sdk-apigatewayv2/include/aws/apigatewayv2/ApiGatewayV2Client.h
@@ -801,32 +801,6 @@ namespace ApiGatewayV2
             return SubmitAsync(&ApiGatewayV2Client::ExportApi, request, handler, context);
         }
 
-        /**
-         * <p>Resets all authorizer cache entries on a stage. Supported only for HTTP
-         * APIs.</p><p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/apigatewayv2-2018-11-29/ResetAuthorizersCache">AWS
-         * API Reference</a></p>
-         */
-        virtual Model::ResetAuthorizersCacheOutcome ResetAuthorizersCache(const Model::ResetAuthorizersCacheRequest& request) const;
-
-        /**
-         * A Callable wrapper for ResetAuthorizersCache that returns a future to the operation so that it can be executed in parallel to other requests.
-         */
-        template<typename ResetAuthorizersCacheRequestT = Model::ResetAuthorizersCacheRequest>
-        Model::ResetAuthorizersCacheOutcomeCallable ResetAuthorizersCacheCallable(const ResetAuthorizersCacheRequestT& request) const
-        {
-            return SubmitCallable(&ApiGatewayV2Client::ResetAuthorizersCache, request);
-        }
-
-        /**
-         * An Async wrapper for ResetAuthorizersCache that queues the request into a thread executor and triggers associated callback when operation has finished.
-         */
-        template<typename ResetAuthorizersCacheRequestT = Model::ResetAuthorizersCacheRequest>
-        void ResetAuthorizersCacheAsync(const ResetAuthorizersCacheRequestT& request, const ResetAuthorizersCacheResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
-        {
-            return SubmitAsync(&ApiGatewayV2Client::ResetAuthorizersCache, request, handler, context);
-        }
-
         /**
          * <p>Gets an Api resource.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/apigatewayv2-2018-11-29/GetApi">AWS
@@ -1528,6 +1502,32 @@ namespace ApiGatewayV2
             return SubmitAsync(&ApiGatewayV2Client::ReimportApi, request, handler, context);
         }
 
+        /**
+         * <p>Resets all authorizer cache entries on a stage. Supported only for HTTP
+         * APIs.</p><p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/apigatewayv2-2018-11-29/ResetAuthorizersCache">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::ResetAuthorizersCacheOutcome ResetAuthorizersCache(const Model::ResetAuthorizersCacheRequest& request) const;
+
+        /**
+         * A Callable wrapper for ResetAuthorizersCache that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename ResetAuthorizersCacheRequestT = Model::ResetAuthorizersCacheRequest>
+        Model::ResetAuthorizersCacheOutcomeCallable ResetAuthorizersCacheCallable(const ResetAuthorizersCacheRequestT& request) const
+        {
+            return SubmitCallable(&ApiGatewayV2Client::ResetAuthorizersCache, request);
+        }
+
+        /**
+         * An Async wrapper for ResetAuthorizersCache that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename ResetAuthorizersCacheRequestT = Model::ResetAuthorizersCacheRequest>
+        void ResetAuthorizersCacheAsync(const ResetAuthorizersCacheRequestT& request, const ResetAuthorizersCacheResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&ApiGatewayV2Client::ResetAuthorizersCache, request, handler, context);
+        }
+
         /**
          * <p>Creates a new Tag resource to represent a tag.</p><p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/apigatewayv2-2018-11-29/TagResource">AWS
diff --git a/generated/src/aws-cpp-sdk-apigatewayv2/include/aws/apigatewayv2/ApiGatewayV2ServiceClientModel.h b/generated/src/aws-cpp-sdk-apigatewayv2/include/aws/apigatewayv2/ApiGatewayV2ServiceClientModel.h
index 749b3676f75..80261eb74ad 100644
--- a/generated/src/aws-cpp-sdk-apigatewayv2/include/aws/apigatewayv2/ApiGatewayV2ServiceClientModel.h
+++ b/generated/src/aws-cpp-sdk-apigatewayv2/include/aws/apigatewayv2/ApiGatewayV2ServiceClientModel.h
@@ -143,7 +143,6 @@ namespace Aws
       class DeleteStageRequest;
       class DeleteVpcLinkRequest;
       class ExportApiRequest;
-      class ResetAuthorizersCacheRequest;
       class GetApiRequest;
       class GetApiMappingRequest;
       class GetApiMappingsRequest;
@@ -172,6 +171,7 @@ namespace Aws
       class GetVpcLinksRequest;
       class ImportApiRequest;
       class ReimportApiRequest;
+      class ResetAuthorizersCacheRequest;
       class TagResourceRequest;
       class UntagResourceRequest;
       class UpdateApiRequest;
@@ -218,7 +218,6 @@ namespace Aws
       typedef Aws::Utils::Outcome<Aws::NoResult, ApiGatewayV2Error> DeleteStageOutcome;
       typedef Aws::Utils::Outcome<DeleteVpcLinkResult, ApiGatewayV2Error> DeleteVpcLinkOutcome;
       typedef Aws::Utils::Outcome<ExportApiResult, ApiGatewayV2Error> ExportApiOutcome;
-      typedef Aws::Utils::Outcome<Aws::NoResult, ApiGatewayV2Error> ResetAuthorizersCacheOutcome;
       typedef Aws::Utils::Outcome<GetApiResult, ApiGatewayV2Error> GetApiOutcome;
       typedef Aws::Utils::Outcome<GetApiMappingResult, ApiGatewayV2Error> GetApiMappingOutcome;
       typedef Aws::Utils::Outcome<GetApiMappingsResult, ApiGatewayV2Error> GetApiMappingsOutcome;
@@ -247,6 +246,7 @@ namespace Aws
       typedef Aws::Utils::Outcome<GetVpcLinksResult, ApiGatewayV2Error> GetVpcLinksOutcome;
       typedef Aws::Utils::Outcome<ImportApiResult, ApiGatewayV2Error> ImportApiOutcome;
       typedef Aws::Utils::Outcome<ReimportApiResult, ApiGatewayV2Error> ReimportApiOutcome;
+      typedef Aws::Utils::Outcome<Aws::NoResult, ApiGatewayV2Error> ResetAuthorizersCacheOutcome;
       typedef Aws::Utils::Outcome<TagResourceResult, ApiGatewayV2Error> TagResourceOutcome;
       typedef Aws::Utils::Outcome<Aws::NoResult, ApiGatewayV2Error> UntagResourceOutcome;
       typedef Aws::Utils::Outcome<UpdateApiResult, ApiGatewayV2Error> UpdateApiOutcome;
@@ -293,7 +293,6 @@ namespace Aws
       typedef std::future<DeleteStageOutcome> DeleteStageOutcomeCallable;
       typedef std::future<DeleteVpcLinkOutcome> DeleteVpcLinkOutcomeCallable;
       typedef std::future<ExportApiOutcome> ExportApiOutcomeCallable;
-      typedef std::future<ResetAuthorizersCacheOutcome> ResetAuthorizersCacheOutcomeCallable;
       typedef std::future<GetApiOutcome> GetApiOutcomeCallable;
       typedef std::future<GetApiMappingOutcome> GetApiMappingOutcomeCallable;
       typedef std::future<GetApiMappingsOutcome> GetApiMappingsOutcomeCallable;
@@ -322,6 +321,7 @@ namespace Aws
       typedef std::future<GetVpcLinksOutcome> GetVpcLinksOutcomeCallable;
       typedef std::future<ImportApiOutcome> ImportApiOutcomeCallable;
       typedef std::future<ReimportApiOutcome> ReimportApiOutcomeCallable;
+      typedef std::future<ResetAuthorizersCacheOutcome> ResetAuthorizersCacheOutcomeCallable;
       typedef std::future<TagResourceOutcome> TagResourceOutcomeCallable;
       typedef std::future<UntagResourceOutcome> UntagResourceOutcomeCallable;
       typedef std::future<UpdateApiOutcome> UpdateApiOutcomeCallable;
@@ -371,7 +371,6 @@ namespace Aws
     typedef std::function<void(const ApiGatewayV2Client*, const Model::DeleteStageRequest&, const Model::DeleteStageOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteStageResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::DeleteVpcLinkRequest&, const Model::DeleteVpcLinkOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteVpcLinkResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::ExportApiRequest&, Model::ExportApiOutcome, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ExportApiResponseReceivedHandler;
-    typedef std::function<void(const ApiGatewayV2Client*, const Model::ResetAuthorizersCacheRequest&, const Model::ResetAuthorizersCacheOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ResetAuthorizersCacheResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::GetApiRequest&, const Model::GetApiOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetApiResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::GetApiMappingRequest&, const Model::GetApiMappingOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetApiMappingResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::GetApiMappingsRequest&, const Model::GetApiMappingsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetApiMappingsResponseReceivedHandler;
@@ -400,6 +399,7 @@ namespace Aws
     typedef std::function<void(const ApiGatewayV2Client*, const Model::GetVpcLinksRequest&, const Model::GetVpcLinksOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetVpcLinksResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::ImportApiRequest&, const Model::ImportApiOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ImportApiResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::ReimportApiRequest&, const Model::ReimportApiOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ReimportApiResponseReceivedHandler;
+    typedef std::function<void(const ApiGatewayV2Client*, const Model::ResetAuthorizersCacheRequest&, const Model::ResetAuthorizersCacheOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ResetAuthorizersCacheResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::TagResourceRequest&, const Model::TagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > TagResourceResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::UntagResourceRequest&, const Model::UntagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UntagResourceResponseReceivedHandler;
     typedef std::function<void(const ApiGatewayV2Client*, const Model::UpdateApiRequest&, const Model::UpdateApiOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateApiResponseReceivedHandler;
diff --git a/generated/src/aws-cpp-sdk-apigatewayv2/source/ApiGatewayV2Client.cpp b/generated/src/aws-cpp-sdk-apigatewayv2/source/ApiGatewayV2Client.cpp
index bf07c1cbaf2..9ff3ce0cc97 100644
--- a/generated/src/aws-cpp-sdk-apigatewayv2/source/ApiGatewayV2Client.cpp
+++ b/generated/src/aws-cpp-sdk-apigatewayv2/source/ApiGatewayV2Client.cpp
@@ -50,7 +50,6 @@
 #include <aws/apigatewayv2/model/DeleteStageRequest.h>
 #include <aws/apigatewayv2/model/DeleteVpcLinkRequest.h>
 #include <aws/apigatewayv2/model/ExportApiRequest.h>
-#include <aws/apigatewayv2/model/ResetAuthorizersCacheRequest.h>
 #include <aws/apigatewayv2/model/GetApiRequest.h>
 #include <aws/apigatewayv2/model/GetApiMappingRequest.h>
 #include <aws/apigatewayv2/model/GetApiMappingsRequest.h>
@@ -79,6 +78,7 @@
 #include <aws/apigatewayv2/model/GetVpcLinksRequest.h>
 #include <aws/apigatewayv2/model/ImportApiRequest.h>
 #include <aws/apigatewayv2/model/ReimportApiRequest.h>
+#include <aws/apigatewayv2/model/ResetAuthorizersCacheRequest.h>
 #include <aws/apigatewayv2/model/TagResourceRequest.h>
 #include <aws/apigatewayv2/model/UntagResourceRequest.h>
 #include <aws/apigatewayv2/model/UpdateApiRequest.h>
@@ -1314,47 +1314,6 @@ ExportApiOutcome ApiGatewayV2Client::ExportApi(const ExportApiRequest& request)
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-ResetAuthorizersCacheOutcome ApiGatewayV2Client::ResetAuthorizersCache(const ResetAuthorizersCacheRequest& request) const
-{
-  AWS_OPERATION_GUARD(ResetAuthorizersCache);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, ResetAuthorizersCache, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  if (!request.ApiIdHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("ResetAuthorizersCache", "Required field: ApiId, is not set");
-    return ResetAuthorizersCacheOutcome(Aws::Client::AWSError<ApiGatewayV2Errors>(ApiGatewayV2Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ApiId]", false));
-  }
-  if (!request.StageNameHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("ResetAuthorizersCache", "Required field: StageName, is not set");
-    return ResetAuthorizersCacheOutcome(Aws::Client::AWSError<ApiGatewayV2Errors>(ApiGatewayV2Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [StageName]", false));
-  }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, ResetAuthorizersCache, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, ResetAuthorizersCache, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".ResetAuthorizersCache",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<ResetAuthorizersCacheOutcome>(
-    [&]()-> ResetAuthorizersCacheOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ResetAuthorizersCache, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/v2/apis/");
-      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetApiId());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/stages/");
-      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetStageName());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/cache/authorizers");
-      return ResetAuthorizersCacheOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_DELETE, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 GetApiOutcome ApiGatewayV2Client::GetApi(const GetApiRequest& request) const
 {
   AWS_OPERATION_GUARD(GetApi);
@@ -2363,6 +2322,47 @@ ReimportApiOutcome ApiGatewayV2Client::ReimportApi(const ReimportApiRequest& req
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+ResetAuthorizersCacheOutcome ApiGatewayV2Client::ResetAuthorizersCache(const ResetAuthorizersCacheRequest& request) const
+{
+  AWS_OPERATION_GUARD(ResetAuthorizersCache);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, ResetAuthorizersCache, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ApiIdHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("ResetAuthorizersCache", "Required field: ApiId, is not set");
+    return ResetAuthorizersCacheOutcome(Aws::Client::AWSError<ApiGatewayV2Errors>(ApiGatewayV2Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ApiId]", false));
+  }
+  if (!request.StageNameHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("ResetAuthorizersCache", "Required field: StageName, is not set");
+    return ResetAuthorizersCacheOutcome(Aws::Client::AWSError<ApiGatewayV2Errors>(ApiGatewayV2Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [StageName]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, ResetAuthorizersCache, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, ResetAuthorizersCache, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".ResetAuthorizersCache",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<ResetAuthorizersCacheOutcome>(
+    [&]()-> ResetAuthorizersCacheOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ResetAuthorizersCache, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/v2/apis/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetApiId());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/stages/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetStageName());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/cache/authorizers");
+      return ResetAuthorizersCacheOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_DELETE, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 TagResourceOutcome ApiGatewayV2Client::TagResource(const TagResourceRequest& request) const
 {
   AWS_OPERATION_GUARD(TagResource);
diff --git a/generated/src/aws-cpp-sdk-cloud9/include/aws/cloud9/model/CreateEnvironmentEC2Request.h b/generated/src/aws-cpp-sdk-cloud9/include/aws/cloud9/model/CreateEnvironmentEC2Request.h
index b9d4857fdfb..956bb1cb7ff 100644
--- a/generated/src/aws-cpp-sdk-cloud9/include/aws/cloud9/model/CreateEnvironmentEC2Request.h
+++ b/generated/src/aws-cpp-sdk-cloud9/include/aws/cloud9/model/CreateEnvironmentEC2Request.h
@@ -293,18 +293,22 @@ namespace Model
     /**
      * <p>The identifier for the Amazon Machine Image (AMI) that's used to create the
      * EC2 instance. To choose an AMI for the instance, you must specify a valid AMI
-     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default
-     * Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a
-     * value in the request. Because Amazon Linux AMI has ended standard support as of
-     * December 31, 2020, we recommend you choose Amazon Linux 2, which includes long
-     * term support through 2023.</p> <p>From December 31, 2023, the parameter for
-     * Amazon Linux will no longer be available when you specify an AMI for your
-     * instance. Amazon Linux 2 will then become the default AMI, which is used to
-     * launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu
-     * 18.04 has ended standard support as of May 31, 2023, we recommend you choose
-     * Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux
-     * (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon
-     * Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
+     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20,
+     * 2023, you will be required to include the <code>imageId</code> parameter for the
+     * <code>CreateEnvironmentEC2</code> action. This change will be reflected across
+     * all direct methods of communicating with the API, such as Amazon Web Services
+     * SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change
+     * will only affect direct API consumers, and not Cloud9 console users.</p> <p>From
+     * January 22, 2024, Amazon Linux (AL1) will be removed from the list of available
+     * image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance
+     * support in December 2023, and as a result will no longer receive security
+     * updates. We recommend using Amazon Linux 2 as the AMI to create your environment
+     * as it is fully supported. This change will only affect direct API consumers, and
+     * not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support
+     * as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases
+     * </b> </p> <ul> <li> <p> <b>Amazon Linux (default):
+     * <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2:
+     * <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
      * <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04:
      * <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul>
      * <li> <p> <b>Amazon Linux (default):
@@ -322,18 +326,22 @@ namespace Model
     /**
      * <p>The identifier for the Amazon Machine Image (AMI) that's used to create the
      * EC2 instance. To choose an AMI for the instance, you must specify a valid AMI
-     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default
-     * Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a
-     * value in the request. Because Amazon Linux AMI has ended standard support as of
-     * December 31, 2020, we recommend you choose Amazon Linux 2, which includes long
-     * term support through 2023.</p> <p>From December 31, 2023, the parameter for
-     * Amazon Linux will no longer be available when you specify an AMI for your
-     * instance. Amazon Linux 2 will then become the default AMI, which is used to
-     * launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu
-     * 18.04 has ended standard support as of May 31, 2023, we recommend you choose
-     * Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux
-     * (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon
-     * Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
+     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20,
+     * 2023, you will be required to include the <code>imageId</code> parameter for the
+     * <code>CreateEnvironmentEC2</code> action. This change will be reflected across
+     * all direct methods of communicating with the API, such as Amazon Web Services
+     * SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change
+     * will only affect direct API consumers, and not Cloud9 console users.</p> <p>From
+     * January 22, 2024, Amazon Linux (AL1) will be removed from the list of available
+     * image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance
+     * support in December 2023, and as a result will no longer receive security
+     * updates. We recommend using Amazon Linux 2 as the AMI to create your environment
+     * as it is fully supported. This change will only affect direct API consumers, and
+     * not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support
+     * as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases
+     * </b> </p> <ul> <li> <p> <b>Amazon Linux (default):
+     * <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2:
+     * <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
      * <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04:
      * <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul>
      * <li> <p> <b>Amazon Linux (default):
@@ -351,18 +359,22 @@ namespace Model
     /**
      * <p>The identifier for the Amazon Machine Image (AMI) that's used to create the
      * EC2 instance. To choose an AMI for the instance, you must specify a valid AMI
-     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default
-     * Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a
-     * value in the request. Because Amazon Linux AMI has ended standard support as of
-     * December 31, 2020, we recommend you choose Amazon Linux 2, which includes long
-     * term support through 2023.</p> <p>From December 31, 2023, the parameter for
-     * Amazon Linux will no longer be available when you specify an AMI for your
-     * instance. Amazon Linux 2 will then become the default AMI, which is used to
-     * launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu
-     * 18.04 has ended standard support as of May 31, 2023, we recommend you choose
-     * Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux
-     * (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon
-     * Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
+     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20,
+     * 2023, you will be required to include the <code>imageId</code> parameter for the
+     * <code>CreateEnvironmentEC2</code> action. This change will be reflected across
+     * all direct methods of communicating with the API, such as Amazon Web Services
+     * SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change
+     * will only affect direct API consumers, and not Cloud9 console users.</p> <p>From
+     * January 22, 2024, Amazon Linux (AL1) will be removed from the list of available
+     * image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance
+     * support in December 2023, and as a result will no longer receive security
+     * updates. We recommend using Amazon Linux 2 as the AMI to create your environment
+     * as it is fully supported. This change will only affect direct API consumers, and
+     * not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support
+     * as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases
+     * </b> </p> <ul> <li> <p> <b>Amazon Linux (default):
+     * <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2:
+     * <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
      * <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04:
      * <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul>
      * <li> <p> <b>Amazon Linux (default):
@@ -380,18 +392,22 @@ namespace Model
     /**
      * <p>The identifier for the Amazon Machine Image (AMI) that's used to create the
      * EC2 instance. To choose an AMI for the instance, you must specify a valid AMI
-     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default
-     * Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a
-     * value in the request. Because Amazon Linux AMI has ended standard support as of
-     * December 31, 2020, we recommend you choose Amazon Linux 2, which includes long
-     * term support through 2023.</p> <p>From December 31, 2023, the parameter for
-     * Amazon Linux will no longer be available when you specify an AMI for your
-     * instance. Amazon Linux 2 will then become the default AMI, which is used to
-     * launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu
-     * 18.04 has ended standard support as of May 31, 2023, we recommend you choose
-     * Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux
-     * (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon
-     * Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
+     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20,
+     * 2023, you will be required to include the <code>imageId</code> parameter for the
+     * <code>CreateEnvironmentEC2</code> action. This change will be reflected across
+     * all direct methods of communicating with the API, such as Amazon Web Services
+     * SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change
+     * will only affect direct API consumers, and not Cloud9 console users.</p> <p>From
+     * January 22, 2024, Amazon Linux (AL1) will be removed from the list of available
+     * image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance
+     * support in December 2023, and as a result will no longer receive security
+     * updates. We recommend using Amazon Linux 2 as the AMI to create your environment
+     * as it is fully supported. This change will only affect direct API consumers, and
+     * not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support
+     * as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases
+     * </b> </p> <ul> <li> <p> <b>Amazon Linux (default):
+     * <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2:
+     * <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
      * <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04:
      * <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul>
      * <li> <p> <b>Amazon Linux (default):
@@ -409,18 +425,22 @@ namespace Model
     /**
      * <p>The identifier for the Amazon Machine Image (AMI) that's used to create the
      * EC2 instance. To choose an AMI for the instance, you must specify a valid AMI
-     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default
-     * Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a
-     * value in the request. Because Amazon Linux AMI has ended standard support as of
-     * December 31, 2020, we recommend you choose Amazon Linux 2, which includes long
-     * term support through 2023.</p> <p>From December 31, 2023, the parameter for
-     * Amazon Linux will no longer be available when you specify an AMI for your
-     * instance. Amazon Linux 2 will then become the default AMI, which is used to
-     * launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu
-     * 18.04 has ended standard support as of May 31, 2023, we recommend you choose
-     * Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux
-     * (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon
-     * Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
+     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20,
+     * 2023, you will be required to include the <code>imageId</code> parameter for the
+     * <code>CreateEnvironmentEC2</code> action. This change will be reflected across
+     * all direct methods of communicating with the API, such as Amazon Web Services
+     * SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change
+     * will only affect direct API consumers, and not Cloud9 console users.</p> <p>From
+     * January 22, 2024, Amazon Linux (AL1) will be removed from the list of available
+     * image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance
+     * support in December 2023, and as a result will no longer receive security
+     * updates. We recommend using Amazon Linux 2 as the AMI to create your environment
+     * as it is fully supported. This change will only affect direct API consumers, and
+     * not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support
+     * as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases
+     * </b> </p> <ul> <li> <p> <b>Amazon Linux (default):
+     * <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2:
+     * <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
      * <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04:
      * <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul>
      * <li> <p> <b>Amazon Linux (default):
@@ -438,18 +458,22 @@ namespace Model
     /**
      * <p>The identifier for the Amazon Machine Image (AMI) that's used to create the
      * EC2 instance. To choose an AMI for the instance, you must specify a valid AMI
-     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default
-     * Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a
-     * value in the request. Because Amazon Linux AMI has ended standard support as of
-     * December 31, 2020, we recommend you choose Amazon Linux 2, which includes long
-     * term support through 2023.</p> <p>From December 31, 2023, the parameter for
-     * Amazon Linux will no longer be available when you specify an AMI for your
-     * instance. Amazon Linux 2 will then become the default AMI, which is used to
-     * launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu
-     * 18.04 has ended standard support as of May 31, 2023, we recommend you choose
-     * Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux
-     * (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon
-     * Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
+     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20,
+     * 2023, you will be required to include the <code>imageId</code> parameter for the
+     * <code>CreateEnvironmentEC2</code> action. This change will be reflected across
+     * all direct methods of communicating with the API, such as Amazon Web Services
+     * SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change
+     * will only affect direct API consumers, and not Cloud9 console users.</p> <p>From
+     * January 22, 2024, Amazon Linux (AL1) will be removed from the list of available
+     * image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance
+     * support in December 2023, and as a result will no longer receive security
+     * updates. We recommend using Amazon Linux 2 as the AMI to create your environment
+     * as it is fully supported. This change will only affect direct API consumers, and
+     * not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support
+     * as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases
+     * </b> </p> <ul> <li> <p> <b>Amazon Linux (default):
+     * <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2:
+     * <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
      * <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04:
      * <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul>
      * <li> <p> <b>Amazon Linux (default):
@@ -467,18 +491,22 @@ namespace Model
     /**
      * <p>The identifier for the Amazon Machine Image (AMI) that's used to create the
      * EC2 instance. To choose an AMI for the instance, you must specify a valid AMI
-     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default
-     * Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a
-     * value in the request. Because Amazon Linux AMI has ended standard support as of
-     * December 31, 2020, we recommend you choose Amazon Linux 2, which includes long
-     * term support through 2023.</p> <p>From December 31, 2023, the parameter for
-     * Amazon Linux will no longer be available when you specify an AMI for your
-     * instance. Amazon Linux 2 will then become the default AMI, which is used to
-     * launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu
-     * 18.04 has ended standard support as of May 31, 2023, we recommend you choose
-     * Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux
-     * (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon
-     * Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
+     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20,
+     * 2023, you will be required to include the <code>imageId</code> parameter for the
+     * <code>CreateEnvironmentEC2</code> action. This change will be reflected across
+     * all direct methods of communicating with the API, such as Amazon Web Services
+     * SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change
+     * will only affect direct API consumers, and not Cloud9 console users.</p> <p>From
+     * January 22, 2024, Amazon Linux (AL1) will be removed from the list of available
+     * image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance
+     * support in December 2023, and as a result will no longer receive security
+     * updates. We recommend using Amazon Linux 2 as the AMI to create your environment
+     * as it is fully supported. This change will only affect direct API consumers, and
+     * not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support
+     * as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases
+     * </b> </p> <ul> <li> <p> <b>Amazon Linux (default):
+     * <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2:
+     * <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
      * <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04:
      * <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul>
      * <li> <p> <b>Amazon Linux (default):
@@ -496,18 +524,22 @@ namespace Model
     /**
      * <p>The identifier for the Amazon Machine Image (AMI) that's used to create the
      * EC2 instance. To choose an AMI for the instance, you must specify a valid AMI
-     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default
-     * Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a
-     * value in the request. Because Amazon Linux AMI has ended standard support as of
-     * December 31, 2020, we recommend you choose Amazon Linux 2, which includes long
-     * term support through 2023.</p> <p>From December 31, 2023, the parameter for
-     * Amazon Linux will no longer be available when you specify an AMI for your
-     * instance. Amazon Linux 2 will then become the default AMI, which is used to
-     * launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu
-     * 18.04 has ended standard support as of May 31, 2023, we recommend you choose
-     * Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux
-     * (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon
-     * Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
+     * alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20,
+     * 2023, you will be required to include the <code>imageId</code> parameter for the
+     * <code>CreateEnvironmentEC2</code> action. This change will be reflected across
+     * all direct methods of communicating with the API, such as Amazon Web Services
+     * SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change
+     * will only affect direct API consumers, and not Cloud9 console users.</p> <p>From
+     * January 22, 2024, Amazon Linux (AL1) will be removed from the list of available
+     * image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance
+     * support in December 2023, and as a result will no longer receive security
+     * updates. We recommend using Amazon Linux 2 as the AMI to create your environment
+     * as it is fully supported. This change will only affect direct API consumers, and
+     * not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support
+     * as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases
+     * </b> </p> <ul> <li> <p> <b>Amazon Linux (default):
+     * <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2:
+     * <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04:
      * <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04:
      * <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul>
      * <li> <p> <b>Amazon Linux (default):
diff --git a/generated/src/aws-cpp-sdk-cloud9/source/Cloud9EndpointRules.cpp b/generated/src/aws-cpp-sdk-cloud9/source/Cloud9EndpointRules.cpp
index 26dde4d63e6..f5fa24a8be8 100644
--- a/generated/src/aws-cpp-sdk-cloud9/source/Cloud9EndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-cloud9/source/Cloud9EndpointRules.cpp
@@ -51,106 +51,106 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
+'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
 'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
 '"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
-'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','l','o','u',
-'d','9','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i',
-'o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f',
-'i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a',
-'d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n',
-'t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
-'r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',
-' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a',
-'r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ',
-'o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o',
-'r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',',','"','t','y','p','e',
-'"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
-'t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r',
-'l','"',':','"','h','t','t','p','s',':','/','/','c','l','o','u','d','9','-','f','i','p','s','.','{',
-'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
-'d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':',
-'{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"',
-'e','n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s',
-'"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a',
-'b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d',
-'o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y',
-'p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o',
-'n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s',
-'"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l',
-'S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t',
-'r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n',
-'s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',
-',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A',
-'t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t',
-'i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u',
-'a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e',
-'e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','l','o','u','d','9','-','f','i','p',
+'s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u',
+'l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"',
+'p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':',
+'{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"',
+'t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n',
+'s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D',
+'u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',
+' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ',
+'s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p',
+'e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e',
+'"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
+'b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"',
+'r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',
+':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t',
+'"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',',','t','r','u','e',']',
+'}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',
 ':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t',
-'t','p','s',':','/','/','c','l','o','u','d','9','.','{','R','e','g','i','o','n','}','.','{','P','a',
-'r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n',
-'s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',
-',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n',
-'d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
-'[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ',
-'e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o',
-'n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t',
-'a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',
-':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','l','o','u','d','9','.','{',
-'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
-'d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':',
-'{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"',
-'e','n','d','p','o','i','n','t','"','}',']','}',']','}',',','{','"','c','o','n','d','i','t','i','o',
+'t','p','s',':','/','/','c','l','o','u','d','9','-','f','i','p','s','.','{','R','e','g','i','o','n',
+'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f',
+'f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e',
+'a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i',
+'n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P',
+'S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r',
+'t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F',
+'I','P','S','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y',
+'p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
+':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a',
+'c','k','"','}',',','t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c',
+'o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a',
+'n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f',
+'n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
+'f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u',
+'p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','r','u',
+'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
+'n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/',
+'c','l','o','u','d','9','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o',
+'n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i',
+'x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d',
+'e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t',
+'"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d',
+'i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S',
+'t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ',
+'p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r',
+'t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o',
+'r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n',
+'d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"',
+'u','r','l','"',':','"','h','t','t','p','s',':','/','/','c','l','o','u','d','9','.','{','R','e','g',
+'i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s',
+'S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',',
+'"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d',
+'p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',']',',',
+'"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o',
 'n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C',
 'o','n','f','i','g','u','r','a','t','i','o','n',':',' ','M','i','s','s','i','n','g',' ','R','e','g',
 'i','o','n','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}','\0'
diff --git a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportDescription.h b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportDescription.h
index 4e647d97402..ccf5051c056 100644
--- a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportDescription.h
+++ b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportDescription.h
@@ -800,50 +800,38 @@ namespace Model
 
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline const ExportType& GetExportType() const{ return m_exportType; }
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline bool ExportTypeHasBeenSet() const { return m_exportTypeHasBeenSet; }
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline void SetExportType(const ExportType& value) { m_exportTypeHasBeenSet = true; m_exportType = value; }
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline void SetExportType(ExportType&& value) { m_exportTypeHasBeenSet = true; m_exportType = std::move(value); }
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline ExportDescription& WithExportType(const ExportType& value) { SetExportType(value); return *this;}
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline ExportDescription& WithExportType(ExportType&& value) { SetExportType(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportSummary.h b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportSummary.h
index 3069cf2fda2..663ebfb593b 100644
--- a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportSummary.h
+++ b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportSummary.h
@@ -118,50 +118,38 @@ namespace Model
 
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline const ExportType& GetExportType() const{ return m_exportType; }
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline bool ExportTypeHasBeenSet() const { return m_exportTypeHasBeenSet; }
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline void SetExportType(const ExportType& value) { m_exportTypeHasBeenSet = true; m_exportType = value; }
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline void SetExportType(ExportType&& value) { m_exportTypeHasBeenSet = true; m_exportType = std::move(value); }
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline ExportSummary& WithExportType(const ExportType& value) { SetExportType(value); return *this;}
 
     /**
-     * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * <p>The type of export that was performed. Valid values are
+     * <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>
      */
     inline ExportSummary& WithExportType(ExportType&& value) { SetExportType(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportTableToPointInTimeRequest.h b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportTableToPointInTimeRequest.h
index be50fc55845..da794880a09 100644
--- a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportTableToPointInTimeRequest.h
+++ b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ExportTableToPointInTimeRequest.h
@@ -511,49 +511,49 @@ namespace Model
 
     /**
      * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * values are FULL_EXPORT or INCREMENTAL_EXPORT. The default value is FULL_EXPORT.
+     * If INCREMENTAL_EXPORT is provided, the IncrementalExportSpecification must also
+     * be used.</p>
      */
     inline const ExportType& GetExportType() const{ return m_exportType; }
 
     /**
      * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * values are FULL_EXPORT or INCREMENTAL_EXPORT. The default value is FULL_EXPORT.
+     * If INCREMENTAL_EXPORT is provided, the IncrementalExportSpecification must also
+     * be used.</p>
      */
     inline bool ExportTypeHasBeenSet() const { return m_exportTypeHasBeenSet; }
 
     /**
      * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * values are FULL_EXPORT or INCREMENTAL_EXPORT. The default value is FULL_EXPORT.
+     * If INCREMENTAL_EXPORT is provided, the IncrementalExportSpecification must also
+     * be used.</p>
      */
     inline void SetExportType(const ExportType& value) { m_exportTypeHasBeenSet = true; m_exportType = value; }
 
     /**
      * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * values are FULL_EXPORT or INCREMENTAL_EXPORT. The default value is FULL_EXPORT.
+     * If INCREMENTAL_EXPORT is provided, the IncrementalExportSpecification must also
+     * be used.</p>
      */
     inline void SetExportType(ExportType&& value) { m_exportTypeHasBeenSet = true; m_exportType = std::move(value); }
 
     /**
      * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * values are FULL_EXPORT or INCREMENTAL_EXPORT. The default value is FULL_EXPORT.
+     * If INCREMENTAL_EXPORT is provided, the IncrementalExportSpecification must also
+     * be used.</p>
      */
     inline ExportTableToPointInTimeRequest& WithExportType(const ExportType& value) { SetExportType(value); return *this;}
 
     /**
      * <p>Choice of whether to execute as a full export or incremental export. Valid
-     * values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If
-     * <code>INCREMENTAL_EXPORT</code> is provided, the
-     * <code>IncrementalExportSpecification</code> must also be used.</p>
+     * values are FULL_EXPORT or INCREMENTAL_EXPORT. The default value is FULL_EXPORT.
+     * If INCREMENTAL_EXPORT is provided, the IncrementalExportSpecification must also
+     * be used.</p>
      */
     inline ExportTableToPointInTimeRequest& WithExportType(ExportType&& value) { SetExportType(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/IncrementalExportSpecification.h b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/IncrementalExportSpecification.h
index 1761fe90413..9d9423e7e16 100644
--- a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/IncrementalExportSpecification.h
+++ b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/IncrementalExportSpecification.h
@@ -144,44 +144,44 @@ namespace Model
 
 
     /**
-     * <p>Choice of whether to output the previous item image prior to the start time
-     * of the incremental export. Valid values are <code>NEW_AND_OLD_IMAGES</code> and
-     * <code>NEW_IMAGES</code>.</p>
+     * <p>The view type that was chosen for the export. Valid values are
+     * <code>NEW_AND_OLD_IMAGES</code> and <code>NEW_IMAGES</code>. The default value
+     * is <code>NEW_AND_OLD_IMAGES</code>.</p>
      */
     inline const ExportViewType& GetExportViewType() const{ return m_exportViewType; }
 
     /**
-     * <p>Choice of whether to output the previous item image prior to the start time
-     * of the incremental export. Valid values are <code>NEW_AND_OLD_IMAGES</code> and
-     * <code>NEW_IMAGES</code>.</p>
+     * <p>The view type that was chosen for the export. Valid values are
+     * <code>NEW_AND_OLD_IMAGES</code> and <code>NEW_IMAGES</code>. The default value
+     * is <code>NEW_AND_OLD_IMAGES</code>.</p>
      */
     inline bool ExportViewTypeHasBeenSet() const { return m_exportViewTypeHasBeenSet; }
 
     /**
-     * <p>Choice of whether to output the previous item image prior to the start time
-     * of the incremental export. Valid values are <code>NEW_AND_OLD_IMAGES</code> and
-     * <code>NEW_IMAGES</code>.</p>
+     * <p>The view type that was chosen for the export. Valid values are
+     * <code>NEW_AND_OLD_IMAGES</code> and <code>NEW_IMAGES</code>. The default value
+     * is <code>NEW_AND_OLD_IMAGES</code>.</p>
      */
     inline void SetExportViewType(const ExportViewType& value) { m_exportViewTypeHasBeenSet = true; m_exportViewType = value; }
 
     /**
-     * <p>Choice of whether to output the previous item image prior to the start time
-     * of the incremental export. Valid values are <code>NEW_AND_OLD_IMAGES</code> and
-     * <code>NEW_IMAGES</code>.</p>
+     * <p>The view type that was chosen for the export. Valid values are
+     * <code>NEW_AND_OLD_IMAGES</code> and <code>NEW_IMAGES</code>. The default value
+     * is <code>NEW_AND_OLD_IMAGES</code>.</p>
      */
     inline void SetExportViewType(ExportViewType&& value) { m_exportViewTypeHasBeenSet = true; m_exportViewType = std::move(value); }
 
     /**
-     * <p>Choice of whether to output the previous item image prior to the start time
-     * of the incremental export. Valid values are <code>NEW_AND_OLD_IMAGES</code> and
-     * <code>NEW_IMAGES</code>.</p>
+     * <p>The view type that was chosen for the export. Valid values are
+     * <code>NEW_AND_OLD_IMAGES</code> and <code>NEW_IMAGES</code>. The default value
+     * is <code>NEW_AND_OLD_IMAGES</code>.</p>
      */
     inline IncrementalExportSpecification& WithExportViewType(const ExportViewType& value) { SetExportViewType(value); return *this;}
 
     /**
-     * <p>Choice of whether to output the previous item image prior to the start time
-     * of the incremental export. Valid values are <code>NEW_AND_OLD_IMAGES</code> and
-     * <code>NEW_IMAGES</code>.</p>
+     * <p>The view type that was chosen for the export. Valid values are
+     * <code>NEW_AND_OLD_IMAGES</code> and <code>NEW_IMAGES</code>. The default value
+     * is <code>NEW_AND_OLD_IMAGES</code>.</p>
      */
     inline IncrementalExportSpecification& WithExportViewType(ExportViewType&& value) { SetExportViewType(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ScanRequest.h b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ScanRequest.h
index 73561837b58..97ad14f1936 100644
--- a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ScanRequest.h
+++ b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/ScanRequest.h
@@ -1066,7 +1066,7 @@ namespace Model
      *  <p>A <code>FilterExpression</code> is applied after the items have
      * already been read; the process of filtering does not consume any additional read
      * capacity units.</p>  <p>For more information, see <a
-     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression">Filter
+     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression">Filter
      * Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>
      */
     inline const Aws::String& GetFilterExpression() const{ return m_filterExpression; }
@@ -1078,7 +1078,7 @@ namespace Model
      *  <p>A <code>FilterExpression</code> is applied after the items have
      * already been read; the process of filtering does not consume any additional read
      * capacity units.</p>  <p>For more information, see <a
-     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression">Filter
+     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression">Filter
      * Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>
      */
     inline bool FilterExpressionHasBeenSet() const { return m_filterExpressionHasBeenSet; }
@@ -1090,7 +1090,7 @@ namespace Model
      *  <p>A <code>FilterExpression</code> is applied after the items have
      * already been read; the process of filtering does not consume any additional read
      * capacity units.</p>  <p>For more information, see <a
-     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression">Filter
+     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression">Filter
      * Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>
      */
     inline void SetFilterExpression(const Aws::String& value) { m_filterExpressionHasBeenSet = true; m_filterExpression = value; }
@@ -1102,7 +1102,7 @@ namespace Model
      *  <p>A <code>FilterExpression</code> is applied after the items have
      * already been read; the process of filtering does not consume any additional read
      * capacity units.</p>  <p>For more information, see <a
-     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression">Filter
+     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression">Filter
      * Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>
      */
     inline void SetFilterExpression(Aws::String&& value) { m_filterExpressionHasBeenSet = true; m_filterExpression = std::move(value); }
@@ -1114,7 +1114,7 @@ namespace Model
      *  <p>A <code>FilterExpression</code> is applied after the items have
      * already been read; the process of filtering does not consume any additional read
      * capacity units.</p>  <p>For more information, see <a
-     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression">Filter
+     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression">Filter
      * Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>
      */
     inline void SetFilterExpression(const char* value) { m_filterExpressionHasBeenSet = true; m_filterExpression.assign(value); }
@@ -1126,7 +1126,7 @@ namespace Model
      *  <p>A <code>FilterExpression</code> is applied after the items have
      * already been read; the process of filtering does not consume any additional read
      * capacity units.</p>  <p>For more information, see <a
-     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression">Filter
+     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression">Filter
      * Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>
      */
     inline ScanRequest& WithFilterExpression(const Aws::String& value) { SetFilterExpression(value); return *this;}
@@ -1138,7 +1138,7 @@ namespace Model
      *  <p>A <code>FilterExpression</code> is applied after the items have
      * already been read; the process of filtering does not consume any additional read
      * capacity units.</p>  <p>For more information, see <a
-     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression">Filter
+     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression">Filter
      * Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>
      */
     inline ScanRequest& WithFilterExpression(Aws::String&& value) { SetFilterExpression(std::move(value)); return *this;}
@@ -1150,7 +1150,7 @@ namespace Model
      *  <p>A <code>FilterExpression</code> is applied after the items have
      * already been read; the process of filtering does not consume any additional read
      * capacity units.</p>  <p>For more information, see <a
-     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression">Filter
+     * href="https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression">Filter
      * Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>
      */
     inline ScanRequest& WithFilterExpression(const char* value) { SetFilterExpression(value); return *this;}
diff --git a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/TransactionCanceledException.h b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/TransactionCanceledException.h
index f0fd3da0ce2..c77b8372e66 100644
--- a/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/TransactionCanceledException.h
+++ b/generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/TransactionCanceledException.h
@@ -36,13 +36,16 @@ namespace Model
    * completed.</p> </li> <li> <p>An item size becomes too large (larger than 400
    * KB), or a local secondary index (LSI) becomes too large, or a similar validation
    * error occurs because of changes made by the transaction.</p> </li> <li> <p>There
-   * is a user error, such as an invalid data format.</p> </li> </ul> <p>DynamoDB
-   * cancels a <code>TransactGetItems</code> request under the following
-   * circumstances:</p> <ul> <li> <p>There is an ongoing
-   * <code>TransactGetItems</code> operation that conflicts with a concurrent
-   * <code>PutItem</code>, <code>UpdateItem</code>, <code>DeleteItem</code> or
-   * <code>TransactWriteItems</code> request. In this case the
-   * <code>TransactGetItems</code> operation fails with a
+   * is a user error, such as an invalid data format.</p> </li> <li> <p> There is an
+   * ongoing <code>TransactWriteItems</code> operation that conflicts with a
+   * concurrent <code>TransactWriteItems</code> request. In this case the
+   * <code>TransactWriteItems</code> operation fails with a
+   * <code>TransactionCanceledException</code>. </p> </li> </ul> <p>DynamoDB cancels
+   * a <code>TransactGetItems</code> request under the following circumstances:</p>
+   * <ul> <li> <p>There is an ongoing <code>TransactGetItems</code> operation that
+   * conflicts with a concurrent <code>PutItem</code>, <code>UpdateItem</code>,
+   * <code>DeleteItem</code> or <code>TransactWriteItems</code> request. In this case
+   * the <code>TransactGetItems</code> operation fails with a
    * <code>TransactionCanceledException</code>.</p> </li> <li> <p>A table in the
    * <code>TransactGetItems</code> request is in a different account or region.</p>
    * </li> <li> <p>There is insufficient provisioned capacity for the transaction to
diff --git a/generated/src/aws-cpp-sdk-dynamodb/source/DynamoDBEndpointRules.cpp b/generated/src/aws-cpp-sdk-dynamodb/source/DynamoDBEndpointRules.cpp
index 80969e41991..d85f2290081 100644
--- a/generated/src/aws-cpp-sdk-dynamodb/source/DynamoDBEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-dynamodb/source/DynamoDBEndpointRules.cpp
@@ -51,125 +51,125 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
+'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
 'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
 '"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
-'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','d','y','n','a','m','o','d','b','-','f',
+'i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e',
+'s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',
+',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s',
+'"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',
+',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i',
+'o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',
+' ','D','u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b',
+'u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o',
+'t',' ','s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t',
+'y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r',
+'e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',
+':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[',
+'{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',
+',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
+'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
+'g','v','"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u',
+'l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',',','t','r','u',
+'e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n',
+'s','"',':','[','{','"','f','n','"',':','"','s','t','r','i','n','g','E','q','u','a','l','s','"',',',
+'"','a','r','g','v','"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','n','a','m','e','"',']','}',',','"','a','w','s','-','u','s','-',
+'g','o','v','"',']','}',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',
+':','"','h','t','t','p','s',':','/','/','d','y','n','a','m','o','d','b','.','{','R','e','g','i','o',
+'n','}','.','a','m','a','z','o','n','a','w','s','.','c','o','m','"',',','"','p','r','o','p','e','r',
+'t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t',
+'y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',',','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l',
+'"',':','"','h','t','t','p','s',':','/','/','d','y','n','a','m','o','d','b','-','f','i','p','s','.',
+'{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t',
+'#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',
+':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':',
+'"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e',
+'"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
+'r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t',
+'h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u',
+'p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r',
+'"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d',
+'i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q',
+'u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e',
+'D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"','r','u','l','e',
+'s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':',
 '"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
 'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
 '"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
 't','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
+']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s',
+'"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h',
+'t','t','p','s',':','/','/','d','y','n','a','m','o','d','b','.','{','R','e','g','i','o','n','}','.',
+'{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c',
+'k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',
+':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':',
+'"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e',
+'"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
+'r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ',
+'b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n',
+'o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y',
+'p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e',
+'e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':',
+'"','s','t','r','i','n','g','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"',
+'r','e','f','"',':','"','R','e','g','i','o','n','"','}',',','"','l','o','c','a','l','"',']','}',']',
+',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p',':',
+'/','/','l','o','c','a','l','h','o','s','t',':','8','0','0','0','"',',','"','p','r','o','p','e','r',
+'t','i','e','s','"',':','{','"','a','u','t','h','S','c','h','e','m','e','s','"',':','[','{','"','n',
+'a','m','e','"',':','"','s','i','g','v','4','"',',','"','s','i','g','n','i','n','g','N','a','m','e',
+'"',':','"','d','y','n','a','m','o','d','b','"',',','"','s','i','g','n','i','n','g','R','e','g','i',
+'o','n','"',':','"','u','s','-','e','a','s','t','-','1','"','}',']','}',',','"','h','e','a','d','e',
+'r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"',
+'}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
 'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','d','y','n','a',
-'m','o','d','b','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i',
-'t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u',
-'f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h',
-'e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o',
-'i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',',
-'"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a',
-'c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ',
-'p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r',
-'t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r',
-'r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
-'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b',
-'o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u',
-'e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"',
-'}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',',','"','t','y',
-'p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n',
-'d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','s','t','r','i','n','g','E','q',
-'u','a','l','s','"',',','"','a','r','g','v','"',':','[','"','a','w','s','-','u','s','-','g','o','v',
-'"',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"',
-'}',',','"','n','a','m','e','"',']','}',']','}',']',',','"','e','n','d','p','o','i','n','t','"',':',
-'{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','d','y','n','a','m','o','d','b','.',
-'{','R','e','g','i','o','n','}','.','a','m','a','z','o','n','a','w','s','.','c','o','m','"',',','"',
-'p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':',
-'{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',
-':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','d','y','n','a','m','o','d','b',
-'-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n',
-'R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e',
-'r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"',
-'t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n',
-'d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',
-' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t',
-'i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I',
-'P','S','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"','c',
-'o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a',
-'n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"',
-'U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
-'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n',
-'"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f',
-'"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p',
-'p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','t','y','p',
-'e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d',
-'i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u',
-'r','l','"',':','"','h','t','t','p','s',':','/','/','d','y','n','a','m','o','d','b','.','{','R','e',
-'g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u',
-'a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e',
-'r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"',
-'t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n',
-'d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l',
-'S','t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',
-' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o',
-'r','t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r',
-'o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f',
-'n','"',':','"','s','t','r','i','n','g','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',',','"','l','o','c','a','l','"',
-']','}',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t',
-'t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','8','0','0','0','"',',','"','p','r','o',
-'p','e','r','t','i','e','s','"',':','{','"','a','u','t','h','S','c','h','e','m','e','s','"',':','[',
-'{','"','n','a','m','e','"',':','"','s','i','g','v','4','"',',','"','s','i','g','n','i','n','g','N',
-'a','m','e','"',':','"','d','y','n','a','m','o','d','b','"',',','"','s','i','g','n','i','n','g','R',
-'e','g','i','o','n','"',':','"','u','s','-','e','a','s','t','-','1','"','}',']','}',',','"','h','e',
-'a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i',
-'n','t','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n',
-'d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','d',
-'y','n','a','m','o','d','b','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i',
-'o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o',
-'p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',
-',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',']','}',',','{',
+'m','o','d','b','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r',
+'t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t',
+'y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':',
+'"','t','r','e','e','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{',
 '"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"',
 'I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','M','i',
 's','s','i','n','g',' ','R','e','g','i','o','n','"',',','"','t','y','p','e','"',':','"','e','r','r',
diff --git a/generated/src/aws-cpp-sdk-kafka/include/aws/kafka/KafkaClient.h b/generated/src/aws-cpp-sdk-kafka/include/aws/kafka/KafkaClient.h
index 942f74694ae..d6760924b0d 100644
--- a/generated/src/aws-cpp-sdk-kafka/include/aws/kafka/KafkaClient.h
+++ b/generated/src/aws-cpp-sdk-kafka/include/aws/kafka/KafkaClient.h
@@ -107,6 +107,34 @@ namespace Kafka
             return SubmitAsync(&KafkaClient::BatchAssociateScramSecret, request, handler, context);
         }
 
+        /**
+         * 
+            <p>Disassociates one or more Scram Secrets from an Amazon MSK
+         * cluster.</p>
+         <p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/BatchDisassociateScramSecret">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::BatchDisassociateScramSecretOutcome BatchDisassociateScramSecret(const Model::BatchDisassociateScramSecretRequest& request) const;
+
+        /**
+         * A Callable wrapper for BatchDisassociateScramSecret that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename BatchDisassociateScramSecretRequestT = Model::BatchDisassociateScramSecretRequest>
+        Model::BatchDisassociateScramSecretOutcomeCallable BatchDisassociateScramSecretCallable(const BatchDisassociateScramSecretRequestT& request) const
+        {
+            return SubmitCallable(&KafkaClient::BatchDisassociateScramSecret, request);
+        }
+
+        /**
+         * An Async wrapper for BatchDisassociateScramSecret that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename BatchDisassociateScramSecretRequestT = Model::BatchDisassociateScramSecretRequest>
+        void BatchDisassociateScramSecretAsync(const BatchDisassociateScramSecretRequestT& request, const BatchDisassociateScramSecretResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&KafkaClient::BatchDisassociateScramSecret, request, handler, context);
+        }
+
         /**
          * 
             <p>Creates a new MSK cluster.</p>
@@ -409,34 +437,6 @@ namespace Kafka
             return SubmitAsync(&KafkaClient::DescribeCluster, request, handler, context);
         }
 
-        /**
-         * 
-            <p>Returns a description of the MSK cluster whose Amazon Resource
-         * Name (ARN) is specified in the request.</p>
-         <p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeClusterV2">AWS
-         * API Reference</a></p>
-         */
-        virtual Model::DescribeClusterV2Outcome DescribeClusterV2(const Model::DescribeClusterV2Request& request) const;
-
-        /**
-         * A Callable wrapper for DescribeClusterV2 that returns a future to the operation so that it can be executed in parallel to other requests.
-         */
-        template<typename DescribeClusterV2RequestT = Model::DescribeClusterV2Request>
-        Model::DescribeClusterV2OutcomeCallable DescribeClusterV2Callable(const DescribeClusterV2RequestT& request) const
-        {
-            return SubmitCallable(&KafkaClient::DescribeClusterV2, request);
-        }
-
-        /**
-         * An Async wrapper for DescribeClusterV2 that queues the request into a thread executor and triggers associated callback when operation has finished.
-         */
-        template<typename DescribeClusterV2RequestT = Model::DescribeClusterV2Request>
-        void DescribeClusterV2Async(const DescribeClusterV2RequestT& request, const DescribeClusterV2ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
-        {
-            return SubmitAsync(&KafkaClient::DescribeClusterV2, request, handler, context);
-        }
-
         /**
          * 
             <p>Returns a description of the cluster operation specified by the
@@ -493,6 +493,34 @@ namespace Kafka
             return SubmitAsync(&KafkaClient::DescribeClusterOperationV2, request, handler, context);
         }
 
+        /**
+         * 
+            <p>Returns a description of the MSK cluster whose Amazon Resource
+         * Name (ARN) is specified in the request.</p>
+         <p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/DescribeClusterV2">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::DescribeClusterV2Outcome DescribeClusterV2(const Model::DescribeClusterV2Request& request) const;
+
+        /**
+         * A Callable wrapper for DescribeClusterV2 that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename DescribeClusterV2RequestT = Model::DescribeClusterV2Request>
+        Model::DescribeClusterV2OutcomeCallable DescribeClusterV2Callable(const DescribeClusterV2RequestT& request) const
+        {
+            return SubmitCallable(&KafkaClient::DescribeClusterV2, request);
+        }
+
+        /**
+         * An Async wrapper for DescribeClusterV2 that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename DescribeClusterV2RequestT = Model::DescribeClusterV2Request>
+        void DescribeClusterV2Async(const DescribeClusterV2RequestT& request, const DescribeClusterV2ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&KafkaClient::DescribeClusterV2, request, handler, context);
+        }
+
         /**
          * 
             <p>Returns a description of this MSK configuration.</p>
@@ -604,58 +632,58 @@ namespace Kafka
 
         /**
          * 
-            <p>Disassociates one or more Scram Secrets from an Amazon MSK
-         * cluster.</p>
+            <p>A list of brokers that a client application can use to
+         * bootstrap.</p>
          <p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/BatchDisassociateScramSecret">AWS
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/GetBootstrapBrokers">AWS
          * API Reference</a></p>
          */
-        virtual Model::BatchDisassociateScramSecretOutcome BatchDisassociateScramSecret(const Model::BatchDisassociateScramSecretRequest& request) const;
+        virtual Model::GetBootstrapBrokersOutcome GetBootstrapBrokers(const Model::GetBootstrapBrokersRequest& request) const;
 
         /**
-         * A Callable wrapper for BatchDisassociateScramSecret that returns a future to the operation so that it can be executed in parallel to other requests.
+         * A Callable wrapper for GetBootstrapBrokers that returns a future to the operation so that it can be executed in parallel to other requests.
          */
-        template<typename BatchDisassociateScramSecretRequestT = Model::BatchDisassociateScramSecretRequest>
-        Model::BatchDisassociateScramSecretOutcomeCallable BatchDisassociateScramSecretCallable(const BatchDisassociateScramSecretRequestT& request) const
+        template<typename GetBootstrapBrokersRequestT = Model::GetBootstrapBrokersRequest>
+        Model::GetBootstrapBrokersOutcomeCallable GetBootstrapBrokersCallable(const GetBootstrapBrokersRequestT& request) const
         {
-            return SubmitCallable(&KafkaClient::BatchDisassociateScramSecret, request);
+            return SubmitCallable(&KafkaClient::GetBootstrapBrokers, request);
         }
 
         /**
-         * An Async wrapper for BatchDisassociateScramSecret that queues the request into a thread executor and triggers associated callback when operation has finished.
+         * An Async wrapper for GetBootstrapBrokers that queues the request into a thread executor and triggers associated callback when operation has finished.
          */
-        template<typename BatchDisassociateScramSecretRequestT = Model::BatchDisassociateScramSecretRequest>
-        void BatchDisassociateScramSecretAsync(const BatchDisassociateScramSecretRequestT& request, const BatchDisassociateScramSecretResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        template<typename GetBootstrapBrokersRequestT = Model::GetBootstrapBrokersRequest>
+        void GetBootstrapBrokersAsync(const GetBootstrapBrokersRequestT& request, const GetBootstrapBrokersResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
         {
-            return SubmitAsync(&KafkaClient::BatchDisassociateScramSecret, request, handler, context);
+            return SubmitAsync(&KafkaClient::GetBootstrapBrokers, request, handler, context);
         }
 
         /**
          * 
-            <p>A list of brokers that a client application can use to
-         * bootstrap.</p>
+            <p>Get the MSK cluster policy specified by the Amazon Resource Name
+         * (ARN) in the request.</p>
          <p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/GetBootstrapBrokers">AWS
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/GetClusterPolicy">AWS
          * API Reference</a></p>
          */
-        virtual Model::GetBootstrapBrokersOutcome GetBootstrapBrokers(const Model::GetBootstrapBrokersRequest& request) const;
+        virtual Model::GetClusterPolicyOutcome GetClusterPolicy(const Model::GetClusterPolicyRequest& request) const;
 
         /**
-         * A Callable wrapper for GetBootstrapBrokers that returns a future to the operation so that it can be executed in parallel to other requests.
+         * A Callable wrapper for GetClusterPolicy that returns a future to the operation so that it can be executed in parallel to other requests.
          */
-        template<typename GetBootstrapBrokersRequestT = Model::GetBootstrapBrokersRequest>
-        Model::GetBootstrapBrokersOutcomeCallable GetBootstrapBrokersCallable(const GetBootstrapBrokersRequestT& request) const
+        template<typename GetClusterPolicyRequestT = Model::GetClusterPolicyRequest>
+        Model::GetClusterPolicyOutcomeCallable GetClusterPolicyCallable(const GetClusterPolicyRequestT& request) const
         {
-            return SubmitCallable(&KafkaClient::GetBootstrapBrokers, request);
+            return SubmitCallable(&KafkaClient::GetClusterPolicy, request);
         }
 
         /**
-         * An Async wrapper for GetBootstrapBrokers that queues the request into a thread executor and triggers associated callback when operation has finished.
+         * An Async wrapper for GetClusterPolicy that queues the request into a thread executor and triggers associated callback when operation has finished.
          */
-        template<typename GetBootstrapBrokersRequestT = Model::GetBootstrapBrokersRequest>
-        void GetBootstrapBrokersAsync(const GetBootstrapBrokersRequestT& request, const GetBootstrapBrokersResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        template<typename GetClusterPolicyRequestT = Model::GetClusterPolicyRequest>
+        void GetClusterPolicyAsync(const GetClusterPolicyRequestT& request, const GetClusterPolicyResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
         {
-            return SubmitAsync(&KafkaClient::GetBootstrapBrokers, request, handler, context);
+            return SubmitAsync(&KafkaClient::GetClusterPolicy, request, handler, context);
         }
 
         /**
@@ -688,30 +716,30 @@ namespace Kafka
 
         /**
          * 
-            <p>Get the MSK cluster policy specified by the Amazon Resource Name
-         * (ARN) in the request.</p>
-         <p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/GetClusterPolicy">AWS
+            <p>Returns a list of all the VPC connections in this Region.</p>
+  
+         * <p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClientVpcConnections">AWS
          * API Reference</a></p>
          */
-        virtual Model::GetClusterPolicyOutcome GetClusterPolicy(const Model::GetClusterPolicyRequest& request) const;
+        virtual Model::ListClientVpcConnectionsOutcome ListClientVpcConnections(const Model::ListClientVpcConnectionsRequest& request) const;
 
         /**
-         * A Callable wrapper for GetClusterPolicy that returns a future to the operation so that it can be executed in parallel to other requests.
+         * A Callable wrapper for ListClientVpcConnections that returns a future to the operation so that it can be executed in parallel to other requests.
          */
-        template<typename GetClusterPolicyRequestT = Model::GetClusterPolicyRequest>
-        Model::GetClusterPolicyOutcomeCallable GetClusterPolicyCallable(const GetClusterPolicyRequestT& request) const
+        template<typename ListClientVpcConnectionsRequestT = Model::ListClientVpcConnectionsRequest>
+        Model::ListClientVpcConnectionsOutcomeCallable ListClientVpcConnectionsCallable(const ListClientVpcConnectionsRequestT& request) const
         {
-            return SubmitCallable(&KafkaClient::GetClusterPolicy, request);
+            return SubmitCallable(&KafkaClient::ListClientVpcConnections, request);
         }
 
         /**
-         * An Async wrapper for GetClusterPolicy that queues the request into a thread executor and triggers associated callback when operation has finished.
+         * An Async wrapper for ListClientVpcConnections that queues the request into a thread executor and triggers associated callback when operation has finished.
          */
-        template<typename GetClusterPolicyRequestT = Model::GetClusterPolicyRequest>
-        void GetClusterPolicyAsync(const GetClusterPolicyRequestT& request, const GetClusterPolicyResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        template<typename ListClientVpcConnectionsRequestT = Model::ListClientVpcConnectionsRequest>
+        void ListClientVpcConnectionsAsync(const ListClientVpcConnectionsRequestT& request, const ListClientVpcConnectionsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
         {
-            return SubmitAsync(&KafkaClient::GetClusterPolicy, request, handler, context);
+            return SubmitAsync(&KafkaClient::ListClientVpcConnections, request, handler, context);
         }
 
         /**
@@ -1019,34 +1047,6 @@ namespace Kafka
             return SubmitAsync(&KafkaClient::ListTagsForResource, request, handler, context);
         }
 
-        /**
-         * 
-            <p>Returns a list of all the VPC connections in this Region.</p>
-  
-         * <p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/ListClientVpcConnections">AWS
-         * API Reference</a></p>
-         */
-        virtual Model::ListClientVpcConnectionsOutcome ListClientVpcConnections(const Model::ListClientVpcConnectionsRequest& request) const;
-
-        /**
-         * A Callable wrapper for ListClientVpcConnections that returns a future to the operation so that it can be executed in parallel to other requests.
-         */
-        template<typename ListClientVpcConnectionsRequestT = Model::ListClientVpcConnectionsRequest>
-        Model::ListClientVpcConnectionsOutcomeCallable ListClientVpcConnectionsCallable(const ListClientVpcConnectionsRequestT& request) const
-        {
-            return SubmitCallable(&KafkaClient::ListClientVpcConnections, request);
-        }
-
-        /**
-         * An Async wrapper for ListClientVpcConnections that queues the request into a thread executor and triggers associated callback when operation has finished.
-         */
-        template<typename ListClientVpcConnectionsRequestT = Model::ListClientVpcConnectionsRequest>
-        void ListClientVpcConnectionsAsync(const ListClientVpcConnectionsRequestT& request, const ListClientVpcConnectionsResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
-        {
-            return SubmitAsync(&KafkaClient::ListClientVpcConnections, request, handler, context);
-        }
-
         /**
          * 
             <p>Returns a list of all the VPC connections in this Region.</p>
@@ -1075,33 +1075,6 @@ namespace Kafka
             return SubmitAsync(&KafkaClient::ListVpcConnections, request, handler, context);
         }
 
-        /**
-         * 
-            <p>Returns empty response.</p>
-         <p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/RejectClientVpcConnection">AWS
-         * API Reference</a></p>
-         */
-        virtual Model::RejectClientVpcConnectionOutcome RejectClientVpcConnection(const Model::RejectClientVpcConnectionRequest& request) const;
-
-        /**
-         * A Callable wrapper for RejectClientVpcConnection that returns a future to the operation so that it can be executed in parallel to other requests.
-         */
-        template<typename RejectClientVpcConnectionRequestT = Model::RejectClientVpcConnectionRequest>
-        Model::RejectClientVpcConnectionOutcomeCallable RejectClientVpcConnectionCallable(const RejectClientVpcConnectionRequestT& request) const
-        {
-            return SubmitCallable(&KafkaClient::RejectClientVpcConnection, request);
-        }
-
-        /**
-         * An Async wrapper for RejectClientVpcConnection that queues the request into a thread executor and triggers associated callback when operation has finished.
-         */
-        template<typename RejectClientVpcConnectionRequestT = Model::RejectClientVpcConnectionRequest>
-        void RejectClientVpcConnectionAsync(const RejectClientVpcConnectionRequestT& request, const RejectClientVpcConnectionResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
-        {
-            return SubmitAsync(&KafkaClient::RejectClientVpcConnection, request, handler, context);
-        }
-
         /**
          * 
             <p>Creates or updates the MSK cluster policy specified by the
@@ -1156,6 +1129,33 @@ namespace Kafka
             return SubmitAsync(&KafkaClient::RebootBroker, request, handler, context);
         }
 
+        /**
+         * 
+            <p>Returns empty response.</p>
+         <p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/RejectClientVpcConnection">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::RejectClientVpcConnectionOutcome RejectClientVpcConnection(const Model::RejectClientVpcConnectionRequest& request) const;
+
+        /**
+         * A Callable wrapper for RejectClientVpcConnection that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename RejectClientVpcConnectionRequestT = Model::RejectClientVpcConnectionRequest>
+        Model::RejectClientVpcConnectionOutcomeCallable RejectClientVpcConnectionCallable(const RejectClientVpcConnectionRequestT& request) const
+        {
+            return SubmitCallable(&KafkaClient::RejectClientVpcConnection, request);
+        }
+
+        /**
+         * An Async wrapper for RejectClientVpcConnection that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename RejectClientVpcConnectionRequestT = Model::RejectClientVpcConnectionRequest>
+        void RejectClientVpcConnectionAsync(const RejectClientVpcConnectionRequestT& request, const RejectClientVpcConnectionResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&KafkaClient::RejectClientVpcConnection, request, handler, context);
+        }
+
         /**
          * 
             <p>Adds tags to the specified MSK resource.</p>
@@ -1240,34 +1240,6 @@ namespace Kafka
             return SubmitAsync(&KafkaClient::UpdateBrokerCount, request, handler, context);
         }
 
-        /**
-         * 
-            <p>Updates EC2 instance type.</p>
-         <p><h3>See Also:</h3>  
-         * <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateBrokerType">AWS
-         * API Reference</a></p>
-         */
-        virtual Model::UpdateBrokerTypeOutcome UpdateBrokerType(const Model::UpdateBrokerTypeRequest& request) const;
-
-        /**
-         * A Callable wrapper for UpdateBrokerType that returns a future to the operation so that it can be executed in parallel to other requests.
-         */
-        template<typename UpdateBrokerTypeRequestT = Model::UpdateBrokerTypeRequest>
-        Model::UpdateBrokerTypeOutcomeCallable UpdateBrokerTypeCallable(const UpdateBrokerTypeRequestT& request) const
-        {
-            return SubmitCallable(&KafkaClient::UpdateBrokerType, request);
-        }
-
-        /**
-         * An Async wrapper for UpdateBrokerType that queues the request into a thread executor and triggers associated callback when operation has finished.
-         */
-        template<typename UpdateBrokerTypeRequestT = Model::UpdateBrokerTypeRequest>
-        void UpdateBrokerTypeAsync(const UpdateBrokerTypeRequestT& request, const UpdateBrokerTypeResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
-        {
-            return SubmitAsync(&KafkaClient::UpdateBrokerType, request, handler, context);
-        }
-
         /**
          * 
             <p>Updates the EBS storage associated with MSK brokers.</p>
@@ -1298,58 +1270,30 @@ namespace Kafka
 
         /**
          * 
-            <p>Updates an MSK configuration.</p>
-         <p><h3>See Also:</h3>
+            <p>Updates EC2 instance type.</p>
+         <p><h3>See Also:</h3>  
          * <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateConfiguration">AWS
-         * API Reference</a></p>
-         */
-        virtual Model::UpdateConfigurationOutcome UpdateConfiguration(const Model::UpdateConfigurationRequest& request) const;
-
-        /**
-         * A Callable wrapper for UpdateConfiguration that returns a future to the operation so that it can be executed in parallel to other requests.
-         */
-        template<typename UpdateConfigurationRequestT = Model::UpdateConfigurationRequest>
-        Model::UpdateConfigurationOutcomeCallable UpdateConfigurationCallable(const UpdateConfigurationRequestT& request) const
-        {
-            return SubmitCallable(&KafkaClient::UpdateConfiguration, request);
-        }
-
-        /**
-         * An Async wrapper for UpdateConfiguration that queues the request into a thread executor and triggers associated callback when operation has finished.
-         */
-        template<typename UpdateConfigurationRequestT = Model::UpdateConfigurationRequest>
-        void UpdateConfigurationAsync(const UpdateConfigurationRequestT& request, const UpdateConfigurationResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
-        {
-            return SubmitAsync(&KafkaClient::UpdateConfiguration, request, handler, context);
-        }
-
-        /**
-         * 
-            <p>Updates the cluster's connectivity configuration.</p>
-        
-         * <p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateConnectivity">AWS
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateBrokerType">AWS
          * API Reference</a></p>
          */
-        virtual Model::UpdateConnectivityOutcome UpdateConnectivity(const Model::UpdateConnectivityRequest& request) const;
+        virtual Model::UpdateBrokerTypeOutcome UpdateBrokerType(const Model::UpdateBrokerTypeRequest& request) const;
 
         /**
-         * A Callable wrapper for UpdateConnectivity that returns a future to the operation so that it can be executed in parallel to other requests.
+         * A Callable wrapper for UpdateBrokerType that returns a future to the operation so that it can be executed in parallel to other requests.
          */
-        template<typename UpdateConnectivityRequestT = Model::UpdateConnectivityRequest>
-        Model::UpdateConnectivityOutcomeCallable UpdateConnectivityCallable(const UpdateConnectivityRequestT& request) const
+        template<typename UpdateBrokerTypeRequestT = Model::UpdateBrokerTypeRequest>
+        Model::UpdateBrokerTypeOutcomeCallable UpdateBrokerTypeCallable(const UpdateBrokerTypeRequestT& request) const
         {
-            return SubmitCallable(&KafkaClient::UpdateConnectivity, request);
+            return SubmitCallable(&KafkaClient::UpdateBrokerType, request);
         }
 
         /**
-         * An Async wrapper for UpdateConnectivity that queues the request into a thread executor and triggers associated callback when operation has finished.
+         * An Async wrapper for UpdateBrokerType that queues the request into a thread executor and triggers associated callback when operation has finished.
          */
-        template<typename UpdateConnectivityRequestT = Model::UpdateConnectivityRequest>
-        void UpdateConnectivityAsync(const UpdateConnectivityRequestT& request, const UpdateConnectivityResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        template<typename UpdateBrokerTypeRequestT = Model::UpdateBrokerTypeRequest>
+        void UpdateBrokerTypeAsync(const UpdateBrokerTypeRequestT& request, const UpdateBrokerTypeResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
         {
-            return SubmitAsync(&KafkaClient::UpdateConnectivity, request, handler, context);
+            return SubmitAsync(&KafkaClient::UpdateBrokerType, request, handler, context);
         }
 
         /**
@@ -1408,6 +1352,62 @@ namespace Kafka
             return SubmitAsync(&KafkaClient::UpdateClusterKafkaVersion, request, handler, context);
         }
 
+        /**
+         * 
+            <p>Updates an MSK configuration.</p>
+         <p><h3>See Also:</h3>
+         * <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateConfiguration">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::UpdateConfigurationOutcome UpdateConfiguration(const Model::UpdateConfigurationRequest& request) const;
+
+        /**
+         * A Callable wrapper for UpdateConfiguration that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename UpdateConfigurationRequestT = Model::UpdateConfigurationRequest>
+        Model::UpdateConfigurationOutcomeCallable UpdateConfigurationCallable(const UpdateConfigurationRequestT& request) const
+        {
+            return SubmitCallable(&KafkaClient::UpdateConfiguration, request);
+        }
+
+        /**
+         * An Async wrapper for UpdateConfiguration that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename UpdateConfigurationRequestT = Model::UpdateConfigurationRequest>
+        void UpdateConfigurationAsync(const UpdateConfigurationRequestT& request, const UpdateConfigurationResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&KafkaClient::UpdateConfiguration, request, handler, context);
+        }
+
+        /**
+         * 
+            <p>Updates the cluster's connectivity configuration.</p>
+        
+         * <p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/kafka-2018-11-14/UpdateConnectivity">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::UpdateConnectivityOutcome UpdateConnectivity(const Model::UpdateConnectivityRequest& request) const;
+
+        /**
+         * A Callable wrapper for UpdateConnectivity that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename UpdateConnectivityRequestT = Model::UpdateConnectivityRequest>
+        Model::UpdateConnectivityOutcomeCallable UpdateConnectivityCallable(const UpdateConnectivityRequestT& request) const
+        {
+            return SubmitCallable(&KafkaClient::UpdateConnectivity, request);
+        }
+
+        /**
+         * An Async wrapper for UpdateConnectivity that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename UpdateConnectivityRequestT = Model::UpdateConnectivityRequest>
+        void UpdateConnectivityAsync(const UpdateConnectivityRequestT& request, const UpdateConnectivityResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&KafkaClient::UpdateConnectivity, request, handler, context);
+        }
+
         /**
          * 
             <p>Updates the monitoring settings for the cluster. You can use
diff --git a/generated/src/aws-cpp-sdk-kafka/include/aws/kafka/KafkaServiceClientModel.h b/generated/src/aws-cpp-sdk-kafka/include/aws/kafka/KafkaServiceClientModel.h
index 13016cab09b..410b7e8790f 100644
--- a/generated/src/aws-cpp-sdk-kafka/include/aws/kafka/KafkaServiceClientModel.h
+++ b/generated/src/aws-cpp-sdk-kafka/include/aws/kafka/KafkaServiceClientModel.h
@@ -19,6 +19,7 @@
 
 /* Service model headers required in KafkaClient header */
 #include <aws/kafka/model/BatchAssociateScramSecretResult.h>
+#include <aws/kafka/model/BatchDisassociateScramSecretResult.h>
 #include <aws/kafka/model/CreateClusterResult.h>
 #include <aws/kafka/model/CreateClusterV2Result.h>
 #include <aws/kafka/model/CreateConfigurationResult.h>
@@ -30,17 +31,17 @@
 #include <aws/kafka/model/DeleteReplicatorResult.h>
 #include <aws/kafka/model/DeleteVpcConnectionResult.h>
 #include <aws/kafka/model/DescribeClusterResult.h>
-#include <aws/kafka/model/DescribeClusterV2Result.h>
 #include <aws/kafka/model/DescribeClusterOperationResult.h>
 #include <aws/kafka/model/DescribeClusterOperationV2Result.h>
+#include <aws/kafka/model/DescribeClusterV2Result.h>
 #include <aws/kafka/model/DescribeConfigurationResult.h>
 #include <aws/kafka/model/DescribeConfigurationRevisionResult.h>
 #include <aws/kafka/model/DescribeReplicatorResult.h>
 #include <aws/kafka/model/DescribeVpcConnectionResult.h>
-#include <aws/kafka/model/BatchDisassociateScramSecretResult.h>
 #include <aws/kafka/model/GetBootstrapBrokersResult.h>
-#include <aws/kafka/model/GetCompatibleKafkaVersionsResult.h>
 #include <aws/kafka/model/GetClusterPolicyResult.h>
+#include <aws/kafka/model/GetCompatibleKafkaVersionsResult.h>
+#include <aws/kafka/model/ListClientVpcConnectionsResult.h>
 #include <aws/kafka/model/ListClusterOperationsResult.h>
 #include <aws/kafka/model/ListClusterOperationsV2Result.h>
 #include <aws/kafka/model/ListClustersResult.h>
@@ -52,18 +53,17 @@
 #include <aws/kafka/model/ListReplicatorsResult.h>
 #include <aws/kafka/model/ListScramSecretsResult.h>
 #include <aws/kafka/model/ListTagsForResourceResult.h>
-#include <aws/kafka/model/ListClientVpcConnectionsResult.h>
 #include <aws/kafka/model/ListVpcConnectionsResult.h>
-#include <aws/kafka/model/RejectClientVpcConnectionResult.h>
 #include <aws/kafka/model/PutClusterPolicyResult.h>
 #include <aws/kafka/model/RebootBrokerResult.h>
+#include <aws/kafka/model/RejectClientVpcConnectionResult.h>
 #include <aws/kafka/model/UpdateBrokerCountResult.h>
-#include <aws/kafka/model/UpdateBrokerTypeResult.h>
 #include <aws/kafka/model/UpdateBrokerStorageResult.h>
-#include <aws/kafka/model/UpdateConfigurationResult.h>
-#include <aws/kafka/model/UpdateConnectivityResult.h>
+#include <aws/kafka/model/UpdateBrokerTypeResult.h>
 #include <aws/kafka/model/UpdateClusterConfigurationResult.h>
 #include <aws/kafka/model/UpdateClusterKafkaVersionResult.h>
+#include <aws/kafka/model/UpdateConfigurationResult.h>
+#include <aws/kafka/model/UpdateConnectivityResult.h>
 #include <aws/kafka/model/UpdateMonitoringResult.h>
 #include <aws/kafka/model/UpdateReplicationInfoResult.h>
 #include <aws/kafka/model/UpdateSecurityResult.h>
@@ -110,6 +110,7 @@ namespace Aws
     {
       /* Service model forward declarations required in KafkaClient header */
       class BatchAssociateScramSecretRequest;
+      class BatchDisassociateScramSecretRequest;
       class CreateClusterRequest;
       class CreateClusterV2Request;
       class CreateConfigurationRequest;
@@ -121,17 +122,17 @@ namespace Aws
       class DeleteReplicatorRequest;
       class DeleteVpcConnectionRequest;
       class DescribeClusterRequest;
-      class DescribeClusterV2Request;
       class DescribeClusterOperationRequest;
       class DescribeClusterOperationV2Request;
+      class DescribeClusterV2Request;
       class DescribeConfigurationRequest;
       class DescribeConfigurationRevisionRequest;
       class DescribeReplicatorRequest;
       class DescribeVpcConnectionRequest;
-      class BatchDisassociateScramSecretRequest;
       class GetBootstrapBrokersRequest;
-      class GetCompatibleKafkaVersionsRequest;
       class GetClusterPolicyRequest;
+      class GetCompatibleKafkaVersionsRequest;
+      class ListClientVpcConnectionsRequest;
       class ListClusterOperationsRequest;
       class ListClusterOperationsV2Request;
       class ListClustersRequest;
@@ -143,20 +144,19 @@ namespace Aws
       class ListReplicatorsRequest;
       class ListScramSecretsRequest;
       class ListTagsForResourceRequest;
-      class ListClientVpcConnectionsRequest;
       class ListVpcConnectionsRequest;
-      class RejectClientVpcConnectionRequest;
       class PutClusterPolicyRequest;
       class RebootBrokerRequest;
+      class RejectClientVpcConnectionRequest;
       class TagResourceRequest;
       class UntagResourceRequest;
       class UpdateBrokerCountRequest;
-      class UpdateBrokerTypeRequest;
       class UpdateBrokerStorageRequest;
-      class UpdateConfigurationRequest;
-      class UpdateConnectivityRequest;
+      class UpdateBrokerTypeRequest;
       class UpdateClusterConfigurationRequest;
       class UpdateClusterKafkaVersionRequest;
+      class UpdateConfigurationRequest;
+      class UpdateConnectivityRequest;
       class UpdateMonitoringRequest;
       class UpdateReplicationInfoRequest;
       class UpdateSecurityRequest;
@@ -165,6 +165,7 @@ namespace Aws
 
       /* Service model Outcome class definitions */
       typedef Aws::Utils::Outcome<BatchAssociateScramSecretResult, KafkaError> BatchAssociateScramSecretOutcome;
+      typedef Aws::Utils::Outcome<BatchDisassociateScramSecretResult, KafkaError> BatchDisassociateScramSecretOutcome;
       typedef Aws::Utils::Outcome<CreateClusterResult, KafkaError> CreateClusterOutcome;
       typedef Aws::Utils::Outcome<CreateClusterV2Result, KafkaError> CreateClusterV2Outcome;
       typedef Aws::Utils::Outcome<CreateConfigurationResult, KafkaError> CreateConfigurationOutcome;
@@ -176,17 +177,17 @@ namespace Aws
       typedef Aws::Utils::Outcome<DeleteReplicatorResult, KafkaError> DeleteReplicatorOutcome;
       typedef Aws::Utils::Outcome<DeleteVpcConnectionResult, KafkaError> DeleteVpcConnectionOutcome;
       typedef Aws::Utils::Outcome<DescribeClusterResult, KafkaError> DescribeClusterOutcome;
-      typedef Aws::Utils::Outcome<DescribeClusterV2Result, KafkaError> DescribeClusterV2Outcome;
       typedef Aws::Utils::Outcome<DescribeClusterOperationResult, KafkaError> DescribeClusterOperationOutcome;
       typedef Aws::Utils::Outcome<DescribeClusterOperationV2Result, KafkaError> DescribeClusterOperationV2Outcome;
+      typedef Aws::Utils::Outcome<DescribeClusterV2Result, KafkaError> DescribeClusterV2Outcome;
       typedef Aws::Utils::Outcome<DescribeConfigurationResult, KafkaError> DescribeConfigurationOutcome;
       typedef Aws::Utils::Outcome<DescribeConfigurationRevisionResult, KafkaError> DescribeConfigurationRevisionOutcome;
       typedef Aws::Utils::Outcome<DescribeReplicatorResult, KafkaError> DescribeReplicatorOutcome;
       typedef Aws::Utils::Outcome<DescribeVpcConnectionResult, KafkaError> DescribeVpcConnectionOutcome;
-      typedef Aws::Utils::Outcome<BatchDisassociateScramSecretResult, KafkaError> BatchDisassociateScramSecretOutcome;
       typedef Aws::Utils::Outcome<GetBootstrapBrokersResult, KafkaError> GetBootstrapBrokersOutcome;
-      typedef Aws::Utils::Outcome<GetCompatibleKafkaVersionsResult, KafkaError> GetCompatibleKafkaVersionsOutcome;
       typedef Aws::Utils::Outcome<GetClusterPolicyResult, KafkaError> GetClusterPolicyOutcome;
+      typedef Aws::Utils::Outcome<GetCompatibleKafkaVersionsResult, KafkaError> GetCompatibleKafkaVersionsOutcome;
+      typedef Aws::Utils::Outcome<ListClientVpcConnectionsResult, KafkaError> ListClientVpcConnectionsOutcome;
       typedef Aws::Utils::Outcome<ListClusterOperationsResult, KafkaError> ListClusterOperationsOutcome;
       typedef Aws::Utils::Outcome<ListClusterOperationsV2Result, KafkaError> ListClusterOperationsV2Outcome;
       typedef Aws::Utils::Outcome<ListClustersResult, KafkaError> ListClustersOutcome;
@@ -198,20 +199,19 @@ namespace Aws
       typedef Aws::Utils::Outcome<ListReplicatorsResult, KafkaError> ListReplicatorsOutcome;
       typedef Aws::Utils::Outcome<ListScramSecretsResult, KafkaError> ListScramSecretsOutcome;
       typedef Aws::Utils::Outcome<ListTagsForResourceResult, KafkaError> ListTagsForResourceOutcome;
-      typedef Aws::Utils::Outcome<ListClientVpcConnectionsResult, KafkaError> ListClientVpcConnectionsOutcome;
       typedef Aws::Utils::Outcome<ListVpcConnectionsResult, KafkaError> ListVpcConnectionsOutcome;
-      typedef Aws::Utils::Outcome<RejectClientVpcConnectionResult, KafkaError> RejectClientVpcConnectionOutcome;
       typedef Aws::Utils::Outcome<PutClusterPolicyResult, KafkaError> PutClusterPolicyOutcome;
       typedef Aws::Utils::Outcome<RebootBrokerResult, KafkaError> RebootBrokerOutcome;
+      typedef Aws::Utils::Outcome<RejectClientVpcConnectionResult, KafkaError> RejectClientVpcConnectionOutcome;
       typedef Aws::Utils::Outcome<Aws::NoResult, KafkaError> TagResourceOutcome;
       typedef Aws::Utils::Outcome<Aws::NoResult, KafkaError> UntagResourceOutcome;
       typedef Aws::Utils::Outcome<UpdateBrokerCountResult, KafkaError> UpdateBrokerCountOutcome;
-      typedef Aws::Utils::Outcome<UpdateBrokerTypeResult, KafkaError> UpdateBrokerTypeOutcome;
       typedef Aws::Utils::Outcome<UpdateBrokerStorageResult, KafkaError> UpdateBrokerStorageOutcome;
-      typedef Aws::Utils::Outcome<UpdateConfigurationResult, KafkaError> UpdateConfigurationOutcome;
-      typedef Aws::Utils::Outcome<UpdateConnectivityResult, KafkaError> UpdateConnectivityOutcome;
+      typedef Aws::Utils::Outcome<UpdateBrokerTypeResult, KafkaError> UpdateBrokerTypeOutcome;
       typedef Aws::Utils::Outcome<UpdateClusterConfigurationResult, KafkaError> UpdateClusterConfigurationOutcome;
       typedef Aws::Utils::Outcome<UpdateClusterKafkaVersionResult, KafkaError> UpdateClusterKafkaVersionOutcome;
+      typedef Aws::Utils::Outcome<UpdateConfigurationResult, KafkaError> UpdateConfigurationOutcome;
+      typedef Aws::Utils::Outcome<UpdateConnectivityResult, KafkaError> UpdateConnectivityOutcome;
       typedef Aws::Utils::Outcome<UpdateMonitoringResult, KafkaError> UpdateMonitoringOutcome;
       typedef Aws::Utils::Outcome<UpdateReplicationInfoResult, KafkaError> UpdateReplicationInfoOutcome;
       typedef Aws::Utils::Outcome<UpdateSecurityResult, KafkaError> UpdateSecurityOutcome;
@@ -220,6 +220,7 @@ namespace Aws
 
       /* Service model Outcome callable definitions */
       typedef std::future<BatchAssociateScramSecretOutcome> BatchAssociateScramSecretOutcomeCallable;
+      typedef std::future<BatchDisassociateScramSecretOutcome> BatchDisassociateScramSecretOutcomeCallable;
       typedef std::future<CreateClusterOutcome> CreateClusterOutcomeCallable;
       typedef std::future<CreateClusterV2Outcome> CreateClusterV2OutcomeCallable;
       typedef std::future<CreateConfigurationOutcome> CreateConfigurationOutcomeCallable;
@@ -231,17 +232,17 @@ namespace Aws
       typedef std::future<DeleteReplicatorOutcome> DeleteReplicatorOutcomeCallable;
       typedef std::future<DeleteVpcConnectionOutcome> DeleteVpcConnectionOutcomeCallable;
       typedef std::future<DescribeClusterOutcome> DescribeClusterOutcomeCallable;
-      typedef std::future<DescribeClusterV2Outcome> DescribeClusterV2OutcomeCallable;
       typedef std::future<DescribeClusterOperationOutcome> DescribeClusterOperationOutcomeCallable;
       typedef std::future<DescribeClusterOperationV2Outcome> DescribeClusterOperationV2OutcomeCallable;
+      typedef std::future<DescribeClusterV2Outcome> DescribeClusterV2OutcomeCallable;
       typedef std::future<DescribeConfigurationOutcome> DescribeConfigurationOutcomeCallable;
       typedef std::future<DescribeConfigurationRevisionOutcome> DescribeConfigurationRevisionOutcomeCallable;
       typedef std::future<DescribeReplicatorOutcome> DescribeReplicatorOutcomeCallable;
       typedef std::future<DescribeVpcConnectionOutcome> DescribeVpcConnectionOutcomeCallable;
-      typedef std::future<BatchDisassociateScramSecretOutcome> BatchDisassociateScramSecretOutcomeCallable;
       typedef std::future<GetBootstrapBrokersOutcome> GetBootstrapBrokersOutcomeCallable;
-      typedef std::future<GetCompatibleKafkaVersionsOutcome> GetCompatibleKafkaVersionsOutcomeCallable;
       typedef std::future<GetClusterPolicyOutcome> GetClusterPolicyOutcomeCallable;
+      typedef std::future<GetCompatibleKafkaVersionsOutcome> GetCompatibleKafkaVersionsOutcomeCallable;
+      typedef std::future<ListClientVpcConnectionsOutcome> ListClientVpcConnectionsOutcomeCallable;
       typedef std::future<ListClusterOperationsOutcome> ListClusterOperationsOutcomeCallable;
       typedef std::future<ListClusterOperationsV2Outcome> ListClusterOperationsV2OutcomeCallable;
       typedef std::future<ListClustersOutcome> ListClustersOutcomeCallable;
@@ -253,20 +254,19 @@ namespace Aws
       typedef std::future<ListReplicatorsOutcome> ListReplicatorsOutcomeCallable;
       typedef std::future<ListScramSecretsOutcome> ListScramSecretsOutcomeCallable;
       typedef std::future<ListTagsForResourceOutcome> ListTagsForResourceOutcomeCallable;
-      typedef std::future<ListClientVpcConnectionsOutcome> ListClientVpcConnectionsOutcomeCallable;
       typedef std::future<ListVpcConnectionsOutcome> ListVpcConnectionsOutcomeCallable;
-      typedef std::future<RejectClientVpcConnectionOutcome> RejectClientVpcConnectionOutcomeCallable;
       typedef std::future<PutClusterPolicyOutcome> PutClusterPolicyOutcomeCallable;
       typedef std::future<RebootBrokerOutcome> RebootBrokerOutcomeCallable;
+      typedef std::future<RejectClientVpcConnectionOutcome> RejectClientVpcConnectionOutcomeCallable;
       typedef std::future<TagResourceOutcome> TagResourceOutcomeCallable;
       typedef std::future<UntagResourceOutcome> UntagResourceOutcomeCallable;
       typedef std::future<UpdateBrokerCountOutcome> UpdateBrokerCountOutcomeCallable;
-      typedef std::future<UpdateBrokerTypeOutcome> UpdateBrokerTypeOutcomeCallable;
       typedef std::future<UpdateBrokerStorageOutcome> UpdateBrokerStorageOutcomeCallable;
-      typedef std::future<UpdateConfigurationOutcome> UpdateConfigurationOutcomeCallable;
-      typedef std::future<UpdateConnectivityOutcome> UpdateConnectivityOutcomeCallable;
+      typedef std::future<UpdateBrokerTypeOutcome> UpdateBrokerTypeOutcomeCallable;
       typedef std::future<UpdateClusterConfigurationOutcome> UpdateClusterConfigurationOutcomeCallable;
       typedef std::future<UpdateClusterKafkaVersionOutcome> UpdateClusterKafkaVersionOutcomeCallable;
+      typedef std::future<UpdateConfigurationOutcome> UpdateConfigurationOutcomeCallable;
+      typedef std::future<UpdateConnectivityOutcome> UpdateConnectivityOutcomeCallable;
       typedef std::future<UpdateMonitoringOutcome> UpdateMonitoringOutcomeCallable;
       typedef std::future<UpdateReplicationInfoOutcome> UpdateReplicationInfoOutcomeCallable;
       typedef std::future<UpdateSecurityOutcome> UpdateSecurityOutcomeCallable;
@@ -278,6 +278,7 @@ namespace Aws
 
     /* Service model async handlers definitions */
     typedef std::function<void(const KafkaClient*, const Model::BatchAssociateScramSecretRequest&, const Model::BatchAssociateScramSecretOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > BatchAssociateScramSecretResponseReceivedHandler;
+    typedef std::function<void(const KafkaClient*, const Model::BatchDisassociateScramSecretRequest&, const Model::BatchDisassociateScramSecretOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > BatchDisassociateScramSecretResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::CreateClusterRequest&, const Model::CreateClusterOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateClusterResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::CreateClusterV2Request&, const Model::CreateClusterV2Outcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateClusterV2ResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::CreateConfigurationRequest&, const Model::CreateConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateConfigurationResponseReceivedHandler;
@@ -289,17 +290,17 @@ namespace Aws
     typedef std::function<void(const KafkaClient*, const Model::DeleteReplicatorRequest&, const Model::DeleteReplicatorOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteReplicatorResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::DeleteVpcConnectionRequest&, const Model::DeleteVpcConnectionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteVpcConnectionResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::DescribeClusterRequest&, const Model::DescribeClusterOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeClusterResponseReceivedHandler;
-    typedef std::function<void(const KafkaClient*, const Model::DescribeClusterV2Request&, const Model::DescribeClusterV2Outcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeClusterV2ResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::DescribeClusterOperationRequest&, const Model::DescribeClusterOperationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeClusterOperationResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::DescribeClusterOperationV2Request&, const Model::DescribeClusterOperationV2Outcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeClusterOperationV2ResponseReceivedHandler;
+    typedef std::function<void(const KafkaClient*, const Model::DescribeClusterV2Request&, const Model::DescribeClusterV2Outcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeClusterV2ResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::DescribeConfigurationRequest&, const Model::DescribeConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeConfigurationResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::DescribeConfigurationRevisionRequest&, const Model::DescribeConfigurationRevisionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeConfigurationRevisionResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::DescribeReplicatorRequest&, const Model::DescribeReplicatorOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeReplicatorResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::DescribeVpcConnectionRequest&, const Model::DescribeVpcConnectionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeVpcConnectionResponseReceivedHandler;
-    typedef std::function<void(const KafkaClient*, const Model::BatchDisassociateScramSecretRequest&, const Model::BatchDisassociateScramSecretOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > BatchDisassociateScramSecretResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::GetBootstrapBrokersRequest&, const Model::GetBootstrapBrokersOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetBootstrapBrokersResponseReceivedHandler;
-    typedef std::function<void(const KafkaClient*, const Model::GetCompatibleKafkaVersionsRequest&, const Model::GetCompatibleKafkaVersionsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetCompatibleKafkaVersionsResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::GetClusterPolicyRequest&, const Model::GetClusterPolicyOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetClusterPolicyResponseReceivedHandler;
+    typedef std::function<void(const KafkaClient*, const Model::GetCompatibleKafkaVersionsRequest&, const Model::GetCompatibleKafkaVersionsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > GetCompatibleKafkaVersionsResponseReceivedHandler;
+    typedef std::function<void(const KafkaClient*, const Model::ListClientVpcConnectionsRequest&, const Model::ListClientVpcConnectionsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListClientVpcConnectionsResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::ListClusterOperationsRequest&, const Model::ListClusterOperationsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListClusterOperationsResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::ListClusterOperationsV2Request&, const Model::ListClusterOperationsV2Outcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListClusterOperationsV2ResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::ListClustersRequest&, const Model::ListClustersOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListClustersResponseReceivedHandler;
@@ -311,20 +312,19 @@ namespace Aws
     typedef std::function<void(const KafkaClient*, const Model::ListReplicatorsRequest&, const Model::ListReplicatorsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListReplicatorsResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::ListScramSecretsRequest&, const Model::ListScramSecretsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListScramSecretsResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::ListTagsForResourceRequest&, const Model::ListTagsForResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListTagsForResourceResponseReceivedHandler;
-    typedef std::function<void(const KafkaClient*, const Model::ListClientVpcConnectionsRequest&, const Model::ListClientVpcConnectionsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListClientVpcConnectionsResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::ListVpcConnectionsRequest&, const Model::ListVpcConnectionsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListVpcConnectionsResponseReceivedHandler;
-    typedef std::function<void(const KafkaClient*, const Model::RejectClientVpcConnectionRequest&, const Model::RejectClientVpcConnectionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > RejectClientVpcConnectionResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::PutClusterPolicyRequest&, const Model::PutClusterPolicyOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > PutClusterPolicyResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::RebootBrokerRequest&, const Model::RebootBrokerOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > RebootBrokerResponseReceivedHandler;
+    typedef std::function<void(const KafkaClient*, const Model::RejectClientVpcConnectionRequest&, const Model::RejectClientVpcConnectionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > RejectClientVpcConnectionResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::TagResourceRequest&, const Model::TagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > TagResourceResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::UntagResourceRequest&, const Model::UntagResourceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UntagResourceResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::UpdateBrokerCountRequest&, const Model::UpdateBrokerCountOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateBrokerCountResponseReceivedHandler;
-    typedef std::function<void(const KafkaClient*, const Model::UpdateBrokerTypeRequest&, const Model::UpdateBrokerTypeOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateBrokerTypeResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::UpdateBrokerStorageRequest&, const Model::UpdateBrokerStorageOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateBrokerStorageResponseReceivedHandler;
-    typedef std::function<void(const KafkaClient*, const Model::UpdateConfigurationRequest&, const Model::UpdateConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateConfigurationResponseReceivedHandler;
-    typedef std::function<void(const KafkaClient*, const Model::UpdateConnectivityRequest&, const Model::UpdateConnectivityOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateConnectivityResponseReceivedHandler;
+    typedef std::function<void(const KafkaClient*, const Model::UpdateBrokerTypeRequest&, const Model::UpdateBrokerTypeOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateBrokerTypeResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::UpdateClusterConfigurationRequest&, const Model::UpdateClusterConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateClusterConfigurationResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::UpdateClusterKafkaVersionRequest&, const Model::UpdateClusterKafkaVersionOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateClusterKafkaVersionResponseReceivedHandler;
+    typedef std::function<void(const KafkaClient*, const Model::UpdateConfigurationRequest&, const Model::UpdateConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateConfigurationResponseReceivedHandler;
+    typedef std::function<void(const KafkaClient*, const Model::UpdateConnectivityRequest&, const Model::UpdateConnectivityOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateConnectivityResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::UpdateMonitoringRequest&, const Model::UpdateMonitoringOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateMonitoringResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::UpdateReplicationInfoRequest&, const Model::UpdateReplicationInfoOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateReplicationInfoResponseReceivedHandler;
     typedef std::function<void(const KafkaClient*, const Model::UpdateSecurityRequest&, const Model::UpdateSecurityOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateSecurityResponseReceivedHandler;
diff --git a/generated/src/aws-cpp-sdk-kafka/source/KafkaClient.cpp b/generated/src/aws-cpp-sdk-kafka/source/KafkaClient.cpp
index db7e16f7135..787d211e716 100644
--- a/generated/src/aws-cpp-sdk-kafka/source/KafkaClient.cpp
+++ b/generated/src/aws-cpp-sdk-kafka/source/KafkaClient.cpp
@@ -22,6 +22,7 @@
 #include <aws/kafka/KafkaErrorMarshaller.h>
 #include <aws/kafka/KafkaEndpointProvider.h>
 #include <aws/kafka/model/BatchAssociateScramSecretRequest.h>
+#include <aws/kafka/model/BatchDisassociateScramSecretRequest.h>
 #include <aws/kafka/model/CreateClusterRequest.h>
 #include <aws/kafka/model/CreateClusterV2Request.h>
 #include <aws/kafka/model/CreateConfigurationRequest.h>
@@ -33,17 +34,17 @@
 #include <aws/kafka/model/DeleteReplicatorRequest.h>
 #include <aws/kafka/model/DeleteVpcConnectionRequest.h>
 #include <aws/kafka/model/DescribeClusterRequest.h>
-#include <aws/kafka/model/DescribeClusterV2Request.h>
 #include <aws/kafka/model/DescribeClusterOperationRequest.h>
 #include <aws/kafka/model/DescribeClusterOperationV2Request.h>
+#include <aws/kafka/model/DescribeClusterV2Request.h>
 #include <aws/kafka/model/DescribeConfigurationRequest.h>
 #include <aws/kafka/model/DescribeConfigurationRevisionRequest.h>
 #include <aws/kafka/model/DescribeReplicatorRequest.h>
 #include <aws/kafka/model/DescribeVpcConnectionRequest.h>
-#include <aws/kafka/model/BatchDisassociateScramSecretRequest.h>
 #include <aws/kafka/model/GetBootstrapBrokersRequest.h>
-#include <aws/kafka/model/GetCompatibleKafkaVersionsRequest.h>
 #include <aws/kafka/model/GetClusterPolicyRequest.h>
+#include <aws/kafka/model/GetCompatibleKafkaVersionsRequest.h>
+#include <aws/kafka/model/ListClientVpcConnectionsRequest.h>
 #include <aws/kafka/model/ListClusterOperationsRequest.h>
 #include <aws/kafka/model/ListClusterOperationsV2Request.h>
 #include <aws/kafka/model/ListClustersRequest.h>
@@ -55,20 +56,19 @@
 #include <aws/kafka/model/ListReplicatorsRequest.h>
 #include <aws/kafka/model/ListScramSecretsRequest.h>
 #include <aws/kafka/model/ListTagsForResourceRequest.h>
-#include <aws/kafka/model/ListClientVpcConnectionsRequest.h>
 #include <aws/kafka/model/ListVpcConnectionsRequest.h>
-#include <aws/kafka/model/RejectClientVpcConnectionRequest.h>
 #include <aws/kafka/model/PutClusterPolicyRequest.h>
 #include <aws/kafka/model/RebootBrokerRequest.h>
+#include <aws/kafka/model/RejectClientVpcConnectionRequest.h>
 #include <aws/kafka/model/TagResourceRequest.h>
 #include <aws/kafka/model/UntagResourceRequest.h>
 #include <aws/kafka/model/UpdateBrokerCountRequest.h>
-#include <aws/kafka/model/UpdateBrokerTypeRequest.h>
 #include <aws/kafka/model/UpdateBrokerStorageRequest.h>
-#include <aws/kafka/model/UpdateConfigurationRequest.h>
-#include <aws/kafka/model/UpdateConnectivityRequest.h>
+#include <aws/kafka/model/UpdateBrokerTypeRequest.h>
 #include <aws/kafka/model/UpdateClusterConfigurationRequest.h>
 #include <aws/kafka/model/UpdateClusterKafkaVersionRequest.h>
+#include <aws/kafka/model/UpdateConfigurationRequest.h>
+#include <aws/kafka/model/UpdateConnectivityRequest.h>
 #include <aws/kafka/model/UpdateMonitoringRequest.h>
 #include <aws/kafka/model/UpdateReplicationInfoRequest.h>
 #include <aws/kafka/model/UpdateSecurityRequest.h>
@@ -240,6 +240,40 @@ BatchAssociateScramSecretOutcome KafkaClient::BatchAssociateScramSecret(const Ba
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+BatchDisassociateScramSecretOutcome KafkaClient::BatchDisassociateScramSecret(const BatchDisassociateScramSecretRequest& request) const
+{
+  AWS_OPERATION_GUARD(BatchDisassociateScramSecret);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, BatchDisassociateScramSecret, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ClusterArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("BatchDisassociateScramSecret", "Required field: ClusterArn, is not set");
+    return BatchDisassociateScramSecretOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, BatchDisassociateScramSecret, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, BatchDisassociateScramSecret, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".BatchDisassociateScramSecret",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<BatchDisassociateScramSecretOutcome>(
+    [&]()-> BatchDisassociateScramSecretOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, BatchDisassociateScramSecret, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/scram-secrets");
+      return BatchDisassociateScramSecretOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PATCH, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 CreateClusterOutcome KafkaClient::CreateCluster(const CreateClusterRequest& request) const
 {
   AWS_OPERATION_GUARD(CreateCluster);
@@ -574,39 +608,6 @@ DescribeClusterOutcome KafkaClient::DescribeCluster(const DescribeClusterRequest
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-DescribeClusterV2Outcome KafkaClient::DescribeClusterV2(const DescribeClusterV2Request& request) const
-{
-  AWS_OPERATION_GUARD(DescribeClusterV2);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, DescribeClusterV2, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  if (!request.ClusterArnHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("DescribeClusterV2", "Required field: ClusterArn, is not set");
-    return DescribeClusterV2Outcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
-  }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, DescribeClusterV2, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, DescribeClusterV2, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".DescribeClusterV2",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<DescribeClusterV2Outcome>(
-    [&]()-> DescribeClusterV2Outcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, DescribeClusterV2, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/api/v2/clusters/");
-      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
-      return DescribeClusterV2Outcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 DescribeClusterOperationOutcome KafkaClient::DescribeClusterOperation(const DescribeClusterOperationRequest& request) const
 {
   AWS_OPERATION_GUARD(DescribeClusterOperation);
@@ -673,6 +674,39 @@ DescribeClusterOperationV2Outcome KafkaClient::DescribeClusterOperationV2(const
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+DescribeClusterV2Outcome KafkaClient::DescribeClusterV2(const DescribeClusterV2Request& request) const
+{
+  AWS_OPERATION_GUARD(DescribeClusterV2);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, DescribeClusterV2, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ClusterArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("DescribeClusterV2", "Required field: ClusterArn, is not set");
+    return DescribeClusterV2Outcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, DescribeClusterV2, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, DescribeClusterV2, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".DescribeClusterV2",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<DescribeClusterV2Outcome>(
+    [&]()-> DescribeClusterV2Outcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, DescribeClusterV2, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/api/v2/clusters/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
+      return DescribeClusterV2Outcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 DescribeConfigurationOutcome KafkaClient::DescribeConfiguration(const DescribeConfigurationRequest& request) const
 {
   AWS_OPERATION_GUARD(DescribeConfiguration);
@@ -812,68 +846,68 @@ DescribeVpcConnectionOutcome KafkaClient::DescribeVpcConnection(const DescribeVp
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-BatchDisassociateScramSecretOutcome KafkaClient::BatchDisassociateScramSecret(const BatchDisassociateScramSecretRequest& request) const
+GetBootstrapBrokersOutcome KafkaClient::GetBootstrapBrokers(const GetBootstrapBrokersRequest& request) const
 {
-  AWS_OPERATION_GUARD(BatchDisassociateScramSecret);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, BatchDisassociateScramSecret, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_GUARD(GetBootstrapBrokers);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, GetBootstrapBrokers, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
   if (!request.ClusterArnHasBeenSet())
   {
-    AWS_LOGSTREAM_ERROR("BatchDisassociateScramSecret", "Required field: ClusterArn, is not set");
-    return BatchDisassociateScramSecretOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
+    AWS_LOGSTREAM_ERROR("GetBootstrapBrokers", "Required field: ClusterArn, is not set");
+    return GetBootstrapBrokersOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
   }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, BatchDisassociateScramSecret, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, GetBootstrapBrokers, CoreErrors, CoreErrors::NOT_INITIALIZED);
   auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
   auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, BatchDisassociateScramSecret, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".BatchDisassociateScramSecret",
+  AWS_OPERATION_CHECK_PTR(meter, GetBootstrapBrokers, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".GetBootstrapBrokers",
     {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
     smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<BatchDisassociateScramSecretOutcome>(
-    [&]()-> BatchDisassociateScramSecretOutcome {
+  return TracingUtils::MakeCallWithTiming<GetBootstrapBrokersOutcome>(
+    [&]()-> GetBootstrapBrokersOutcome {
       auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
           [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
           TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
           *meter,
           {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, BatchDisassociateScramSecret, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, GetBootstrapBrokers, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
       endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
       endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/scram-secrets");
-      return BatchDisassociateScramSecretOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PATCH, Aws::Auth::SIGV4_SIGNER));
+      endpointResolutionOutcome.GetResult().AddPathSegments("/bootstrap-brokers");
+      return GetBootstrapBrokersOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
     },
     TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
     *meter,
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-GetBootstrapBrokersOutcome KafkaClient::GetBootstrapBrokers(const GetBootstrapBrokersRequest& request) const
+GetClusterPolicyOutcome KafkaClient::GetClusterPolicy(const GetClusterPolicyRequest& request) const
 {
-  AWS_OPERATION_GUARD(GetBootstrapBrokers);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, GetBootstrapBrokers, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_GUARD(GetClusterPolicy);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, GetClusterPolicy, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
   if (!request.ClusterArnHasBeenSet())
   {
-    AWS_LOGSTREAM_ERROR("GetBootstrapBrokers", "Required field: ClusterArn, is not set");
-    return GetBootstrapBrokersOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
+    AWS_LOGSTREAM_ERROR("GetClusterPolicy", "Required field: ClusterArn, is not set");
+    return GetClusterPolicyOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
   }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, GetBootstrapBrokers, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, GetClusterPolicy, CoreErrors, CoreErrors::NOT_INITIALIZED);
   auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
   auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, GetBootstrapBrokers, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".GetBootstrapBrokers",
+  AWS_OPERATION_CHECK_PTR(meter, GetClusterPolicy, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".GetClusterPolicy",
     {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
     smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<GetBootstrapBrokersOutcome>(
-    [&]()-> GetBootstrapBrokersOutcome {
+  return TracingUtils::MakeCallWithTiming<GetClusterPolicyOutcome>(
+    [&]()-> GetClusterPolicyOutcome {
       auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
           [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
           TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
           *meter,
           {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, GetBootstrapBrokers, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, GetClusterPolicy, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
       endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
       endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/bootstrap-brokers");
-      return GetBootstrapBrokersOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
+      endpointResolutionOutcome.GetResult().AddPathSegments("/policy");
+      return GetClusterPolicyOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
     },
     TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
     *meter,
@@ -907,34 +941,34 @@ GetCompatibleKafkaVersionsOutcome KafkaClient::GetCompatibleKafkaVersions(const
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-GetClusterPolicyOutcome KafkaClient::GetClusterPolicy(const GetClusterPolicyRequest& request) const
+ListClientVpcConnectionsOutcome KafkaClient::ListClientVpcConnections(const ListClientVpcConnectionsRequest& request) const
 {
-  AWS_OPERATION_GUARD(GetClusterPolicy);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, GetClusterPolicy, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_GUARD(ListClientVpcConnections);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, ListClientVpcConnections, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
   if (!request.ClusterArnHasBeenSet())
   {
-    AWS_LOGSTREAM_ERROR("GetClusterPolicy", "Required field: ClusterArn, is not set");
-    return GetClusterPolicyOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
+    AWS_LOGSTREAM_ERROR("ListClientVpcConnections", "Required field: ClusterArn, is not set");
+    return ListClientVpcConnectionsOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
   }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, GetClusterPolicy, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, ListClientVpcConnections, CoreErrors, CoreErrors::NOT_INITIALIZED);
   auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
   auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, GetClusterPolicy, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".GetClusterPolicy",
+  AWS_OPERATION_CHECK_PTR(meter, ListClientVpcConnections, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".ListClientVpcConnections",
     {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
     smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<GetClusterPolicyOutcome>(
-    [&]()-> GetClusterPolicyOutcome {
+  return TracingUtils::MakeCallWithTiming<ListClientVpcConnectionsOutcome>(
+    [&]()-> ListClientVpcConnectionsOutcome {
       auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
           [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
           TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
           *meter,
           {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, GetClusterPolicy, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ListClientVpcConnections, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
       endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
       endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/policy");
-      return GetClusterPolicyOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
+      endpointResolutionOutcome.GetResult().AddPathSegments("/client-vpc-connections");
+      return ListClientVpcConnectionsOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
     },
     TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
     *meter,
@@ -1279,40 +1313,6 @@ ListTagsForResourceOutcome KafkaClient::ListTagsForResource(const ListTagsForRes
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-ListClientVpcConnectionsOutcome KafkaClient::ListClientVpcConnections(const ListClientVpcConnectionsRequest& request) const
-{
-  AWS_OPERATION_GUARD(ListClientVpcConnections);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, ListClientVpcConnections, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  if (!request.ClusterArnHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("ListClientVpcConnections", "Required field: ClusterArn, is not set");
-    return ListClientVpcConnectionsOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
-  }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, ListClientVpcConnections, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, ListClientVpcConnections, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".ListClientVpcConnections",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<ListClientVpcConnectionsOutcome>(
-    [&]()-> ListClientVpcConnectionsOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, ListClientVpcConnections, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
-      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/client-vpc-connections");
-      return ListClientVpcConnectionsOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 ListVpcConnectionsOutcome KafkaClient::ListVpcConnections(const ListVpcConnectionsRequest& request) const
 {
   AWS_OPERATION_GUARD(ListVpcConnections);
@@ -1340,40 +1340,6 @@ ListVpcConnectionsOutcome KafkaClient::ListVpcConnections(const ListVpcConnectio
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-RejectClientVpcConnectionOutcome KafkaClient::RejectClientVpcConnection(const RejectClientVpcConnectionRequest& request) const
-{
-  AWS_OPERATION_GUARD(RejectClientVpcConnection);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, RejectClientVpcConnection, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  if (!request.ClusterArnHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("RejectClientVpcConnection", "Required field: ClusterArn, is not set");
-    return RejectClientVpcConnectionOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
-  }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, RejectClientVpcConnection, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, RejectClientVpcConnection, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".RejectClientVpcConnection",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<RejectClientVpcConnectionOutcome>(
-    [&]()-> RejectClientVpcConnectionOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, RejectClientVpcConnection, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
-      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/client-vpc-connection");
-      return RejectClientVpcConnectionOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 PutClusterPolicyOutcome KafkaClient::PutClusterPolicy(const PutClusterPolicyRequest& request) const
 {
   AWS_OPERATION_GUARD(PutClusterPolicy);
@@ -1442,6 +1408,40 @@ RebootBrokerOutcome KafkaClient::RebootBroker(const RebootBrokerRequest& request
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+RejectClientVpcConnectionOutcome KafkaClient::RejectClientVpcConnection(const RejectClientVpcConnectionRequest& request) const
+{
+  AWS_OPERATION_GUARD(RejectClientVpcConnection);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, RejectClientVpcConnection, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ClusterArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("RejectClientVpcConnection", "Required field: ClusterArn, is not set");
+    return RejectClientVpcConnectionOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, RejectClientVpcConnection, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, RejectClientVpcConnection, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".RejectClientVpcConnection",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<RejectClientVpcConnectionOutcome>(
+    [&]()-> RejectClientVpcConnectionOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, RejectClientVpcConnection, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/client-vpc-connection");
+      return RejectClientVpcConnectionOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 TagResourceOutcome KafkaClient::TagResource(const TagResourceRequest& request) const
 {
   AWS_OPERATION_GUARD(TagResource);
@@ -1547,40 +1547,6 @@ UpdateBrokerCountOutcome KafkaClient::UpdateBrokerCount(const UpdateBrokerCountR
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-UpdateBrokerTypeOutcome KafkaClient::UpdateBrokerType(const UpdateBrokerTypeRequest& request) const
-{
-  AWS_OPERATION_GUARD(UpdateBrokerType);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateBrokerType, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  if (!request.ClusterArnHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("UpdateBrokerType", "Required field: ClusterArn, is not set");
-    return UpdateBrokerTypeOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
-  }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateBrokerType, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, UpdateBrokerType, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateBrokerType",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<UpdateBrokerTypeOutcome>(
-    [&]()-> UpdateBrokerTypeOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateBrokerType, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
-      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/nodes/type");
-      return UpdateBrokerTypeOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 UpdateBrokerStorageOutcome KafkaClient::UpdateBrokerStorage(const UpdateBrokerStorageRequest& request) const
 {
   AWS_OPERATION_GUARD(UpdateBrokerStorage);
@@ -1615,67 +1581,34 @@ UpdateBrokerStorageOutcome KafkaClient::UpdateBrokerStorage(const UpdateBrokerSt
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-UpdateConfigurationOutcome KafkaClient::UpdateConfiguration(const UpdateConfigurationRequest& request) const
-{
-  AWS_OPERATION_GUARD(UpdateConfiguration);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  if (!request.ArnHasBeenSet())
-  {
-    AWS_LOGSTREAM_ERROR("UpdateConfiguration", "Required field: Arn, is not set");
-    return UpdateConfigurationOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Arn]", false));
-  }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, UpdateConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateConfiguration",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<UpdateConfigurationOutcome>(
-    [&]()-> UpdateConfigurationOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/v1/configurations/");
-      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetArn());
-      return UpdateConfigurationOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
-UpdateConnectivityOutcome KafkaClient::UpdateConnectivity(const UpdateConnectivityRequest& request) const
+UpdateBrokerTypeOutcome KafkaClient::UpdateBrokerType(const UpdateBrokerTypeRequest& request) const
 {
-  AWS_OPERATION_GUARD(UpdateConnectivity);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateConnectivity, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_GUARD(UpdateBrokerType);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateBrokerType, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
   if (!request.ClusterArnHasBeenSet())
   {
-    AWS_LOGSTREAM_ERROR("UpdateConnectivity", "Required field: ClusterArn, is not set");
-    return UpdateConnectivityOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
+    AWS_LOGSTREAM_ERROR("UpdateBrokerType", "Required field: ClusterArn, is not set");
+    return UpdateBrokerTypeOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
   }
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateConnectivity, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateBrokerType, CoreErrors, CoreErrors::NOT_INITIALIZED);
   auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
   auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, UpdateConnectivity, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateConnectivity",
+  AWS_OPERATION_CHECK_PTR(meter, UpdateBrokerType, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateBrokerType",
     {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
     smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<UpdateConnectivityOutcome>(
-    [&]()-> UpdateConnectivityOutcome {
+  return TracingUtils::MakeCallWithTiming<UpdateBrokerTypeOutcome>(
+    [&]()-> UpdateBrokerTypeOutcome {
       auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
           [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
           TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
           *meter,
           {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateConnectivity, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateBrokerType, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
       endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
       endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/connectivity");
-      return UpdateConnectivityOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
+      endpointResolutionOutcome.GetResult().AddPathSegments("/nodes/type");
+      return UpdateBrokerTypeOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
     },
     TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
     *meter,
@@ -1750,6 +1683,73 @@ UpdateClusterKafkaVersionOutcome KafkaClient::UpdateClusterKafkaVersion(const Up
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+UpdateConfigurationOutcome KafkaClient::UpdateConfiguration(const UpdateConfigurationRequest& request) const
+{
+  AWS_OPERATION_GUARD(UpdateConfiguration);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("UpdateConfiguration", "Required field: Arn, is not set");
+    return UpdateConfigurationOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Arn]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, UpdateConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateConfiguration",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<UpdateConfigurationOutcome>(
+    [&]()-> UpdateConfigurationOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/v1/configurations/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetArn());
+      return UpdateConfigurationOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
+UpdateConnectivityOutcome KafkaClient::UpdateConnectivity(const UpdateConnectivityRequest& request) const
+{
+  AWS_OPERATION_GUARD(UpdateConnectivity);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateConnectivity, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  if (!request.ClusterArnHasBeenSet())
+  {
+    AWS_LOGSTREAM_ERROR("UpdateConnectivity", "Required field: ClusterArn, is not set");
+    return UpdateConnectivityOutcome(Aws::Client::AWSError<KafkaErrors>(KafkaErrors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [ClusterArn]", false));
+  }
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateConnectivity, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, UpdateConnectivity, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateConnectivity",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<UpdateConnectivityOutcome>(
+    [&]()-> UpdateConnectivityOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateConnectivity, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/v1/clusters/");
+      endpointResolutionOutcome.GetResult().AddPathSegment(request.GetClusterArn());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/connectivity");
+      return UpdateConnectivityOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 UpdateMonitoringOutcome KafkaClient::UpdateMonitoring(const UpdateMonitoringRequest& request) const
 {
   AWS_OPERATION_GUARD(UpdateMonitoring);
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/KendraClient.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/KendraClient.h
index 945e0c8b1ed..cd533d5a154 100644
--- a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/KendraClient.h
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/KendraClient.h
@@ -1599,22 +1599,29 @@ namespace kendra
         }
 
         /**
-         * <p>Searches an index given an input query.</p> <p>You can configure boosting or
-         * relevance tuning at the query level to override boosting at the index level,
-         * filter based on document fields/attributes and faceted search, and filter based
-         * on the user or their group access to documents. You can also include certain
-         * fields in the response that might provide useful additional information.</p>
-         * <p>A query response contains three types of results.</p> <ul> <li> <p>Relevant
-         * suggested answers. The answers can be either a text excerpt or table excerpt.
-         * The answer can be highlighted in the excerpt.</p> </li> <li> <p>Matching FAQs or
-         * questions-answer from your FAQ file.</p> </li> <li> <p>Relevant documents. This
-         * result type includes an excerpt of the document with the document title. The
-         * searched terms can be highlighted in the excerpt.</p> </li> </ul> <p>You can
-         * specify that the query return only one type of result using the
-         * <code>QueryResultTypeFilter</code> parameter. Each query returns the 100 most
-         * relevant results. If you filter result type to only question-answers, a maximum
-         * of four results are returned. If you filter result type to only answers, a
-         * maximum of three results are returned.</p><p><h3>See Also:</h3>   <a
+         * <p>Searches an index given an input query.</p>  <p>If you are working with
+         * large language models (LLMs) or implementing retrieval augmented generation
+         * (RAG) systems, you can use Amazon Kendra's <a
+         * href="https://docs.aws.amazon.com/kendra/latest/APIReference/API_Retrieve.html">Retrieve</a>
+         * API, which can return longer semantically relevant passages. We recommend using
+         * the <code>Retrieve</code> API instead of filing a service limit increase to
+         * increase the <code>Query</code> API document excerpt length.</p>  <p>You
+         * can configure boosting or relevance tuning at the query level to override
+         * boosting at the index level, filter based on document fields/attributes and
+         * faceted search, and filter based on the user or their group access to documents.
+         * You can also include certain fields in the response that might provide useful
+         * additional information.</p> <p>A query response contains three types of
+         * results.</p> <ul> <li> <p>Relevant suggested answers. The answers can be either
+         * a text excerpt or table excerpt. The answer can be highlighted in the
+         * excerpt.</p> </li> <li> <p>Matching FAQs or questions-answer from your FAQ
+         * file.</p> </li> <li> <p>Relevant documents. This result type includes an excerpt
+         * of the document with the document title. The searched terms can be highlighted
+         * in the excerpt.</p> </li> </ul> <p>You can specify that the query return only
+         * one type of result using the <code>QueryResultTypeFilter</code> parameter. Each
+         * query returns the 100 most relevant results. If you filter result type to only
+         * question-answers, a maximum of four results are returned. If you filter result
+         * type to only answers, a maximum of three results are returned.</p><p><h3>See
+         * Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/kendra-2019-02-03/Query">AWS API
          * Reference</a></p>
          */
@@ -1653,9 +1660,13 @@ namespace kendra
          * and its types of responses.</p> <p>You can also do the following:</p> <ul> <li>
          * <p>Override boosting at the index level</p> </li> <li> <p>Filter based on
          * document fields or attributes</p> </li> <li> <p>Filter based on the user or
-         * their group access to documents</p> </li> </ul> <p>You can also include certain
-         * fields in the response that might provide useful additional information.</p>
-         * <p>The <code>Retrieve</code> API shares the number of <a
+         * their group access to documents</p> </li> <li> <p>View the confidence score
+         * bucket for a retrieved passage result. The confidence bucket provides a relative
+         * ranking that indicates how confident Amazon Kendra is that the response is
+         * relevant to the query.</p>  <p>Confidence score buckets are currently
+         * available only for English.</p>  </li> </ul> <p>You can also include
+         * certain fields in the response that might provide useful additional
+         * information.</p> <p>The <code>Retrieve</code> API shares the number of <a
          * href="https://docs.aws.amazon.com/kendra/latest/APIReference/API_CapacityUnitsConfiguration.html">query
          * capacity units</a> that you set for your index. For more information on what's
          * included in a single capacity unit and the default base capacity for an index,
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CollapseConfiguration.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CollapseConfiguration.h
new file mode 100644
index 00000000000..0db3547bfe4
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CollapseConfiguration.h
@@ -0,0 +1,310 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/kendra/Kendra_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/kendra/model/MissingAttributeKeyStrategy.h>
+#include <aws/kendra/model/ExpandConfiguration.h>
+#include <aws/kendra/model/SortingConfiguration.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace kendra
+{
+namespace Model
+{
+
+  /**
+   * <p>Specifies how to group results by document attribute value, and how to
+   * display them collapsed/expanded under a designated primary document for each
+   * group.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/kendra-2019-02-03/CollapseConfiguration">AWS
+   * API Reference</a></p>
+   */
+  class CollapseConfiguration
+  {
+  public:
+    AWS_KENDRA_API CollapseConfiguration();
+    AWS_KENDRA_API CollapseConfiguration(Aws::Utils::Json::JsonView jsonValue);
+    AWS_KENDRA_API CollapseConfiguration& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_KENDRA_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p>The document attribute used to group search results. You can use any
+     * attribute that has the <code>Sortable</code> flag set to true. You can also sort
+     * by any of the following built-in attributes:"_category","_created_at",
+     * "_last_updated_at", "_version", "_view_count".</p>
+     */
+    inline const Aws::String& GetDocumentAttributeKey() const{ return m_documentAttributeKey; }
+
+    /**
+     * <p>The document attribute used to group search results. You can use any
+     * attribute that has the <code>Sortable</code> flag set to true. You can also sort
+     * by any of the following built-in attributes:"_category","_created_at",
+     * "_last_updated_at", "_version", "_view_count".</p>
+     */
+    inline bool DocumentAttributeKeyHasBeenSet() const { return m_documentAttributeKeyHasBeenSet; }
+
+    /**
+     * <p>The document attribute used to group search results. You can use any
+     * attribute that has the <code>Sortable</code> flag set to true. You can also sort
+     * by any of the following built-in attributes:"_category","_created_at",
+     * "_last_updated_at", "_version", "_view_count".</p>
+     */
+    inline void SetDocumentAttributeKey(const Aws::String& value) { m_documentAttributeKeyHasBeenSet = true; m_documentAttributeKey = value; }
+
+    /**
+     * <p>The document attribute used to group search results. You can use any
+     * attribute that has the <code>Sortable</code> flag set to true. You can also sort
+     * by any of the following built-in attributes:"_category","_created_at",
+     * "_last_updated_at", "_version", "_view_count".</p>
+     */
+    inline void SetDocumentAttributeKey(Aws::String&& value) { m_documentAttributeKeyHasBeenSet = true; m_documentAttributeKey = std::move(value); }
+
+    /**
+     * <p>The document attribute used to group search results. You can use any
+     * attribute that has the <code>Sortable</code> flag set to true. You can also sort
+     * by any of the following built-in attributes:"_category","_created_at",
+     * "_last_updated_at", "_version", "_view_count".</p>
+     */
+    inline void SetDocumentAttributeKey(const char* value) { m_documentAttributeKeyHasBeenSet = true; m_documentAttributeKey.assign(value); }
+
+    /**
+     * <p>The document attribute used to group search results. You can use any
+     * attribute that has the <code>Sortable</code> flag set to true. You can also sort
+     * by any of the following built-in attributes:"_category","_created_at",
+     * "_last_updated_at", "_version", "_view_count".</p>
+     */
+    inline CollapseConfiguration& WithDocumentAttributeKey(const Aws::String& value) { SetDocumentAttributeKey(value); return *this;}
+
+    /**
+     * <p>The document attribute used to group search results. You can use any
+     * attribute that has the <code>Sortable</code> flag set to true. You can also sort
+     * by any of the following built-in attributes:"_category","_created_at",
+     * "_last_updated_at", "_version", "_view_count".</p>
+     */
+    inline CollapseConfiguration& WithDocumentAttributeKey(Aws::String&& value) { SetDocumentAttributeKey(std::move(value)); return *this;}
+
+    /**
+     * <p>The document attribute used to group search results. You can use any
+     * attribute that has the <code>Sortable</code> flag set to true. You can also sort
+     * by any of the following built-in attributes:"_category","_created_at",
+     * "_last_updated_at", "_version", "_view_count".</p>
+     */
+    inline CollapseConfiguration& WithDocumentAttributeKey(const char* value) { SetDocumentAttributeKey(value); return *this;}
+
+
+    /**
+     * <p>A prioritized list of document attributes/fields that determine the primary
+     * document among those in a collapsed group.</p>
+     */
+    inline const Aws::Vector<SortingConfiguration>& GetSortingConfigurations() const{ return m_sortingConfigurations; }
+
+    /**
+     * <p>A prioritized list of document attributes/fields that determine the primary
+     * document among those in a collapsed group.</p>
+     */
+    inline bool SortingConfigurationsHasBeenSet() const { return m_sortingConfigurationsHasBeenSet; }
+
+    /**
+     * <p>A prioritized list of document attributes/fields that determine the primary
+     * document among those in a collapsed group.</p>
+     */
+    inline void SetSortingConfigurations(const Aws::Vector<SortingConfiguration>& value) { m_sortingConfigurationsHasBeenSet = true; m_sortingConfigurations = value; }
+
+    /**
+     * <p>A prioritized list of document attributes/fields that determine the primary
+     * document among those in a collapsed group.</p>
+     */
+    inline void SetSortingConfigurations(Aws::Vector<SortingConfiguration>&& value) { m_sortingConfigurationsHasBeenSet = true; m_sortingConfigurations = std::move(value); }
+
+    /**
+     * <p>A prioritized list of document attributes/fields that determine the primary
+     * document among those in a collapsed group.</p>
+     */
+    inline CollapseConfiguration& WithSortingConfigurations(const Aws::Vector<SortingConfiguration>& value) { SetSortingConfigurations(value); return *this;}
+
+    /**
+     * <p>A prioritized list of document attributes/fields that determine the primary
+     * document among those in a collapsed group.</p>
+     */
+    inline CollapseConfiguration& WithSortingConfigurations(Aws::Vector<SortingConfiguration>&& value) { SetSortingConfigurations(std::move(value)); return *this;}
+
+    /**
+     * <p>A prioritized list of document attributes/fields that determine the primary
+     * document among those in a collapsed group.</p>
+     */
+    inline CollapseConfiguration& AddSortingConfigurations(const SortingConfiguration& value) { m_sortingConfigurationsHasBeenSet = true; m_sortingConfigurations.push_back(value); return *this; }
+
+    /**
+     * <p>A prioritized list of document attributes/fields that determine the primary
+     * document among those in a collapsed group.</p>
+     */
+    inline CollapseConfiguration& AddSortingConfigurations(SortingConfiguration&& value) { m_sortingConfigurationsHasBeenSet = true; m_sortingConfigurations.push_back(std::move(value)); return *this; }
+
+
+    /**
+     * <p>Specifies the behavior for documents without a value for the collapse
+     * attribute.</p> <p>Amazon Kendra offers three customization options:</p> <ul>
+     * <li> <p>Choose to <code>COLLAPSE</code> all documents with null or missing
+     * values in one group. This is the default configuration.</p> </li> <li> <p>Choose
+     * to <code>IGNORE</code> documents with null or missing values. Ignored documents
+     * will not appear in query results.</p> </li> <li> <p>Choose to
+     * <code>EXPAND</code> each document with a null or missing value into a group of
+     * its own.</p> </li> </ul>
+     */
+    inline const MissingAttributeKeyStrategy& GetMissingAttributeKeyStrategy() const{ return m_missingAttributeKeyStrategy; }
+
+    /**
+     * <p>Specifies the behavior for documents without a value for the collapse
+     * attribute.</p> <p>Amazon Kendra offers three customization options:</p> <ul>
+     * <li> <p>Choose to <code>COLLAPSE</code> all documents with null or missing
+     * values in one group. This is the default configuration.</p> </li> <li> <p>Choose
+     * to <code>IGNORE</code> documents with null or missing values. Ignored documents
+     * will not appear in query results.</p> </li> <li> <p>Choose to
+     * <code>EXPAND</code> each document with a null or missing value into a group of
+     * its own.</p> </li> </ul>
+     */
+    inline bool MissingAttributeKeyStrategyHasBeenSet() const { return m_missingAttributeKeyStrategyHasBeenSet; }
+
+    /**
+     * <p>Specifies the behavior for documents without a value for the collapse
+     * attribute.</p> <p>Amazon Kendra offers three customization options:</p> <ul>
+     * <li> <p>Choose to <code>COLLAPSE</code> all documents with null or missing
+     * values in one group. This is the default configuration.</p> </li> <li> <p>Choose
+     * to <code>IGNORE</code> documents with null or missing values. Ignored documents
+     * will not appear in query results.</p> </li> <li> <p>Choose to
+     * <code>EXPAND</code> each document with a null or missing value into a group of
+     * its own.</p> </li> </ul>
+     */
+    inline void SetMissingAttributeKeyStrategy(const MissingAttributeKeyStrategy& value) { m_missingAttributeKeyStrategyHasBeenSet = true; m_missingAttributeKeyStrategy = value; }
+
+    /**
+     * <p>Specifies the behavior for documents without a value for the collapse
+     * attribute.</p> <p>Amazon Kendra offers three customization options:</p> <ul>
+     * <li> <p>Choose to <code>COLLAPSE</code> all documents with null or missing
+     * values in one group. This is the default configuration.</p> </li> <li> <p>Choose
+     * to <code>IGNORE</code> documents with null or missing values. Ignored documents
+     * will not appear in query results.</p> </li> <li> <p>Choose to
+     * <code>EXPAND</code> each document with a null or missing value into a group of
+     * its own.</p> </li> </ul>
+     */
+    inline void SetMissingAttributeKeyStrategy(MissingAttributeKeyStrategy&& value) { m_missingAttributeKeyStrategyHasBeenSet = true; m_missingAttributeKeyStrategy = std::move(value); }
+
+    /**
+     * <p>Specifies the behavior for documents without a value for the collapse
+     * attribute.</p> <p>Amazon Kendra offers three customization options:</p> <ul>
+     * <li> <p>Choose to <code>COLLAPSE</code> all documents with null or missing
+     * values in one group. This is the default configuration.</p> </li> <li> <p>Choose
+     * to <code>IGNORE</code> documents with null or missing values. Ignored documents
+     * will not appear in query results.</p> </li> <li> <p>Choose to
+     * <code>EXPAND</code> each document with a null or missing value into a group of
+     * its own.</p> </li> </ul>
+     */
+    inline CollapseConfiguration& WithMissingAttributeKeyStrategy(const MissingAttributeKeyStrategy& value) { SetMissingAttributeKeyStrategy(value); return *this;}
+
+    /**
+     * <p>Specifies the behavior for documents without a value for the collapse
+     * attribute.</p> <p>Amazon Kendra offers three customization options:</p> <ul>
+     * <li> <p>Choose to <code>COLLAPSE</code> all documents with null or missing
+     * values in one group. This is the default configuration.</p> </li> <li> <p>Choose
+     * to <code>IGNORE</code> documents with null or missing values. Ignored documents
+     * will not appear in query results.</p> </li> <li> <p>Choose to
+     * <code>EXPAND</code> each document with a null or missing value into a group of
+     * its own.</p> </li> </ul>
+     */
+    inline CollapseConfiguration& WithMissingAttributeKeyStrategy(MissingAttributeKeyStrategy&& value) { SetMissingAttributeKeyStrategy(std::move(value)); return *this;}
+
+
+    /**
+     * <p>Specifies whether to expand the collapsed results.</p>
+     */
+    inline bool GetExpand() const{ return m_expand; }
+
+    /**
+     * <p>Specifies whether to expand the collapsed results.</p>
+     */
+    inline bool ExpandHasBeenSet() const { return m_expandHasBeenSet; }
+
+    /**
+     * <p>Specifies whether to expand the collapsed results.</p>
+     */
+    inline void SetExpand(bool value) { m_expandHasBeenSet = true; m_expand = value; }
+
+    /**
+     * <p>Specifies whether to expand the collapsed results.</p>
+     */
+    inline CollapseConfiguration& WithExpand(bool value) { SetExpand(value); return *this;}
+
+
+    /**
+     * <p>Provides configuration information to customize expansion options for a
+     * collapsed group.</p>
+     */
+    inline const ExpandConfiguration& GetExpandConfiguration() const{ return m_expandConfiguration; }
+
+    /**
+     * <p>Provides configuration information to customize expansion options for a
+     * collapsed group.</p>
+     */
+    inline bool ExpandConfigurationHasBeenSet() const { return m_expandConfigurationHasBeenSet; }
+
+    /**
+     * <p>Provides configuration information to customize expansion options for a
+     * collapsed group.</p>
+     */
+    inline void SetExpandConfiguration(const ExpandConfiguration& value) { m_expandConfigurationHasBeenSet = true; m_expandConfiguration = value; }
+
+    /**
+     * <p>Provides configuration information to customize expansion options for a
+     * collapsed group.</p>
+     */
+    inline void SetExpandConfiguration(ExpandConfiguration&& value) { m_expandConfigurationHasBeenSet = true; m_expandConfiguration = std::move(value); }
+
+    /**
+     * <p>Provides configuration information to customize expansion options for a
+     * collapsed group.</p>
+     */
+    inline CollapseConfiguration& WithExpandConfiguration(const ExpandConfiguration& value) { SetExpandConfiguration(value); return *this;}
+
+    /**
+     * <p>Provides configuration information to customize expansion options for a
+     * collapsed group.</p>
+     */
+    inline CollapseConfiguration& WithExpandConfiguration(ExpandConfiguration&& value) { SetExpandConfiguration(std::move(value)); return *this;}
+
+  private:
+
+    Aws::String m_documentAttributeKey;
+    bool m_documentAttributeKeyHasBeenSet = false;
+
+    Aws::Vector<SortingConfiguration> m_sortingConfigurations;
+    bool m_sortingConfigurationsHasBeenSet = false;
+
+    MissingAttributeKeyStrategy m_missingAttributeKeyStrategy;
+    bool m_missingAttributeKeyStrategyHasBeenSet = false;
+
+    bool m_expand;
+    bool m_expandHasBeenSet = false;
+
+    ExpandConfiguration m_expandConfiguration;
+    bool m_expandConfigurationHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CollapsedResultDetail.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CollapsedResultDetail.h
new file mode 100644
index 00000000000..c04203cf2c6
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CollapsedResultDetail.h
@@ -0,0 +1,125 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/kendra/Kendra_EXPORTS.h>
+#include <aws/kendra/model/DocumentAttribute.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/kendra/model/ExpandedResultItem.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace kendra
+{
+namespace Model
+{
+
+  /**
+   * <p>Provides details about a collapsed group of search results.</p><p><h3>See
+   * Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/kendra-2019-02-03/CollapsedResultDetail">AWS
+   * API Reference</a></p>
+   */
+  class CollapsedResultDetail
+  {
+  public:
+    AWS_KENDRA_API CollapsedResultDetail();
+    AWS_KENDRA_API CollapsedResultDetail(Aws::Utils::Json::JsonView jsonValue);
+    AWS_KENDRA_API CollapsedResultDetail& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_KENDRA_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p>The value of the document attribute that results are collapsed on.</p>
+     */
+    inline const DocumentAttribute& GetDocumentAttribute() const{ return m_documentAttribute; }
+
+    /**
+     * <p>The value of the document attribute that results are collapsed on.</p>
+     */
+    inline bool DocumentAttributeHasBeenSet() const { return m_documentAttributeHasBeenSet; }
+
+    /**
+     * <p>The value of the document attribute that results are collapsed on.</p>
+     */
+    inline void SetDocumentAttribute(const DocumentAttribute& value) { m_documentAttributeHasBeenSet = true; m_documentAttribute = value; }
+
+    /**
+     * <p>The value of the document attribute that results are collapsed on.</p>
+     */
+    inline void SetDocumentAttribute(DocumentAttribute&& value) { m_documentAttributeHasBeenSet = true; m_documentAttribute = std::move(value); }
+
+    /**
+     * <p>The value of the document attribute that results are collapsed on.</p>
+     */
+    inline CollapsedResultDetail& WithDocumentAttribute(const DocumentAttribute& value) { SetDocumentAttribute(value); return *this;}
+
+    /**
+     * <p>The value of the document attribute that results are collapsed on.</p>
+     */
+    inline CollapsedResultDetail& WithDocumentAttribute(DocumentAttribute&& value) { SetDocumentAttribute(std::move(value)); return *this;}
+
+
+    /**
+     * <p>A list of results in the collapsed group.</p>
+     */
+    inline const Aws::Vector<ExpandedResultItem>& GetExpandedResults() const{ return m_expandedResults; }
+
+    /**
+     * <p>A list of results in the collapsed group.</p>
+     */
+    inline bool ExpandedResultsHasBeenSet() const { return m_expandedResultsHasBeenSet; }
+
+    /**
+     * <p>A list of results in the collapsed group.</p>
+     */
+    inline void SetExpandedResults(const Aws::Vector<ExpandedResultItem>& value) { m_expandedResultsHasBeenSet = true; m_expandedResults = value; }
+
+    /**
+     * <p>A list of results in the collapsed group.</p>
+     */
+    inline void SetExpandedResults(Aws::Vector<ExpandedResultItem>&& value) { m_expandedResultsHasBeenSet = true; m_expandedResults = std::move(value); }
+
+    /**
+     * <p>A list of results in the collapsed group.</p>
+     */
+    inline CollapsedResultDetail& WithExpandedResults(const Aws::Vector<ExpandedResultItem>& value) { SetExpandedResults(value); return *this;}
+
+    /**
+     * <p>A list of results in the collapsed group.</p>
+     */
+    inline CollapsedResultDetail& WithExpandedResults(Aws::Vector<ExpandedResultItem>&& value) { SetExpandedResults(std::move(value)); return *this;}
+
+    /**
+     * <p>A list of results in the collapsed group.</p>
+     */
+    inline CollapsedResultDetail& AddExpandedResults(const ExpandedResultItem& value) { m_expandedResultsHasBeenSet = true; m_expandedResults.push_back(value); return *this; }
+
+    /**
+     * <p>A list of results in the collapsed group.</p>
+     */
+    inline CollapsedResultDetail& AddExpandedResults(ExpandedResultItem&& value) { m_expandedResultsHasBeenSet = true; m_expandedResults.push_back(std::move(value)); return *this; }
+
+  private:
+
+    DocumentAttribute m_documentAttribute;
+    bool m_documentAttributeHasBeenSet = false;
+
+    Aws::Vector<ExpandedResultItem> m_expandedResults;
+    bool m_expandedResultsHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CreateExperienceRequest.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CreateExperienceRequest.h
index 37ce2a84bcb..9ec616efc81 100644
--- a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CreateExperienceRequest.h
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CreateExperienceRequest.h
@@ -121,9 +121,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of an IAM role with permission to access
      * <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required
-     * APIs. The role also must include permission to access IAM Identity Center
-     * (successor to Single Sign-On) that stores your user and group information. For
-     * more information, see <a
+     * APIs. The role also must include permission to access IAM Identity Center that
+     * stores your user and group information. For more information, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html">IAM access
      * roles for Amazon Kendra</a>.</p>
      */
@@ -132,9 +131,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of an IAM role with permission to access
      * <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required
-     * APIs. The role also must include permission to access IAM Identity Center
-     * (successor to Single Sign-On) that stores your user and group information. For
-     * more information, see <a
+     * APIs. The role also must include permission to access IAM Identity Center that
+     * stores your user and group information. For more information, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html">IAM access
      * roles for Amazon Kendra</a>.</p>
      */
@@ -143,9 +141,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of an IAM role with permission to access
      * <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required
-     * APIs. The role also must include permission to access IAM Identity Center
-     * (successor to Single Sign-On) that stores your user and group information. For
-     * more information, see <a
+     * APIs. The role also must include permission to access IAM Identity Center that
+     * stores your user and group information. For more information, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html">IAM access
      * roles for Amazon Kendra</a>.</p>
      */
@@ -154,9 +151,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of an IAM role with permission to access
      * <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required
-     * APIs. The role also must include permission to access IAM Identity Center
-     * (successor to Single Sign-On) that stores your user and group information. For
-     * more information, see <a
+     * APIs. The role also must include permission to access IAM Identity Center that
+     * stores your user and group information. For more information, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html">IAM access
      * roles for Amazon Kendra</a>.</p>
      */
@@ -165,9 +161,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of an IAM role with permission to access
      * <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required
-     * APIs. The role also must include permission to access IAM Identity Center
-     * (successor to Single Sign-On) that stores your user and group information. For
-     * more information, see <a
+     * APIs. The role also must include permission to access IAM Identity Center that
+     * stores your user and group information. For more information, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html">IAM access
      * roles for Amazon Kendra</a>.</p>
      */
@@ -176,9 +171,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of an IAM role with permission to access
      * <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required
-     * APIs. The role also must include permission to access IAM Identity Center
-     * (successor to Single Sign-On) that stores your user and group information. For
-     * more information, see <a
+     * APIs. The role also must include permission to access IAM Identity Center that
+     * stores your user and group information. For more information, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html">IAM access
      * roles for Amazon Kendra</a>.</p>
      */
@@ -187,9 +181,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of an IAM role with permission to access
      * <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required
-     * APIs. The role also must include permission to access IAM Identity Center
-     * (successor to Single Sign-On) that stores your user and group information. For
-     * more information, see <a
+     * APIs. The role also must include permission to access IAM Identity Center that
+     * stores your user and group information. For more information, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html">IAM access
      * roles for Amazon Kendra</a>.</p>
      */
@@ -198,9 +191,8 @@ namespace Model
     /**
      * <p>The Amazon Resource Name (ARN) of an IAM role with permission to access
      * <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required
-     * APIs. The role also must include permission to access IAM Identity Center
-     * (successor to Single Sign-On) that stores your user and group information. For
-     * more information, see <a
+     * APIs. The role also must include permission to access IAM Identity Center that
+     * stores your user and group information. For more information, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html">IAM access
      * roles for Amazon Kendra</a>.</p>
      */
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CreateIndexRequest.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CreateIndexRequest.h
index 8309242811b..09e8ccbb12f 100644
--- a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CreateIndexRequest.h
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/CreateIndexRequest.h
@@ -542,43 +542,43 @@ namespace Model
 
 
     /**
-     * <p>Gets users and groups from IAM Identity Center (successor to Single Sign-On)
-     * identity source. To configure this, see <a
+     * <p>Gets users and groups from IAM Identity Center identity source. To configure
+     * this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline const UserGroupResolutionConfiguration& GetUserGroupResolutionConfiguration() const{ return m_userGroupResolutionConfiguration; }
 
     /**
-     * <p>Gets users and groups from IAM Identity Center (successor to Single Sign-On)
-     * identity source. To configure this, see <a
+     * <p>Gets users and groups from IAM Identity Center identity source. To configure
+     * this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline bool UserGroupResolutionConfigurationHasBeenSet() const { return m_userGroupResolutionConfigurationHasBeenSet; }
 
     /**
-     * <p>Gets users and groups from IAM Identity Center (successor to Single Sign-On)
-     * identity source. To configure this, see <a
+     * <p>Gets users and groups from IAM Identity Center identity source. To configure
+     * this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline void SetUserGroupResolutionConfiguration(const UserGroupResolutionConfiguration& value) { m_userGroupResolutionConfigurationHasBeenSet = true; m_userGroupResolutionConfiguration = value; }
 
     /**
-     * <p>Gets users and groups from IAM Identity Center (successor to Single Sign-On)
-     * identity source. To configure this, see <a
+     * <p>Gets users and groups from IAM Identity Center identity source. To configure
+     * this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline void SetUserGroupResolutionConfiguration(UserGroupResolutionConfiguration&& value) { m_userGroupResolutionConfigurationHasBeenSet = true; m_userGroupResolutionConfiguration = std::move(value); }
 
     /**
-     * <p>Gets users and groups from IAM Identity Center (successor to Single Sign-On)
-     * identity source. To configure this, see <a
+     * <p>Gets users and groups from IAM Identity Center identity source. To configure
+     * this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline CreateIndexRequest& WithUserGroupResolutionConfiguration(const UserGroupResolutionConfiguration& value) { SetUserGroupResolutionConfiguration(value); return *this;}
 
     /**
-     * <p>Gets users and groups from IAM Identity Center (successor to Single Sign-On)
-     * identity source. To configure this, see <a
+     * <p>Gets users and groups from IAM Identity Center identity source. To configure
+     * this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline CreateIndexRequest& WithUserGroupResolutionConfiguration(UserGroupResolutionConfiguration&& value) { SetUserGroupResolutionConfiguration(std::move(value)); return *this;}
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/DescribeIndexResult.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/DescribeIndexResult.h
index 2c584f9685f..3ba8c6c0eab 100644
--- a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/DescribeIndexResult.h
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/DescribeIndexResult.h
@@ -593,36 +593,31 @@ namespace Model
 
     /**
      * <p>Whether you have enabled the configuration for fetching access levels of
-     * groups and users from an IAM Identity Center (successor to Single Sign-On)
-     * identity source.</p>
+     * groups and users from an IAM Identity Center identity source.</p>
      */
     inline const UserGroupResolutionConfiguration& GetUserGroupResolutionConfiguration() const{ return m_userGroupResolutionConfiguration; }
 
     /**
      * <p>Whether you have enabled the configuration for fetching access levels of
-     * groups and users from an IAM Identity Center (successor to Single Sign-On)
-     * identity source.</p>
+     * groups and users from an IAM Identity Center identity source.</p>
      */
     inline void SetUserGroupResolutionConfiguration(const UserGroupResolutionConfiguration& value) { m_userGroupResolutionConfiguration = value; }
 
     /**
      * <p>Whether you have enabled the configuration for fetching access levels of
-     * groups and users from an IAM Identity Center (successor to Single Sign-On)
-     * identity source.</p>
+     * groups and users from an IAM Identity Center identity source.</p>
      */
     inline void SetUserGroupResolutionConfiguration(UserGroupResolutionConfiguration&& value) { m_userGroupResolutionConfiguration = std::move(value); }
 
     /**
      * <p>Whether you have enabled the configuration for fetching access levels of
-     * groups and users from an IAM Identity Center (successor to Single Sign-On)
-     * identity source.</p>
+     * groups and users from an IAM Identity Center identity source.</p>
      */
     inline DescribeIndexResult& WithUserGroupResolutionConfiguration(const UserGroupResolutionConfiguration& value) { SetUserGroupResolutionConfiguration(value); return *this;}
 
     /**
      * <p>Whether you have enabled the configuration for fetching access levels of
-     * groups and users from an IAM Identity Center (successor to Single Sign-On)
-     * identity source.</p>
+     * groups and users from an IAM Identity Center identity source.</p>
      */
     inline DescribeIndexResult& WithUserGroupResolutionConfiguration(UserGroupResolutionConfiguration&& value) { SetUserGroupResolutionConfiguration(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/ExpandConfiguration.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/ExpandConfiguration.h
new file mode 100644
index 00000000000..949d6cbc602
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/ExpandConfiguration.h
@@ -0,0 +1,107 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/kendra/Kendra_EXPORTS.h>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace kendra
+{
+namespace Model
+{
+
+  /**
+   * <p>Specifies the configuration information needed to customize how collapsed
+   * search result groups expand.</p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/kendra-2019-02-03/ExpandConfiguration">AWS
+   * API Reference</a></p>
+   */
+  class ExpandConfiguration
+  {
+  public:
+    AWS_KENDRA_API ExpandConfiguration();
+    AWS_KENDRA_API ExpandConfiguration(Aws::Utils::Json::JsonView jsonValue);
+    AWS_KENDRA_API ExpandConfiguration& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_KENDRA_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p>The number of collapsed search result groups to expand. If you set this value
+     * to 10, for example, only the first 10 out of 100 result groups will have expand
+     * functionality. </p>
+     */
+    inline int GetMaxResultItemsToExpand() const{ return m_maxResultItemsToExpand; }
+
+    /**
+     * <p>The number of collapsed search result groups to expand. If you set this value
+     * to 10, for example, only the first 10 out of 100 result groups will have expand
+     * functionality. </p>
+     */
+    inline bool MaxResultItemsToExpandHasBeenSet() const { return m_maxResultItemsToExpandHasBeenSet; }
+
+    /**
+     * <p>The number of collapsed search result groups to expand. If you set this value
+     * to 10, for example, only the first 10 out of 100 result groups will have expand
+     * functionality. </p>
+     */
+    inline void SetMaxResultItemsToExpand(int value) { m_maxResultItemsToExpandHasBeenSet = true; m_maxResultItemsToExpand = value; }
+
+    /**
+     * <p>The number of collapsed search result groups to expand. If you set this value
+     * to 10, for example, only the first 10 out of 100 result groups will have expand
+     * functionality. </p>
+     */
+    inline ExpandConfiguration& WithMaxResultItemsToExpand(int value) { SetMaxResultItemsToExpand(value); return *this;}
+
+
+    /**
+     * <p>The number of expanded results to show per collapsed primary document. For
+     * instance, if you set this value to 3, then at most 3 results per collapsed group
+     * will be displayed.</p>
+     */
+    inline int GetMaxExpandedResultsPerItem() const{ return m_maxExpandedResultsPerItem; }
+
+    /**
+     * <p>The number of expanded results to show per collapsed primary document. For
+     * instance, if you set this value to 3, then at most 3 results per collapsed group
+     * will be displayed.</p>
+     */
+    inline bool MaxExpandedResultsPerItemHasBeenSet() const { return m_maxExpandedResultsPerItemHasBeenSet; }
+
+    /**
+     * <p>The number of expanded results to show per collapsed primary document. For
+     * instance, if you set this value to 3, then at most 3 results per collapsed group
+     * will be displayed.</p>
+     */
+    inline void SetMaxExpandedResultsPerItem(int value) { m_maxExpandedResultsPerItemHasBeenSet = true; m_maxExpandedResultsPerItem = value; }
+
+    /**
+     * <p>The number of expanded results to show per collapsed primary document. For
+     * instance, if you set this value to 3, then at most 3 results per collapsed group
+     * will be displayed.</p>
+     */
+    inline ExpandConfiguration& WithMaxExpandedResultsPerItem(int value) { SetMaxExpandedResultsPerItem(value); return *this;}
+
+  private:
+
+    int m_maxResultItemsToExpand;
+    bool m_maxResultItemsToExpandHasBeenSet = false;
+
+    int m_maxExpandedResultsPerItem;
+    bool m_maxExpandedResultsPerItemHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/ExpandedResultItem.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/ExpandedResultItem.h
new file mode 100644
index 00000000000..038d0776a6b
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/ExpandedResultItem.h
@@ -0,0 +1,287 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/kendra/Kendra_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+#include <aws/kendra/model/TextWithHighlights.h>
+#include <aws/core/utils/memory/stl/AWSVector.h>
+#include <aws/kendra/model/DocumentAttribute.h>
+#include <utility>
+
+namespace Aws
+{
+namespace Utils
+{
+namespace Json
+{
+  class JsonValue;
+  class JsonView;
+} // namespace Json
+} // namespace Utils
+namespace kendra
+{
+namespace Model
+{
+
+  /**
+   * <p> A single expanded result in a collapsed group of search results.</p> <p>An
+   * expanded result item contains information about an expanded result document
+   * within a collapsed group of search results. This includes the original location
+   * of the document, a list of attributes assigned to the document, and relevant
+   * text from the document that satisfies the query. </p><p><h3>See Also:</h3>   <a
+   * href="http://docs.aws.amazon.com/goto/WebAPI/kendra-2019-02-03/ExpandedResultItem">AWS
+   * API Reference</a></p>
+   */
+  class ExpandedResultItem
+  {
+  public:
+    AWS_KENDRA_API ExpandedResultItem();
+    AWS_KENDRA_API ExpandedResultItem(Aws::Utils::Json::JsonView jsonValue);
+    AWS_KENDRA_API ExpandedResultItem& operator=(Aws::Utils::Json::JsonView jsonValue);
+    AWS_KENDRA_API Aws::Utils::Json::JsonValue Jsonize() const;
+
+
+    /**
+     * <p>The identifier for the expanded result.</p>
+     */
+    inline const Aws::String& GetId() const{ return m_id; }
+
+    /**
+     * <p>The identifier for the expanded result.</p>
+     */
+    inline bool IdHasBeenSet() const { return m_idHasBeenSet; }
+
+    /**
+     * <p>The identifier for the expanded result.</p>
+     */
+    inline void SetId(const Aws::String& value) { m_idHasBeenSet = true; m_id = value; }
+
+    /**
+     * <p>The identifier for the expanded result.</p>
+     */
+    inline void SetId(Aws::String&& value) { m_idHasBeenSet = true; m_id = std::move(value); }
+
+    /**
+     * <p>The identifier for the expanded result.</p>
+     */
+    inline void SetId(const char* value) { m_idHasBeenSet = true; m_id.assign(value); }
+
+    /**
+     * <p>The identifier for the expanded result.</p>
+     */
+    inline ExpandedResultItem& WithId(const Aws::String& value) { SetId(value); return *this;}
+
+    /**
+     * <p>The identifier for the expanded result.</p>
+     */
+    inline ExpandedResultItem& WithId(Aws::String&& value) { SetId(std::move(value)); return *this;}
+
+    /**
+     * <p>The identifier for the expanded result.</p>
+     */
+    inline ExpandedResultItem& WithId(const char* value) { SetId(value); return *this;}
+
+
+    /**
+     * <p>The idenitifier of the document.</p>
+     */
+    inline const Aws::String& GetDocumentId() const{ return m_documentId; }
+
+    /**
+     * <p>The idenitifier of the document.</p>
+     */
+    inline bool DocumentIdHasBeenSet() const { return m_documentIdHasBeenSet; }
+
+    /**
+     * <p>The idenitifier of the document.</p>
+     */
+    inline void SetDocumentId(const Aws::String& value) { m_documentIdHasBeenSet = true; m_documentId = value; }
+
+    /**
+     * <p>The idenitifier of the document.</p>
+     */
+    inline void SetDocumentId(Aws::String&& value) { m_documentIdHasBeenSet = true; m_documentId = std::move(value); }
+
+    /**
+     * <p>The idenitifier of the document.</p>
+     */
+    inline void SetDocumentId(const char* value) { m_documentIdHasBeenSet = true; m_documentId.assign(value); }
+
+    /**
+     * <p>The idenitifier of the document.</p>
+     */
+    inline ExpandedResultItem& WithDocumentId(const Aws::String& value) { SetDocumentId(value); return *this;}
+
+    /**
+     * <p>The idenitifier of the document.</p>
+     */
+    inline ExpandedResultItem& WithDocumentId(Aws::String&& value) { SetDocumentId(std::move(value)); return *this;}
+
+    /**
+     * <p>The idenitifier of the document.</p>
+     */
+    inline ExpandedResultItem& WithDocumentId(const char* value) { SetDocumentId(value); return *this;}
+
+
+    
+    inline const TextWithHighlights& GetDocumentTitle() const{ return m_documentTitle; }
+
+    
+    inline bool DocumentTitleHasBeenSet() const { return m_documentTitleHasBeenSet; }
+
+    
+    inline void SetDocumentTitle(const TextWithHighlights& value) { m_documentTitleHasBeenSet = true; m_documentTitle = value; }
+
+    
+    inline void SetDocumentTitle(TextWithHighlights&& value) { m_documentTitleHasBeenSet = true; m_documentTitle = std::move(value); }
+
+    
+    inline ExpandedResultItem& WithDocumentTitle(const TextWithHighlights& value) { SetDocumentTitle(value); return *this;}
+
+    
+    inline ExpandedResultItem& WithDocumentTitle(TextWithHighlights&& value) { SetDocumentTitle(std::move(value)); return *this;}
+
+
+    
+    inline const TextWithHighlights& GetDocumentExcerpt() const{ return m_documentExcerpt; }
+
+    
+    inline bool DocumentExcerptHasBeenSet() const { return m_documentExcerptHasBeenSet; }
+
+    
+    inline void SetDocumentExcerpt(const TextWithHighlights& value) { m_documentExcerptHasBeenSet = true; m_documentExcerpt = value; }
+
+    
+    inline void SetDocumentExcerpt(TextWithHighlights&& value) { m_documentExcerptHasBeenSet = true; m_documentExcerpt = std::move(value); }
+
+    
+    inline ExpandedResultItem& WithDocumentExcerpt(const TextWithHighlights& value) { SetDocumentExcerpt(value); return *this;}
+
+    
+    inline ExpandedResultItem& WithDocumentExcerpt(TextWithHighlights&& value) { SetDocumentExcerpt(std::move(value)); return *this;}
+
+
+    /**
+     * <p>The URI of the original location of the document.</p>
+     */
+    inline const Aws::String& GetDocumentURI() const{ return m_documentURI; }
+
+    /**
+     * <p>The URI of the original location of the document.</p>
+     */
+    inline bool DocumentURIHasBeenSet() const { return m_documentURIHasBeenSet; }
+
+    /**
+     * <p>The URI of the original location of the document.</p>
+     */
+    inline void SetDocumentURI(const Aws::String& value) { m_documentURIHasBeenSet = true; m_documentURI = value; }
+
+    /**
+     * <p>The URI of the original location of the document.</p>
+     */
+    inline void SetDocumentURI(Aws::String&& value) { m_documentURIHasBeenSet = true; m_documentURI = std::move(value); }
+
+    /**
+     * <p>The URI of the original location of the document.</p>
+     */
+    inline void SetDocumentURI(const char* value) { m_documentURIHasBeenSet = true; m_documentURI.assign(value); }
+
+    /**
+     * <p>The URI of the original location of the document.</p>
+     */
+    inline ExpandedResultItem& WithDocumentURI(const Aws::String& value) { SetDocumentURI(value); return *this;}
+
+    /**
+     * <p>The URI of the original location of the document.</p>
+     */
+    inline ExpandedResultItem& WithDocumentURI(Aws::String&& value) { SetDocumentURI(std::move(value)); return *this;}
+
+    /**
+     * <p>The URI of the original location of the document.</p>
+     */
+    inline ExpandedResultItem& WithDocumentURI(const char* value) { SetDocumentURI(value); return *this;}
+
+
+    /**
+     * <p>An array of document attributes assigned to a document in the search results.
+     * For example, the document author ("_author") or the source URI ("_source_uri")
+     * of the document.</p>
+     */
+    inline const Aws::Vector<DocumentAttribute>& GetDocumentAttributes() const{ return m_documentAttributes; }
+
+    /**
+     * <p>An array of document attributes assigned to a document in the search results.
+     * For example, the document author ("_author") or the source URI ("_source_uri")
+     * of the document.</p>
+     */
+    inline bool DocumentAttributesHasBeenSet() const { return m_documentAttributesHasBeenSet; }
+
+    /**
+     * <p>An array of document attributes assigned to a document in the search results.
+     * For example, the document author ("_author") or the source URI ("_source_uri")
+     * of the document.</p>
+     */
+    inline void SetDocumentAttributes(const Aws::Vector<DocumentAttribute>& value) { m_documentAttributesHasBeenSet = true; m_documentAttributes = value; }
+
+    /**
+     * <p>An array of document attributes assigned to a document in the search results.
+     * For example, the document author ("_author") or the source URI ("_source_uri")
+     * of the document.</p>
+     */
+    inline void SetDocumentAttributes(Aws::Vector<DocumentAttribute>&& value) { m_documentAttributesHasBeenSet = true; m_documentAttributes = std::move(value); }
+
+    /**
+     * <p>An array of document attributes assigned to a document in the search results.
+     * For example, the document author ("_author") or the source URI ("_source_uri")
+     * of the document.</p>
+     */
+    inline ExpandedResultItem& WithDocumentAttributes(const Aws::Vector<DocumentAttribute>& value) { SetDocumentAttributes(value); return *this;}
+
+    /**
+     * <p>An array of document attributes assigned to a document in the search results.
+     * For example, the document author ("_author") or the source URI ("_source_uri")
+     * of the document.</p>
+     */
+    inline ExpandedResultItem& WithDocumentAttributes(Aws::Vector<DocumentAttribute>&& value) { SetDocumentAttributes(std::move(value)); return *this;}
+
+    /**
+     * <p>An array of document attributes assigned to a document in the search results.
+     * For example, the document author ("_author") or the source URI ("_source_uri")
+     * of the document.</p>
+     */
+    inline ExpandedResultItem& AddDocumentAttributes(const DocumentAttribute& value) { m_documentAttributesHasBeenSet = true; m_documentAttributes.push_back(value); return *this; }
+
+    /**
+     * <p>An array of document attributes assigned to a document in the search results.
+     * For example, the document author ("_author") or the source URI ("_source_uri")
+     * of the document.</p>
+     */
+    inline ExpandedResultItem& AddDocumentAttributes(DocumentAttribute&& value) { m_documentAttributesHasBeenSet = true; m_documentAttributes.push_back(std::move(value)); return *this; }
+
+  private:
+
+    Aws::String m_id;
+    bool m_idHasBeenSet = false;
+
+    Aws::String m_documentId;
+    bool m_documentIdHasBeenSet = false;
+
+    TextWithHighlights m_documentTitle;
+    bool m_documentTitleHasBeenSet = false;
+
+    TextWithHighlights m_documentExcerpt;
+    bool m_documentExcerptHasBeenSet = false;
+
+    Aws::String m_documentURI;
+    bool m_documentURIHasBeenSet = false;
+
+    Aws::Vector<DocumentAttribute> m_documentAttributes;
+    bool m_documentAttributesHasBeenSet = false;
+  };
+
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/MissingAttributeKeyStrategy.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/MissingAttributeKeyStrategy.h
new file mode 100644
index 00000000000..46e476ad548
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/MissingAttributeKeyStrategy.h
@@ -0,0 +1,32 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#pragma once
+#include <aws/kendra/Kendra_EXPORTS.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace Aws
+{
+namespace kendra
+{
+namespace Model
+{
+  enum class MissingAttributeKeyStrategy
+  {
+    NOT_SET,
+    IGNORE,
+    COLLAPSE,
+    EXPAND
+  };
+
+namespace MissingAttributeKeyStrategyMapper
+{
+AWS_KENDRA_API MissingAttributeKeyStrategy GetMissingAttributeKeyStrategyForName(const Aws::String& name);
+
+AWS_KENDRA_API Aws::String GetNameForMissingAttributeKeyStrategy(MissingAttributeKeyStrategy value);
+} // namespace MissingAttributeKeyStrategyMapper
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/QueryRequest.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/QueryRequest.h
index da0de3dc05f..cdd0d21655a 100644
--- a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/QueryRequest.h
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/QueryRequest.h
@@ -13,6 +13,7 @@
 #include <aws/kendra/model/SortingConfiguration.h>
 #include <aws/kendra/model/UserContext.h>
 #include <aws/kendra/model/SpellCorrectionConfiguration.h>
+#include <aws/kendra/model/CollapseConfiguration.h>
 #include <aws/kendra/model/Facet.h>
 #include <aws/kendra/model/DocumentRelevanceConfiguration.h>
 #include <utility>
@@ -567,6 +568,95 @@ namespace Model
     inline QueryRequest& WithSortingConfiguration(SortingConfiguration&& value) { SetSortingConfiguration(std::move(value)); return *this;}
 
 
+    /**
+     * <p>Provides configuration information to determine how the results of a query
+     * are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the
+     * results on, and specify whether the results should be sorted in ascending or
+     * descending order. The sort field quota can be increased.</p> <p>If you don't
+     * provide a sorting configuration, the results are sorted by the relevance that
+     * Amazon Kendra determines for the result. In the case of ties in sorting the
+     * results, the results are sorted by relevance. </p>
+     */
+    inline const Aws::Vector<SortingConfiguration>& GetSortingConfigurations() const{ return m_sortingConfigurations; }
+
+    /**
+     * <p>Provides configuration information to determine how the results of a query
+     * are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the
+     * results on, and specify whether the results should be sorted in ascending or
+     * descending order. The sort field quota can be increased.</p> <p>If you don't
+     * provide a sorting configuration, the results are sorted by the relevance that
+     * Amazon Kendra determines for the result. In the case of ties in sorting the
+     * results, the results are sorted by relevance. </p>
+     */
+    inline bool SortingConfigurationsHasBeenSet() const { return m_sortingConfigurationsHasBeenSet; }
+
+    /**
+     * <p>Provides configuration information to determine how the results of a query
+     * are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the
+     * results on, and specify whether the results should be sorted in ascending or
+     * descending order. The sort field quota can be increased.</p> <p>If you don't
+     * provide a sorting configuration, the results are sorted by the relevance that
+     * Amazon Kendra determines for the result. In the case of ties in sorting the
+     * results, the results are sorted by relevance. </p>
+     */
+    inline void SetSortingConfigurations(const Aws::Vector<SortingConfiguration>& value) { m_sortingConfigurationsHasBeenSet = true; m_sortingConfigurations = value; }
+
+    /**
+     * <p>Provides configuration information to determine how the results of a query
+     * are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the
+     * results on, and specify whether the results should be sorted in ascending or
+     * descending order. The sort field quota can be increased.</p> <p>If you don't
+     * provide a sorting configuration, the results are sorted by the relevance that
+     * Amazon Kendra determines for the result. In the case of ties in sorting the
+     * results, the results are sorted by relevance. </p>
+     */
+    inline void SetSortingConfigurations(Aws::Vector<SortingConfiguration>&& value) { m_sortingConfigurationsHasBeenSet = true; m_sortingConfigurations = std::move(value); }
+
+    /**
+     * <p>Provides configuration information to determine how the results of a query
+     * are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the
+     * results on, and specify whether the results should be sorted in ascending or
+     * descending order. The sort field quota can be increased.</p> <p>If you don't
+     * provide a sorting configuration, the results are sorted by the relevance that
+     * Amazon Kendra determines for the result. In the case of ties in sorting the
+     * results, the results are sorted by relevance. </p>
+     */
+    inline QueryRequest& WithSortingConfigurations(const Aws::Vector<SortingConfiguration>& value) { SetSortingConfigurations(value); return *this;}
+
+    /**
+     * <p>Provides configuration information to determine how the results of a query
+     * are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the
+     * results on, and specify whether the results should be sorted in ascending or
+     * descending order. The sort field quota can be increased.</p> <p>If you don't
+     * provide a sorting configuration, the results are sorted by the relevance that
+     * Amazon Kendra determines for the result. In the case of ties in sorting the
+     * results, the results are sorted by relevance. </p>
+     */
+    inline QueryRequest& WithSortingConfigurations(Aws::Vector<SortingConfiguration>&& value) { SetSortingConfigurations(std::move(value)); return *this;}
+
+    /**
+     * <p>Provides configuration information to determine how the results of a query
+     * are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the
+     * results on, and specify whether the results should be sorted in ascending or
+     * descending order. The sort field quota can be increased.</p> <p>If you don't
+     * provide a sorting configuration, the results are sorted by the relevance that
+     * Amazon Kendra determines for the result. In the case of ties in sorting the
+     * results, the results are sorted by relevance. </p>
+     */
+    inline QueryRequest& AddSortingConfigurations(const SortingConfiguration& value) { m_sortingConfigurationsHasBeenSet = true; m_sortingConfigurations.push_back(value); return *this; }
+
+    /**
+     * <p>Provides configuration information to determine how the results of a query
+     * are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the
+     * results on, and specify whether the results should be sorted in ascending or
+     * descending order. The sort field quota can be increased.</p> <p>If you don't
+     * provide a sorting configuration, the results are sorted by the relevance that
+     * Amazon Kendra determines for the result. In the case of ties in sorting the
+     * results, the results are sorted by relevance. </p>
+     */
+    inline QueryRequest& AddSortingConfigurations(SortingConfiguration&& value) { m_sortingConfigurationsHasBeenSet = true; m_sortingConfigurations.push_back(std::move(value)); return *this; }
+
+
     /**
      * <p>The user context token or user and group information.</p>
      */
@@ -693,6 +783,49 @@ namespace Model
      */
     inline QueryRequest& WithSpellCorrectionConfiguration(SpellCorrectionConfiguration&& value) { SetSpellCorrectionConfiguration(std::move(value)); return *this;}
 
+
+    /**
+     * <p>Provides configuration to determine how to group results by document
+     * attribute value, and how to display them (collapsed or expanded) under a
+     * designated primary document for each group.</p>
+     */
+    inline const CollapseConfiguration& GetCollapseConfiguration() const{ return m_collapseConfiguration; }
+
+    /**
+     * <p>Provides configuration to determine how to group results by document
+     * attribute value, and how to display them (collapsed or expanded) under a
+     * designated primary document for each group.</p>
+     */
+    inline bool CollapseConfigurationHasBeenSet() const { return m_collapseConfigurationHasBeenSet; }
+
+    /**
+     * <p>Provides configuration to determine how to group results by document
+     * attribute value, and how to display them (collapsed or expanded) under a
+     * designated primary document for each group.</p>
+     */
+    inline void SetCollapseConfiguration(const CollapseConfiguration& value) { m_collapseConfigurationHasBeenSet = true; m_collapseConfiguration = value; }
+
+    /**
+     * <p>Provides configuration to determine how to group results by document
+     * attribute value, and how to display them (collapsed or expanded) under a
+     * designated primary document for each group.</p>
+     */
+    inline void SetCollapseConfiguration(CollapseConfiguration&& value) { m_collapseConfigurationHasBeenSet = true; m_collapseConfiguration = std::move(value); }
+
+    /**
+     * <p>Provides configuration to determine how to group results by document
+     * attribute value, and how to display them (collapsed or expanded) under a
+     * designated primary document for each group.</p>
+     */
+    inline QueryRequest& WithCollapseConfiguration(const CollapseConfiguration& value) { SetCollapseConfiguration(value); return *this;}
+
+    /**
+     * <p>Provides configuration to determine how to group results by document
+     * attribute value, and how to display them (collapsed or expanded) under a
+     * designated primary document for each group.</p>
+     */
+    inline QueryRequest& WithCollapseConfiguration(CollapseConfiguration&& value) { SetCollapseConfiguration(std::move(value)); return *this;}
+
   private:
 
     Aws::String m_indexId;
@@ -725,6 +858,9 @@ namespace Model
     SortingConfiguration m_sortingConfiguration;
     bool m_sortingConfigurationHasBeenSet = false;
 
+    Aws::Vector<SortingConfiguration> m_sortingConfigurations;
+    bool m_sortingConfigurationsHasBeenSet = false;
+
     UserContext m_userContext;
     bool m_userContextHasBeenSet = false;
 
@@ -733,6 +869,9 @@ namespace Model
 
     SpellCorrectionConfiguration m_spellCorrectionConfiguration;
     bool m_spellCorrectionConfigurationHasBeenSet = false;
+
+    CollapseConfiguration m_collapseConfiguration;
+    bool m_collapseConfigurationHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/QueryResultItem.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/QueryResultItem.h
index b3e0359967d..b74c2c4b06d 100644
--- a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/QueryResultItem.h
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/QueryResultItem.h
@@ -12,6 +12,7 @@
 #include <aws/kendra/model/TextWithHighlights.h>
 #include <aws/kendra/model/ScoreAttributes.h>
 #include <aws/kendra/model/TableExcerpt.h>
+#include <aws/kendra/model/CollapsedResultDetail.h>
 #include <aws/kendra/model/AdditionalResultAttribute.h>
 #include <aws/kendra/model/DocumentAttribute.h>
 #include <utility>
@@ -619,6 +620,37 @@ namespace Model
      */
     inline QueryResultItem& WithTableExcerpt(TableExcerpt&& value) { SetTableExcerpt(std::move(value)); return *this;}
 
+
+    /**
+     * <p>Provides details about a collapsed group of search results.</p>
+     */
+    inline const CollapsedResultDetail& GetCollapsedResultDetail() const{ return m_collapsedResultDetail; }
+
+    /**
+     * <p>Provides details about a collapsed group of search results.</p>
+     */
+    inline bool CollapsedResultDetailHasBeenSet() const { return m_collapsedResultDetailHasBeenSet; }
+
+    /**
+     * <p>Provides details about a collapsed group of search results.</p>
+     */
+    inline void SetCollapsedResultDetail(const CollapsedResultDetail& value) { m_collapsedResultDetailHasBeenSet = true; m_collapsedResultDetail = value; }
+
+    /**
+     * <p>Provides details about a collapsed group of search results.</p>
+     */
+    inline void SetCollapsedResultDetail(CollapsedResultDetail&& value) { m_collapsedResultDetailHasBeenSet = true; m_collapsedResultDetail = std::move(value); }
+
+    /**
+     * <p>Provides details about a collapsed group of search results.</p>
+     */
+    inline QueryResultItem& WithCollapsedResultDetail(const CollapsedResultDetail& value) { SetCollapsedResultDetail(value); return *this;}
+
+    /**
+     * <p>Provides details about a collapsed group of search results.</p>
+     */
+    inline QueryResultItem& WithCollapsedResultDetail(CollapsedResultDetail&& value) { SetCollapsedResultDetail(std::move(value)); return *this;}
+
   private:
 
     Aws::String m_id;
@@ -656,6 +688,9 @@ namespace Model
 
     TableExcerpt m_tableExcerpt;
     bool m_tableExcerptHasBeenSet = false;
+
+    CollapsedResultDetail m_collapsedResultDetail;
+    bool m_collapsedResultDetailHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/UpdateIndexRequest.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/UpdateIndexRequest.h
index b3f9aa0f1cc..1bd5df773e3 100644
--- a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/UpdateIndexRequest.h
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/UpdateIndexRequest.h
@@ -398,42 +398,42 @@ namespace Model
 
     /**
      * <p>Enables fetching access levels of groups and users from an IAM Identity
-     * Center (successor to Single Sign-On) identity source. To configure this, see <a
+     * Center identity source. To configure this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline const UserGroupResolutionConfiguration& GetUserGroupResolutionConfiguration() const{ return m_userGroupResolutionConfiguration; }
 
     /**
      * <p>Enables fetching access levels of groups and users from an IAM Identity
-     * Center (successor to Single Sign-On) identity source. To configure this, see <a
+     * Center identity source. To configure this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline bool UserGroupResolutionConfigurationHasBeenSet() const { return m_userGroupResolutionConfigurationHasBeenSet; }
 
     /**
      * <p>Enables fetching access levels of groups and users from an IAM Identity
-     * Center (successor to Single Sign-On) identity source. To configure this, see <a
+     * Center identity source. To configure this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline void SetUserGroupResolutionConfiguration(const UserGroupResolutionConfiguration& value) { m_userGroupResolutionConfigurationHasBeenSet = true; m_userGroupResolutionConfiguration = value; }
 
     /**
      * <p>Enables fetching access levels of groups and users from an IAM Identity
-     * Center (successor to Single Sign-On) identity source. To configure this, see <a
+     * Center identity source. To configure this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline void SetUserGroupResolutionConfiguration(UserGroupResolutionConfiguration&& value) { m_userGroupResolutionConfigurationHasBeenSet = true; m_userGroupResolutionConfiguration = std::move(value); }
 
     /**
      * <p>Enables fetching access levels of groups and users from an IAM Identity
-     * Center (successor to Single Sign-On) identity source. To configure this, see <a
+     * Center identity source. To configure this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline UpdateIndexRequest& WithUserGroupResolutionConfiguration(const UserGroupResolutionConfiguration& value) { SetUserGroupResolutionConfiguration(value); return *this;}
 
     /**
      * <p>Enables fetching access levels of groups and users from an IAM Identity
-     * Center (successor to Single Sign-On) identity source. To configure this, see <a
+     * Center identity source. To configure this, see <a
      * href="https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html">UserGroupResolutionConfiguration</a>.</p>
      */
     inline UpdateIndexRequest& WithUserGroupResolutionConfiguration(UserGroupResolutionConfiguration&& value) { SetUserGroupResolutionConfiguration(std::move(value)); return *this;}
diff --git a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/UserGroupResolutionConfiguration.h b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/UserGroupResolutionConfiguration.h
index 5a4f33d9a7f..88dfde2afb8 100644
--- a/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/UserGroupResolutionConfiguration.h
+++ b/generated/src/aws-cpp-sdk-kendra/include/aws/kendra/model/UserGroupResolutionConfiguration.h
@@ -25,9 +25,9 @@ namespace Model
 
   /**
    * <p>Provides the configuration information to get users and groups from an IAM
-   * Identity Center (successor to Single Sign-On) identity source. This is useful
-   * for user context filtering, where search results are filtered based on the user
-   * or their group access to documents. You can also use the <a
+   * Identity Center identity source. This is useful for user context filtering,
+   * where search results are filtered based on the user or their group access to
+   * documents. You can also use the <a
    * href="https://docs.aws.amazon.com/kendra/latest/dg/API_PutPrincipalMapping.html">PutPrincipalMapping</a>
    * API to map users to their groups so that you only need to provide the user ID
    * when you issue the query.</p> <p>To set up an IAM Identity Center identity
@@ -57,49 +57,49 @@ namespace Model
 
     /**
      * <p>The identity store provider (mode) you want to use to get users and groups.
-     * IAM Identity Center (successor to Single Sign-On) is currently the only
-     * available mode. Your users and groups must exist in an IAM Identity Center
-     * identity source in order to use this mode.</p>
+     * IAM Identity Center is currently the only available mode. Your users and groups
+     * must exist in an IAM Identity Center identity source in order to use this
+     * mode.</p>
      */
     inline const UserGroupResolutionMode& GetUserGroupResolutionMode() const{ return m_userGroupResolutionMode; }
 
     /**
      * <p>The identity store provider (mode) you want to use to get users and groups.
-     * IAM Identity Center (successor to Single Sign-On) is currently the only
-     * available mode. Your users and groups must exist in an IAM Identity Center
-     * identity source in order to use this mode.</p>
+     * IAM Identity Center is currently the only available mode. Your users and groups
+     * must exist in an IAM Identity Center identity source in order to use this
+     * mode.</p>
      */
     inline bool UserGroupResolutionModeHasBeenSet() const { return m_userGroupResolutionModeHasBeenSet; }
 
     /**
      * <p>The identity store provider (mode) you want to use to get users and groups.
-     * IAM Identity Center (successor to Single Sign-On) is currently the only
-     * available mode. Your users and groups must exist in an IAM Identity Center
-     * identity source in order to use this mode.</p>
+     * IAM Identity Center is currently the only available mode. Your users and groups
+     * must exist in an IAM Identity Center identity source in order to use this
+     * mode.</p>
      */
     inline void SetUserGroupResolutionMode(const UserGroupResolutionMode& value) { m_userGroupResolutionModeHasBeenSet = true; m_userGroupResolutionMode = value; }
 
     /**
      * <p>The identity store provider (mode) you want to use to get users and groups.
-     * IAM Identity Center (successor to Single Sign-On) is currently the only
-     * available mode. Your users and groups must exist in an IAM Identity Center
-     * identity source in order to use this mode.</p>
+     * IAM Identity Center is currently the only available mode. Your users and groups
+     * must exist in an IAM Identity Center identity source in order to use this
+     * mode.</p>
      */
     inline void SetUserGroupResolutionMode(UserGroupResolutionMode&& value) { m_userGroupResolutionModeHasBeenSet = true; m_userGroupResolutionMode = std::move(value); }
 
     /**
      * <p>The identity store provider (mode) you want to use to get users and groups.
-     * IAM Identity Center (successor to Single Sign-On) is currently the only
-     * available mode. Your users and groups must exist in an IAM Identity Center
-     * identity source in order to use this mode.</p>
+     * IAM Identity Center is currently the only available mode. Your users and groups
+     * must exist in an IAM Identity Center identity source in order to use this
+     * mode.</p>
      */
     inline UserGroupResolutionConfiguration& WithUserGroupResolutionMode(const UserGroupResolutionMode& value) { SetUserGroupResolutionMode(value); return *this;}
 
     /**
      * <p>The identity store provider (mode) you want to use to get users and groups.
-     * IAM Identity Center (successor to Single Sign-On) is currently the only
-     * available mode. Your users and groups must exist in an IAM Identity Center
-     * identity source in order to use this mode.</p>
+     * IAM Identity Center is currently the only available mode. Your users and groups
+     * must exist in an IAM Identity Center identity source in order to use this
+     * mode.</p>
      */
     inline UserGroupResolutionConfiguration& WithUserGroupResolutionMode(UserGroupResolutionMode&& value) { SetUserGroupResolutionMode(std::move(value)); return *this;}
 
diff --git a/generated/src/aws-cpp-sdk-kendra/source/KendraEndpointRules.cpp b/generated/src/aws-cpp-sdk-kendra/source/KendraEndpointRules.cpp
index 27a05db46ca..48c42d43d5e 100644
--- a/generated/src/aws-cpp-sdk-kendra/source/KendraEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-kendra/source/KendraEndpointRules.cpp
@@ -51,106 +51,106 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
+'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
 'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
 '"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
-'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','k','e','n','d',
-'r','a','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i',
-'o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f',
-'i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a',
-'d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n',
-'t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
-'r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',
-' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a',
-'r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ',
-'o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o',
-'r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',',','"','t','y','p','e',
-'"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
-'t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r',
-'l','"',':','"','h','t','t','p','s',':','/','/','k','e','n','d','r','a','-','f','i','p','s','.','{',
-'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
-'d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':',
-'{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"',
-'e','n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s',
-'"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a',
-'b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d',
-'o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y',
-'p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o',
-'n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s',
-'"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l',
-'S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t',
-'r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n',
-'s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',
-',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A',
-'t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t',
-'i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u',
-'a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e',
-'e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','k','e','n','d','r','a','-','f','i','p',
+'s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u',
+'l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"',
+'p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':',
+'{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"',
+'t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n',
+'s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D',
+'u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',
+' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ',
+'s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p',
+'e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e',
+'"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
+'b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"',
+'r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',
+':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t',
+'"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',',','t','r','u','e',']',
+'}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',
 ':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t',
-'t','p','s',':','/','/','k','e','n','d','r','a','.','{','R','e','g','i','o','n','}','.','{','P','a',
-'r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n',
-'s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',
-',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n',
-'d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
-'[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ',
-'e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o',
-'n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t',
-'a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',
-':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','k','e','n','d','r','a','.','{',
-'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
-'d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':',
-'{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"',
-'e','n','d','p','o','i','n','t','"','}',']','}',']','}',',','{','"','c','o','n','d','i','t','i','o',
+'t','p','s',':','/','/','k','e','n','d','r','a','-','f','i','p','s','.','{','R','e','g','i','o','n',
+'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f',
+'f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e',
+'a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i',
+'n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P',
+'S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r',
+'t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F',
+'I','P','S','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y',
+'p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
+':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a',
+'c','k','"','}',',','t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c',
+'o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a',
+'n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f',
+'n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
+'f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u',
+'p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','r','u',
+'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
+'n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/',
+'k','e','n','d','r','a','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o',
+'n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i',
+'x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d',
+'e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t',
+'"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d',
+'i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S',
+'t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ',
+'p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r',
+'t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o',
+'r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n',
+'d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"',
+'u','r','l','"',':','"','h','t','t','p','s',':','/','/','k','e','n','d','r','a','.','{','R','e','g',
+'i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s',
+'S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',',
+'"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d',
+'p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',']',',',
+'"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o',
 'n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C',
 'o','n','f','i','g','u','r','a','t','i','o','n',':',' ','M','i','s','s','i','n','g',' ','R','e','g',
 'i','o','n','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}','\0'
diff --git a/generated/src/aws-cpp-sdk-kendra/source/model/CollapseConfiguration.cpp b/generated/src/aws-cpp-sdk-kendra/source/model/CollapseConfiguration.cpp
new file mode 100644
index 00000000000..b232562f9d2
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/source/model/CollapseConfiguration.cpp
@@ -0,0 +1,130 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/kendra/model/CollapseConfiguration.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace kendra
+{
+namespace Model
+{
+
+CollapseConfiguration::CollapseConfiguration() : 
+    m_documentAttributeKeyHasBeenSet(false),
+    m_sortingConfigurationsHasBeenSet(false),
+    m_missingAttributeKeyStrategy(MissingAttributeKeyStrategy::NOT_SET),
+    m_missingAttributeKeyStrategyHasBeenSet(false),
+    m_expand(false),
+    m_expandHasBeenSet(false),
+    m_expandConfigurationHasBeenSet(false)
+{
+}
+
+CollapseConfiguration::CollapseConfiguration(JsonView jsonValue) : 
+    m_documentAttributeKeyHasBeenSet(false),
+    m_sortingConfigurationsHasBeenSet(false),
+    m_missingAttributeKeyStrategy(MissingAttributeKeyStrategy::NOT_SET),
+    m_missingAttributeKeyStrategyHasBeenSet(false),
+    m_expand(false),
+    m_expandHasBeenSet(false),
+    m_expandConfigurationHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+CollapseConfiguration& CollapseConfiguration::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("DocumentAttributeKey"))
+  {
+    m_documentAttributeKey = jsonValue.GetString("DocumentAttributeKey");
+
+    m_documentAttributeKeyHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("SortingConfigurations"))
+  {
+    Aws::Utils::Array<JsonView> sortingConfigurationsJsonList = jsonValue.GetArray("SortingConfigurations");
+    for(unsigned sortingConfigurationsIndex = 0; sortingConfigurationsIndex < sortingConfigurationsJsonList.GetLength(); ++sortingConfigurationsIndex)
+    {
+      m_sortingConfigurations.push_back(sortingConfigurationsJsonList[sortingConfigurationsIndex].AsObject());
+    }
+    m_sortingConfigurationsHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("MissingAttributeKeyStrategy"))
+  {
+    m_missingAttributeKeyStrategy = MissingAttributeKeyStrategyMapper::GetMissingAttributeKeyStrategyForName(jsonValue.GetString("MissingAttributeKeyStrategy"));
+
+    m_missingAttributeKeyStrategyHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("Expand"))
+  {
+    m_expand = jsonValue.GetBool("Expand");
+
+    m_expandHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("ExpandConfiguration"))
+  {
+    m_expandConfiguration = jsonValue.GetObject("ExpandConfiguration");
+
+    m_expandConfigurationHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue CollapseConfiguration::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_documentAttributeKeyHasBeenSet)
+  {
+   payload.WithString("DocumentAttributeKey", m_documentAttributeKey);
+
+  }
+
+  if(m_sortingConfigurationsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> sortingConfigurationsJsonList(m_sortingConfigurations.size());
+   for(unsigned sortingConfigurationsIndex = 0; sortingConfigurationsIndex < sortingConfigurationsJsonList.GetLength(); ++sortingConfigurationsIndex)
+   {
+     sortingConfigurationsJsonList[sortingConfigurationsIndex].AsObject(m_sortingConfigurations[sortingConfigurationsIndex].Jsonize());
+   }
+   payload.WithArray("SortingConfigurations", std::move(sortingConfigurationsJsonList));
+
+  }
+
+  if(m_missingAttributeKeyStrategyHasBeenSet)
+  {
+   payload.WithString("MissingAttributeKeyStrategy", MissingAttributeKeyStrategyMapper::GetNameForMissingAttributeKeyStrategy(m_missingAttributeKeyStrategy));
+  }
+
+  if(m_expandHasBeenSet)
+  {
+   payload.WithBool("Expand", m_expand);
+
+  }
+
+  if(m_expandConfigurationHasBeenSet)
+  {
+   payload.WithObject("ExpandConfiguration", m_expandConfiguration.Jsonize());
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/source/model/CollapsedResultDetail.cpp b/generated/src/aws-cpp-sdk-kendra/source/model/CollapsedResultDetail.cpp
new file mode 100644
index 00000000000..5e99d524b6a
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/source/model/CollapsedResultDetail.cpp
@@ -0,0 +1,82 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/kendra/model/CollapsedResultDetail.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace kendra
+{
+namespace Model
+{
+
+CollapsedResultDetail::CollapsedResultDetail() : 
+    m_documentAttributeHasBeenSet(false),
+    m_expandedResultsHasBeenSet(false)
+{
+}
+
+CollapsedResultDetail::CollapsedResultDetail(JsonView jsonValue) : 
+    m_documentAttributeHasBeenSet(false),
+    m_expandedResultsHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+CollapsedResultDetail& CollapsedResultDetail::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("DocumentAttribute"))
+  {
+    m_documentAttribute = jsonValue.GetObject("DocumentAttribute");
+
+    m_documentAttributeHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("ExpandedResults"))
+  {
+    Aws::Utils::Array<JsonView> expandedResultsJsonList = jsonValue.GetArray("ExpandedResults");
+    for(unsigned expandedResultsIndex = 0; expandedResultsIndex < expandedResultsJsonList.GetLength(); ++expandedResultsIndex)
+    {
+      m_expandedResults.push_back(expandedResultsJsonList[expandedResultsIndex].AsObject());
+    }
+    m_expandedResultsHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue CollapsedResultDetail::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_documentAttributeHasBeenSet)
+  {
+   payload.WithObject("DocumentAttribute", m_documentAttribute.Jsonize());
+
+  }
+
+  if(m_expandedResultsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> expandedResultsJsonList(m_expandedResults.size());
+   for(unsigned expandedResultsIndex = 0; expandedResultsIndex < expandedResultsJsonList.GetLength(); ++expandedResultsIndex)
+   {
+     expandedResultsJsonList[expandedResultsIndex].AsObject(m_expandedResults[expandedResultsIndex].Jsonize());
+   }
+   payload.WithArray("ExpandedResults", std::move(expandedResultsJsonList));
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/source/model/ExpandConfiguration.cpp b/generated/src/aws-cpp-sdk-kendra/source/model/ExpandConfiguration.cpp
new file mode 100644
index 00000000000..79d4264c269
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/source/model/ExpandConfiguration.cpp
@@ -0,0 +1,78 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/kendra/model/ExpandConfiguration.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace kendra
+{
+namespace Model
+{
+
+ExpandConfiguration::ExpandConfiguration() : 
+    m_maxResultItemsToExpand(0),
+    m_maxResultItemsToExpandHasBeenSet(false),
+    m_maxExpandedResultsPerItem(0),
+    m_maxExpandedResultsPerItemHasBeenSet(false)
+{
+}
+
+ExpandConfiguration::ExpandConfiguration(JsonView jsonValue) : 
+    m_maxResultItemsToExpand(0),
+    m_maxResultItemsToExpandHasBeenSet(false),
+    m_maxExpandedResultsPerItem(0),
+    m_maxExpandedResultsPerItemHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+ExpandConfiguration& ExpandConfiguration::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("MaxResultItemsToExpand"))
+  {
+    m_maxResultItemsToExpand = jsonValue.GetInteger("MaxResultItemsToExpand");
+
+    m_maxResultItemsToExpandHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("MaxExpandedResultsPerItem"))
+  {
+    m_maxExpandedResultsPerItem = jsonValue.GetInteger("MaxExpandedResultsPerItem");
+
+    m_maxExpandedResultsPerItemHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue ExpandConfiguration::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_maxResultItemsToExpandHasBeenSet)
+  {
+   payload.WithInteger("MaxResultItemsToExpand", m_maxResultItemsToExpand);
+
+  }
+
+  if(m_maxExpandedResultsPerItemHasBeenSet)
+  {
+   payload.WithInteger("MaxExpandedResultsPerItem", m_maxExpandedResultsPerItem);
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/source/model/ExpandedResultItem.cpp b/generated/src/aws-cpp-sdk-kendra/source/model/ExpandedResultItem.cpp
new file mode 100644
index 00000000000..6002794478c
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/source/model/ExpandedResultItem.cpp
@@ -0,0 +1,142 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/kendra/model/ExpandedResultItem.h>
+#include <aws/core/utils/json/JsonSerializer.h>
+
+#include <utility>
+
+using namespace Aws::Utils::Json;
+using namespace Aws::Utils;
+
+namespace Aws
+{
+namespace kendra
+{
+namespace Model
+{
+
+ExpandedResultItem::ExpandedResultItem() : 
+    m_idHasBeenSet(false),
+    m_documentIdHasBeenSet(false),
+    m_documentTitleHasBeenSet(false),
+    m_documentExcerptHasBeenSet(false),
+    m_documentURIHasBeenSet(false),
+    m_documentAttributesHasBeenSet(false)
+{
+}
+
+ExpandedResultItem::ExpandedResultItem(JsonView jsonValue) : 
+    m_idHasBeenSet(false),
+    m_documentIdHasBeenSet(false),
+    m_documentTitleHasBeenSet(false),
+    m_documentExcerptHasBeenSet(false),
+    m_documentURIHasBeenSet(false),
+    m_documentAttributesHasBeenSet(false)
+{
+  *this = jsonValue;
+}
+
+ExpandedResultItem& ExpandedResultItem::operator =(JsonView jsonValue)
+{
+  if(jsonValue.ValueExists("Id"))
+  {
+    m_id = jsonValue.GetString("Id");
+
+    m_idHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("DocumentId"))
+  {
+    m_documentId = jsonValue.GetString("DocumentId");
+
+    m_documentIdHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("DocumentTitle"))
+  {
+    m_documentTitle = jsonValue.GetObject("DocumentTitle");
+
+    m_documentTitleHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("DocumentExcerpt"))
+  {
+    m_documentExcerpt = jsonValue.GetObject("DocumentExcerpt");
+
+    m_documentExcerptHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("DocumentURI"))
+  {
+    m_documentURI = jsonValue.GetString("DocumentURI");
+
+    m_documentURIHasBeenSet = true;
+  }
+
+  if(jsonValue.ValueExists("DocumentAttributes"))
+  {
+    Aws::Utils::Array<JsonView> documentAttributesJsonList = jsonValue.GetArray("DocumentAttributes");
+    for(unsigned documentAttributesIndex = 0; documentAttributesIndex < documentAttributesJsonList.GetLength(); ++documentAttributesIndex)
+    {
+      m_documentAttributes.push_back(documentAttributesJsonList[documentAttributesIndex].AsObject());
+    }
+    m_documentAttributesHasBeenSet = true;
+  }
+
+  return *this;
+}
+
+JsonValue ExpandedResultItem::Jsonize() const
+{
+  JsonValue payload;
+
+  if(m_idHasBeenSet)
+  {
+   payload.WithString("Id", m_id);
+
+  }
+
+  if(m_documentIdHasBeenSet)
+  {
+   payload.WithString("DocumentId", m_documentId);
+
+  }
+
+  if(m_documentTitleHasBeenSet)
+  {
+   payload.WithObject("DocumentTitle", m_documentTitle.Jsonize());
+
+  }
+
+  if(m_documentExcerptHasBeenSet)
+  {
+   payload.WithObject("DocumentExcerpt", m_documentExcerpt.Jsonize());
+
+  }
+
+  if(m_documentURIHasBeenSet)
+  {
+   payload.WithString("DocumentURI", m_documentURI);
+
+  }
+
+  if(m_documentAttributesHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> documentAttributesJsonList(m_documentAttributes.size());
+   for(unsigned documentAttributesIndex = 0; documentAttributesIndex < documentAttributesJsonList.GetLength(); ++documentAttributesIndex)
+   {
+     documentAttributesJsonList[documentAttributesIndex].AsObject(m_documentAttributes[documentAttributesIndex].Jsonize());
+   }
+   payload.WithArray("DocumentAttributes", std::move(documentAttributesJsonList));
+
+  }
+
+  return payload;
+}
+
+} // namespace Model
+} // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/source/model/MissingAttributeKeyStrategy.cpp b/generated/src/aws-cpp-sdk-kendra/source/model/MissingAttributeKeyStrategy.cpp
new file mode 100644
index 00000000000..9fbc8921559
--- /dev/null
+++ b/generated/src/aws-cpp-sdk-kendra/source/model/MissingAttributeKeyStrategy.cpp
@@ -0,0 +1,79 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+
+#include <aws/kendra/model/MissingAttributeKeyStrategy.h>
+#include <aws/core/utils/HashingUtils.h>
+#include <aws/core/Globals.h>
+#include <aws/core/utils/EnumParseOverflowContainer.h>
+
+using namespace Aws::Utils;
+
+
+namespace Aws
+{
+  namespace kendra
+  {
+    namespace Model
+    {
+      namespace MissingAttributeKeyStrategyMapper
+      {
+
+        static const int IGNORE_HASH = HashingUtils::HashString("IGNORE");
+        static const int COLLAPSE_HASH = HashingUtils::HashString("COLLAPSE");
+        static const int EXPAND_HASH = HashingUtils::HashString("EXPAND");
+
+
+        MissingAttributeKeyStrategy GetMissingAttributeKeyStrategyForName(const Aws::String& name)
+        {
+          int hashCode = HashingUtils::HashString(name.c_str());
+          if (hashCode == IGNORE_HASH)
+          {
+            return MissingAttributeKeyStrategy::IGNORE;
+          }
+          else if (hashCode == COLLAPSE_HASH)
+          {
+            return MissingAttributeKeyStrategy::COLLAPSE;
+          }
+          else if (hashCode == EXPAND_HASH)
+          {
+            return MissingAttributeKeyStrategy::EXPAND;
+          }
+          EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+          if(overflowContainer)
+          {
+            overflowContainer->StoreOverflow(hashCode, name);
+            return static_cast<MissingAttributeKeyStrategy>(hashCode);
+          }
+
+          return MissingAttributeKeyStrategy::NOT_SET;
+        }
+
+        Aws::String GetNameForMissingAttributeKeyStrategy(MissingAttributeKeyStrategy enumValue)
+        {
+          switch(enumValue)
+          {
+          case MissingAttributeKeyStrategy::NOT_SET:
+            return {};
+          case MissingAttributeKeyStrategy::IGNORE:
+            return "IGNORE";
+          case MissingAttributeKeyStrategy::COLLAPSE:
+            return "COLLAPSE";
+          case MissingAttributeKeyStrategy::EXPAND:
+            return "EXPAND";
+          default:
+            EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer();
+            if(overflowContainer)
+            {
+              return overflowContainer->RetrieveOverflow(static_cast<int>(enumValue));
+            }
+
+            return {};
+          }
+        }
+
+      } // namespace MissingAttributeKeyStrategyMapper
+    } // namespace Model
+  } // namespace kendra
+} // namespace Aws
diff --git a/generated/src/aws-cpp-sdk-kendra/source/model/QueryRequest.cpp b/generated/src/aws-cpp-sdk-kendra/source/model/QueryRequest.cpp
index 4206927cf46..43d4dc92274 100644
--- a/generated/src/aws-cpp-sdk-kendra/source/model/QueryRequest.cpp
+++ b/generated/src/aws-cpp-sdk-kendra/source/model/QueryRequest.cpp
@@ -26,9 +26,11 @@ QueryRequest::QueryRequest() :
     m_pageSize(0),
     m_pageSizeHasBeenSet(false),
     m_sortingConfigurationHasBeenSet(false),
+    m_sortingConfigurationsHasBeenSet(false),
     m_userContextHasBeenSet(false),
     m_visitorIdHasBeenSet(false),
-    m_spellCorrectionConfigurationHasBeenSet(false)
+    m_spellCorrectionConfigurationHasBeenSet(false),
+    m_collapseConfigurationHasBeenSet(false)
 {
 }
 
@@ -110,6 +112,17 @@ Aws::String QueryRequest::SerializePayload() const
 
   }
 
+  if(m_sortingConfigurationsHasBeenSet)
+  {
+   Aws::Utils::Array<JsonValue> sortingConfigurationsJsonList(m_sortingConfigurations.size());
+   for(unsigned sortingConfigurationsIndex = 0; sortingConfigurationsIndex < sortingConfigurationsJsonList.GetLength(); ++sortingConfigurationsIndex)
+   {
+     sortingConfigurationsJsonList[sortingConfigurationsIndex].AsObject(m_sortingConfigurations[sortingConfigurationsIndex].Jsonize());
+   }
+   payload.WithArray("SortingConfigurations", std::move(sortingConfigurationsJsonList));
+
+  }
+
   if(m_userContextHasBeenSet)
   {
    payload.WithObject("UserContext", m_userContext.Jsonize());
@@ -128,6 +141,12 @@ Aws::String QueryRequest::SerializePayload() const
 
   }
 
+  if(m_collapseConfigurationHasBeenSet)
+  {
+   payload.WithObject("CollapseConfiguration", m_collapseConfiguration.Jsonize());
+
+  }
+
   return payload.View().WriteReadable();
 }
 
diff --git a/generated/src/aws-cpp-sdk-kendra/source/model/QueryResultItem.cpp b/generated/src/aws-cpp-sdk-kendra/source/model/QueryResultItem.cpp
index 73ac8d0468a..1ec8ea9c41a 100644
--- a/generated/src/aws-cpp-sdk-kendra/source/model/QueryResultItem.cpp
+++ b/generated/src/aws-cpp-sdk-kendra/source/model/QueryResultItem.cpp
@@ -32,7 +32,8 @@ QueryResultItem::QueryResultItem() :
     m_documentAttributesHasBeenSet(false),
     m_scoreAttributesHasBeenSet(false),
     m_feedbackTokenHasBeenSet(false),
-    m_tableExcerptHasBeenSet(false)
+    m_tableExcerptHasBeenSet(false),
+    m_collapsedResultDetailHasBeenSet(false)
 {
 }
 
@@ -50,7 +51,8 @@ QueryResultItem::QueryResultItem(JsonView jsonValue) :
     m_documentAttributesHasBeenSet(false),
     m_scoreAttributesHasBeenSet(false),
     m_feedbackTokenHasBeenSet(false),
-    m_tableExcerptHasBeenSet(false)
+    m_tableExcerptHasBeenSet(false),
+    m_collapsedResultDetailHasBeenSet(false)
 {
   *this = jsonValue;
 }
@@ -147,6 +149,13 @@ QueryResultItem& QueryResultItem::operator =(JsonView jsonValue)
     m_tableExcerptHasBeenSet = true;
   }
 
+  if(jsonValue.ValueExists("CollapsedResultDetail"))
+  {
+    m_collapsedResultDetail = jsonValue.GetObject("CollapsedResultDetail");
+
+    m_collapsedResultDetailHasBeenSet = true;
+  }
+
   return *this;
 }
 
@@ -234,6 +243,12 @@ JsonValue QueryResultItem::Jsonize() const
 
   }
 
+  if(m_collapsedResultDetailHasBeenSet)
+  {
+   payload.WithObject("CollapsedResultDetail", m_collapsedResultDetail.Jsonize());
+
+  }
+
   return payload;
 }
 
diff --git a/generated/src/aws-cpp-sdk-medialive/include/aws/medialive/MediaLiveClient.h b/generated/src/aws-cpp-sdk-medialive/include/aws/medialive/MediaLiveClient.h
index 6893fb7e7c7..fa1feb08f95 100644
--- a/generated/src/aws-cpp-sdk-medialive/include/aws/medialive/MediaLiveClient.h
+++ b/generated/src/aws-cpp-sdk-medialive/include/aws/medialive/MediaLiveClient.h
@@ -631,6 +631,31 @@ namespace MediaLive
             return SubmitAsync(&MediaLiveClient::DeleteTags, request, handler, context);
         }
 
+        /**
+         * Get account configuration<p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/medialive-2017-10-14/DescribeAccountConfiguration">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::DescribeAccountConfigurationOutcome DescribeAccountConfiguration(const Model::DescribeAccountConfigurationRequest& request) const;
+
+        /**
+         * A Callable wrapper for DescribeAccountConfiguration that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename DescribeAccountConfigurationRequestT = Model::DescribeAccountConfigurationRequest>
+        Model::DescribeAccountConfigurationOutcomeCallable DescribeAccountConfigurationCallable(const DescribeAccountConfigurationRequestT& request) const
+        {
+            return SubmitCallable(&MediaLiveClient::DescribeAccountConfiguration, request);
+        }
+
+        /**
+         * An Async wrapper for DescribeAccountConfiguration that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename DescribeAccountConfigurationRequestT = Model::DescribeAccountConfigurationRequest>
+        void DescribeAccountConfigurationAsync(const DescribeAccountConfigurationRequestT& request, const DescribeAccountConfigurationResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&MediaLiveClient::DescribeAccountConfiguration, request, handler, context);
+        }
+
         /**
          * Gets details about a channel<p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/medialive-2017-10-14/DescribeChannel">AWS
@@ -881,31 +906,6 @@ namespace MediaLive
             return SubmitAsync(&MediaLiveClient::DescribeSchedule, request, handler, context);
         }
 
-        /**
-         * Get account configuration<p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/medialive-2017-10-14/DescribeAccountConfiguration">AWS
-         * API Reference</a></p>
-         */
-        virtual Model::DescribeAccountConfigurationOutcome DescribeAccountConfiguration(const Model::DescribeAccountConfigurationRequest& request) const;
-
-        /**
-         * A Callable wrapper for DescribeAccountConfiguration that returns a future to the operation so that it can be executed in parallel to other requests.
-         */
-        template<typename DescribeAccountConfigurationRequestT = Model::DescribeAccountConfigurationRequest>
-        Model::DescribeAccountConfigurationOutcomeCallable DescribeAccountConfigurationCallable(const DescribeAccountConfigurationRequestT& request) const
-        {
-            return SubmitCallable(&MediaLiveClient::DescribeAccountConfiguration, request);
-        }
-
-        /**
-         * An Async wrapper for DescribeAccountConfiguration that queues the request into a thread executor and triggers associated callback when operation has finished.
-         */
-        template<typename DescribeAccountConfigurationRequestT = Model::DescribeAccountConfigurationRequest>
-        void DescribeAccountConfigurationAsync(const DescribeAccountConfigurationRequestT& request, const DescribeAccountConfigurationResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
-        {
-            return SubmitAsync(&MediaLiveClient::DescribeAccountConfiguration, request, handler, context);
-        }
-
         /**
          * Describe the latest thumbnails data.<p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/medialive-2017-10-14/DescribeThumbnails">AWS
@@ -1265,31 +1265,6 @@ namespace MediaLive
             return SubmitAsync(&MediaLiveClient::RejectInputDeviceTransfer, request, handler, context);
         }
 
-        /**
-         * Update account configuration<p><h3>See Also:</h3>   <a
-         * href="http://docs.aws.amazon.com/goto/WebAPI/medialive-2017-10-14/UpdateAccountConfiguration">AWS
-         * API Reference</a></p>
-         */
-        virtual Model::UpdateAccountConfigurationOutcome UpdateAccountConfiguration(const Model::UpdateAccountConfigurationRequest& request) const;
-
-        /**
-         * A Callable wrapper for UpdateAccountConfiguration that returns a future to the operation so that it can be executed in parallel to other requests.
-         */
-        template<typename UpdateAccountConfigurationRequestT = Model::UpdateAccountConfigurationRequest>
-        Model::UpdateAccountConfigurationOutcomeCallable UpdateAccountConfigurationCallable(const UpdateAccountConfigurationRequestT& request) const
-        {
-            return SubmitCallable(&MediaLiveClient::UpdateAccountConfiguration, request);
-        }
-
-        /**
-         * An Async wrapper for UpdateAccountConfiguration that queues the request into a thread executor and triggers associated callback when operation has finished.
-         */
-        template<typename UpdateAccountConfigurationRequestT = Model::UpdateAccountConfigurationRequest>
-        void UpdateAccountConfigurationAsync(const UpdateAccountConfigurationRequestT& request, const UpdateAccountConfigurationResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
-        {
-            return SubmitAsync(&MediaLiveClient::UpdateAccountConfiguration, request, handler, context);
-        }
-
         /**
          * Starts an existing channel<p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/medialive-2017-10-14/StartChannel">AWS
@@ -1505,6 +1480,31 @@ namespace MediaLive
             return SubmitAsync(&MediaLiveClient::TransferInputDevice, request, handler, context);
         }
 
+        /**
+         * Update account configuration<p><h3>See Also:</h3>   <a
+         * href="http://docs.aws.amazon.com/goto/WebAPI/medialive-2017-10-14/UpdateAccountConfiguration">AWS
+         * API Reference</a></p>
+         */
+        virtual Model::UpdateAccountConfigurationOutcome UpdateAccountConfiguration(const Model::UpdateAccountConfigurationRequest& request) const;
+
+        /**
+         * A Callable wrapper for UpdateAccountConfiguration that returns a future to the operation so that it can be executed in parallel to other requests.
+         */
+        template<typename UpdateAccountConfigurationRequestT = Model::UpdateAccountConfigurationRequest>
+        Model::UpdateAccountConfigurationOutcomeCallable UpdateAccountConfigurationCallable(const UpdateAccountConfigurationRequestT& request) const
+        {
+            return SubmitCallable(&MediaLiveClient::UpdateAccountConfiguration, request);
+        }
+
+        /**
+         * An Async wrapper for UpdateAccountConfiguration that queues the request into a thread executor and triggers associated callback when operation has finished.
+         */
+        template<typename UpdateAccountConfigurationRequestT = Model::UpdateAccountConfigurationRequest>
+        void UpdateAccountConfigurationAsync(const UpdateAccountConfigurationRequestT& request, const UpdateAccountConfigurationResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const
+        {
+            return SubmitAsync(&MediaLiveClient::UpdateAccountConfiguration, request, handler, context);
+        }
+
         /**
          * Updates a channel.<p><h3>See Also:</h3>   <a
          * href="http://docs.aws.amazon.com/goto/WebAPI/medialive-2017-10-14/UpdateChannel">AWS
diff --git a/generated/src/aws-cpp-sdk-medialive/include/aws/medialive/MediaLiveServiceClientModel.h b/generated/src/aws-cpp-sdk-medialive/include/aws/medialive/MediaLiveServiceClientModel.h
index 30ef7bdf958..9106763c4e1 100644
--- a/generated/src/aws-cpp-sdk-medialive/include/aws/medialive/MediaLiveServiceClientModel.h
+++ b/generated/src/aws-cpp-sdk-medialive/include/aws/medialive/MediaLiveServiceClientModel.h
@@ -38,6 +38,7 @@
 #include <aws/medialive/model/DeleteMultiplexProgramResult.h>
 #include <aws/medialive/model/DeleteReservationResult.h>
 #include <aws/medialive/model/DeleteScheduleResult.h>
+#include <aws/medialive/model/DescribeAccountConfigurationResult.h>
 #include <aws/medialive/model/DescribeChannelResult.h>
 #include <aws/medialive/model/DescribeInputResult.h>
 #include <aws/medialive/model/DescribeInputDeviceResult.h>
@@ -48,7 +49,6 @@
 #include <aws/medialive/model/DescribeOfferingResult.h>
 #include <aws/medialive/model/DescribeReservationResult.h>
 #include <aws/medialive/model/DescribeScheduleResult.h>
-#include <aws/medialive/model/DescribeAccountConfigurationResult.h>
 #include <aws/medialive/model/DescribeThumbnailsResult.h>
 #include <aws/medialive/model/ListChannelsResult.h>
 #include <aws/medialive/model/ListInputDeviceTransfersResult.h>
@@ -63,7 +63,6 @@
 #include <aws/medialive/model/PurchaseOfferingResult.h>
 #include <aws/medialive/model/RebootInputDeviceResult.h>
 #include <aws/medialive/model/RejectInputDeviceTransferResult.h>
-#include <aws/medialive/model/UpdateAccountConfigurationResult.h>
 #include <aws/medialive/model/StartChannelResult.h>
 #include <aws/medialive/model/StartInputDeviceResult.h>
 #include <aws/medialive/model/StartInputDeviceMaintenanceWindowResult.h>
@@ -72,6 +71,7 @@
 #include <aws/medialive/model/StopInputDeviceResult.h>
 #include <aws/medialive/model/StopMultiplexResult.h>
 #include <aws/medialive/model/TransferInputDeviceResult.h>
+#include <aws/medialive/model/UpdateAccountConfigurationResult.h>
 #include <aws/medialive/model/UpdateChannelResult.h>
 #include <aws/medialive/model/UpdateChannelClassResult.h>
 #include <aws/medialive/model/UpdateInputResult.h>
@@ -143,6 +143,7 @@ namespace Aws
       class DeleteReservationRequest;
       class DeleteScheduleRequest;
       class DeleteTagsRequest;
+      class DescribeAccountConfigurationRequest;
       class DescribeChannelRequest;
       class DescribeInputRequest;
       class DescribeInputDeviceRequest;
@@ -153,7 +154,6 @@ namespace Aws
       class DescribeOfferingRequest;
       class DescribeReservationRequest;
       class DescribeScheduleRequest;
-      class DescribeAccountConfigurationRequest;
       class DescribeThumbnailsRequest;
       class ListChannelsRequest;
       class ListInputDeviceTransfersRequest;
@@ -168,7 +168,6 @@ namespace Aws
       class PurchaseOfferingRequest;
       class RebootInputDeviceRequest;
       class RejectInputDeviceTransferRequest;
-      class UpdateAccountConfigurationRequest;
       class StartChannelRequest;
       class StartInputDeviceRequest;
       class StartInputDeviceMaintenanceWindowRequest;
@@ -177,6 +176,7 @@ namespace Aws
       class StopInputDeviceRequest;
       class StopMultiplexRequest;
       class TransferInputDeviceRequest;
+      class UpdateAccountConfigurationRequest;
       class UpdateChannelRequest;
       class UpdateChannelClassRequest;
       class UpdateInputRequest;
@@ -210,6 +210,7 @@ namespace Aws
       typedef Aws::Utils::Outcome<DeleteReservationResult, MediaLiveError> DeleteReservationOutcome;
       typedef Aws::Utils::Outcome<DeleteScheduleResult, MediaLiveError> DeleteScheduleOutcome;
       typedef Aws::Utils::Outcome<Aws::NoResult, MediaLiveError> DeleteTagsOutcome;
+      typedef Aws::Utils::Outcome<DescribeAccountConfigurationResult, MediaLiveError> DescribeAccountConfigurationOutcome;
       typedef Aws::Utils::Outcome<DescribeChannelResult, MediaLiveError> DescribeChannelOutcome;
       typedef Aws::Utils::Outcome<DescribeInputResult, MediaLiveError> DescribeInputOutcome;
       typedef Aws::Utils::Outcome<DescribeInputDeviceResult, MediaLiveError> DescribeInputDeviceOutcome;
@@ -220,7 +221,6 @@ namespace Aws
       typedef Aws::Utils::Outcome<DescribeOfferingResult, MediaLiveError> DescribeOfferingOutcome;
       typedef Aws::Utils::Outcome<DescribeReservationResult, MediaLiveError> DescribeReservationOutcome;
       typedef Aws::Utils::Outcome<DescribeScheduleResult, MediaLiveError> DescribeScheduleOutcome;
-      typedef Aws::Utils::Outcome<DescribeAccountConfigurationResult, MediaLiveError> DescribeAccountConfigurationOutcome;
       typedef Aws::Utils::Outcome<DescribeThumbnailsResult, MediaLiveError> DescribeThumbnailsOutcome;
       typedef Aws::Utils::Outcome<ListChannelsResult, MediaLiveError> ListChannelsOutcome;
       typedef Aws::Utils::Outcome<ListInputDeviceTransfersResult, MediaLiveError> ListInputDeviceTransfersOutcome;
@@ -235,7 +235,6 @@ namespace Aws
       typedef Aws::Utils::Outcome<PurchaseOfferingResult, MediaLiveError> PurchaseOfferingOutcome;
       typedef Aws::Utils::Outcome<RebootInputDeviceResult, MediaLiveError> RebootInputDeviceOutcome;
       typedef Aws::Utils::Outcome<RejectInputDeviceTransferResult, MediaLiveError> RejectInputDeviceTransferOutcome;
-      typedef Aws::Utils::Outcome<UpdateAccountConfigurationResult, MediaLiveError> UpdateAccountConfigurationOutcome;
       typedef Aws::Utils::Outcome<StartChannelResult, MediaLiveError> StartChannelOutcome;
       typedef Aws::Utils::Outcome<StartInputDeviceResult, MediaLiveError> StartInputDeviceOutcome;
       typedef Aws::Utils::Outcome<StartInputDeviceMaintenanceWindowResult, MediaLiveError> StartInputDeviceMaintenanceWindowOutcome;
@@ -244,6 +243,7 @@ namespace Aws
       typedef Aws::Utils::Outcome<StopInputDeviceResult, MediaLiveError> StopInputDeviceOutcome;
       typedef Aws::Utils::Outcome<StopMultiplexResult, MediaLiveError> StopMultiplexOutcome;
       typedef Aws::Utils::Outcome<TransferInputDeviceResult, MediaLiveError> TransferInputDeviceOutcome;
+      typedef Aws::Utils::Outcome<UpdateAccountConfigurationResult, MediaLiveError> UpdateAccountConfigurationOutcome;
       typedef Aws::Utils::Outcome<UpdateChannelResult, MediaLiveError> UpdateChannelOutcome;
       typedef Aws::Utils::Outcome<UpdateChannelClassResult, MediaLiveError> UpdateChannelClassOutcome;
       typedef Aws::Utils::Outcome<UpdateInputResult, MediaLiveError> UpdateInputOutcome;
@@ -277,6 +277,7 @@ namespace Aws
       typedef std::future<DeleteReservationOutcome> DeleteReservationOutcomeCallable;
       typedef std::future<DeleteScheduleOutcome> DeleteScheduleOutcomeCallable;
       typedef std::future<DeleteTagsOutcome> DeleteTagsOutcomeCallable;
+      typedef std::future<DescribeAccountConfigurationOutcome> DescribeAccountConfigurationOutcomeCallable;
       typedef std::future<DescribeChannelOutcome> DescribeChannelOutcomeCallable;
       typedef std::future<DescribeInputOutcome> DescribeInputOutcomeCallable;
       typedef std::future<DescribeInputDeviceOutcome> DescribeInputDeviceOutcomeCallable;
@@ -287,7 +288,6 @@ namespace Aws
       typedef std::future<DescribeOfferingOutcome> DescribeOfferingOutcomeCallable;
       typedef std::future<DescribeReservationOutcome> DescribeReservationOutcomeCallable;
       typedef std::future<DescribeScheduleOutcome> DescribeScheduleOutcomeCallable;
-      typedef std::future<DescribeAccountConfigurationOutcome> DescribeAccountConfigurationOutcomeCallable;
       typedef std::future<DescribeThumbnailsOutcome> DescribeThumbnailsOutcomeCallable;
       typedef std::future<ListChannelsOutcome> ListChannelsOutcomeCallable;
       typedef std::future<ListInputDeviceTransfersOutcome> ListInputDeviceTransfersOutcomeCallable;
@@ -302,7 +302,6 @@ namespace Aws
       typedef std::future<PurchaseOfferingOutcome> PurchaseOfferingOutcomeCallable;
       typedef std::future<RebootInputDeviceOutcome> RebootInputDeviceOutcomeCallable;
       typedef std::future<RejectInputDeviceTransferOutcome> RejectInputDeviceTransferOutcomeCallable;
-      typedef std::future<UpdateAccountConfigurationOutcome> UpdateAccountConfigurationOutcomeCallable;
       typedef std::future<StartChannelOutcome> StartChannelOutcomeCallable;
       typedef std::future<StartInputDeviceOutcome> StartInputDeviceOutcomeCallable;
       typedef std::future<StartInputDeviceMaintenanceWindowOutcome> StartInputDeviceMaintenanceWindowOutcomeCallable;
@@ -311,6 +310,7 @@ namespace Aws
       typedef std::future<StopInputDeviceOutcome> StopInputDeviceOutcomeCallable;
       typedef std::future<StopMultiplexOutcome> StopMultiplexOutcomeCallable;
       typedef std::future<TransferInputDeviceOutcome> TransferInputDeviceOutcomeCallable;
+      typedef std::future<UpdateAccountConfigurationOutcome> UpdateAccountConfigurationOutcomeCallable;
       typedef std::future<UpdateChannelOutcome> UpdateChannelOutcomeCallable;
       typedef std::future<UpdateChannelClassOutcome> UpdateChannelClassOutcomeCallable;
       typedef std::future<UpdateInputOutcome> UpdateInputOutcomeCallable;
@@ -347,6 +347,7 @@ namespace Aws
     typedef std::function<void(const MediaLiveClient*, const Model::DeleteReservationRequest&, const Model::DeleteReservationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteReservationResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::DeleteScheduleRequest&, const Model::DeleteScheduleOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteScheduleResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::DeleteTagsRequest&, const Model::DeleteTagsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DeleteTagsResponseReceivedHandler;
+    typedef std::function<void(const MediaLiveClient*, const Model::DescribeAccountConfigurationRequest&, const Model::DescribeAccountConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeAccountConfigurationResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::DescribeChannelRequest&, const Model::DescribeChannelOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeChannelResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::DescribeInputRequest&, const Model::DescribeInputOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeInputResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::DescribeInputDeviceRequest&, const Model::DescribeInputDeviceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeInputDeviceResponseReceivedHandler;
@@ -357,7 +358,6 @@ namespace Aws
     typedef std::function<void(const MediaLiveClient*, const Model::DescribeOfferingRequest&, const Model::DescribeOfferingOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeOfferingResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::DescribeReservationRequest&, const Model::DescribeReservationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeReservationResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::DescribeScheduleRequest&, const Model::DescribeScheduleOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeScheduleResponseReceivedHandler;
-    typedef std::function<void(const MediaLiveClient*, const Model::DescribeAccountConfigurationRequest&, const Model::DescribeAccountConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeAccountConfigurationResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::DescribeThumbnailsRequest&, const Model::DescribeThumbnailsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeThumbnailsResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::ListChannelsRequest&, const Model::ListChannelsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListChannelsResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::ListInputDeviceTransfersRequest&, const Model::ListInputDeviceTransfersOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > ListInputDeviceTransfersResponseReceivedHandler;
@@ -372,7 +372,6 @@ namespace Aws
     typedef std::function<void(const MediaLiveClient*, const Model::PurchaseOfferingRequest&, const Model::PurchaseOfferingOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > PurchaseOfferingResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::RebootInputDeviceRequest&, const Model::RebootInputDeviceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > RebootInputDeviceResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::RejectInputDeviceTransferRequest&, const Model::RejectInputDeviceTransferOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > RejectInputDeviceTransferResponseReceivedHandler;
-    typedef std::function<void(const MediaLiveClient*, const Model::UpdateAccountConfigurationRequest&, const Model::UpdateAccountConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateAccountConfigurationResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::StartChannelRequest&, const Model::StartChannelOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > StartChannelResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::StartInputDeviceRequest&, const Model::StartInputDeviceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > StartInputDeviceResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::StartInputDeviceMaintenanceWindowRequest&, const Model::StartInputDeviceMaintenanceWindowOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > StartInputDeviceMaintenanceWindowResponseReceivedHandler;
@@ -381,6 +380,7 @@ namespace Aws
     typedef std::function<void(const MediaLiveClient*, const Model::StopInputDeviceRequest&, const Model::StopInputDeviceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > StopInputDeviceResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::StopMultiplexRequest&, const Model::StopMultiplexOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > StopMultiplexResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::TransferInputDeviceRequest&, const Model::TransferInputDeviceOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > TransferInputDeviceResponseReceivedHandler;
+    typedef std::function<void(const MediaLiveClient*, const Model::UpdateAccountConfigurationRequest&, const Model::UpdateAccountConfigurationOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateAccountConfigurationResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::UpdateChannelRequest&, const Model::UpdateChannelOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateChannelResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::UpdateChannelClassRequest&, const Model::UpdateChannelClassOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateChannelClassResponseReceivedHandler;
     typedef std::function<void(const MediaLiveClient*, const Model::UpdateInputRequest&, const Model::UpdateInputOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > UpdateInputResponseReceivedHandler;
diff --git a/generated/src/aws-cpp-sdk-medialive/source/MediaLiveClient.cpp b/generated/src/aws-cpp-sdk-medialive/source/MediaLiveClient.cpp
index c6133d407dc..3f010e467a1 100644
--- a/generated/src/aws-cpp-sdk-medialive/source/MediaLiveClient.cpp
+++ b/generated/src/aws-cpp-sdk-medialive/source/MediaLiveClient.cpp
@@ -43,6 +43,7 @@
 #include <aws/medialive/model/DeleteReservationRequest.h>
 #include <aws/medialive/model/DeleteScheduleRequest.h>
 #include <aws/medialive/model/DeleteTagsRequest.h>
+#include <aws/medialive/model/DescribeAccountConfigurationRequest.h>
 #include <aws/medialive/model/DescribeChannelRequest.h>
 #include <aws/medialive/model/DescribeInputRequest.h>
 #include <aws/medialive/model/DescribeInputDeviceRequest.h>
@@ -53,7 +54,6 @@
 #include <aws/medialive/model/DescribeOfferingRequest.h>
 #include <aws/medialive/model/DescribeReservationRequest.h>
 #include <aws/medialive/model/DescribeScheduleRequest.h>
-#include <aws/medialive/model/DescribeAccountConfigurationRequest.h>
 #include <aws/medialive/model/DescribeThumbnailsRequest.h>
 #include <aws/medialive/model/ListChannelsRequest.h>
 #include <aws/medialive/model/ListInputDeviceTransfersRequest.h>
@@ -68,7 +68,6 @@
 #include <aws/medialive/model/PurchaseOfferingRequest.h>
 #include <aws/medialive/model/RebootInputDeviceRequest.h>
 #include <aws/medialive/model/RejectInputDeviceTransferRequest.h>
-#include <aws/medialive/model/UpdateAccountConfigurationRequest.h>
 #include <aws/medialive/model/StartChannelRequest.h>
 #include <aws/medialive/model/StartInputDeviceRequest.h>
 #include <aws/medialive/model/StartInputDeviceMaintenanceWindowRequest.h>
@@ -77,6 +76,7 @@
 #include <aws/medialive/model/StopInputDeviceRequest.h>
 #include <aws/medialive/model/StopMultiplexRequest.h>
 #include <aws/medialive/model/TransferInputDeviceRequest.h>
+#include <aws/medialive/model/UpdateAccountConfigurationRequest.h>
 #include <aws/medialive/model/UpdateChannelRequest.h>
 #include <aws/medialive/model/UpdateChannelClassRequest.h>
 #include <aws/medialive/model/UpdateInputRequest.h>
@@ -914,6 +914,33 @@ DeleteTagsOutcome MediaLiveClient::DeleteTags(const DeleteTagsRequest& request)
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+DescribeAccountConfigurationOutcome MediaLiveClient::DescribeAccountConfiguration(const DescribeAccountConfigurationRequest& request) const
+{
+  AWS_OPERATION_GUARD(DescribeAccountConfiguration);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, DescribeAccountConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, DescribeAccountConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, DescribeAccountConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".DescribeAccountConfiguration",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<DescribeAccountConfigurationOutcome>(
+    [&]()-> DescribeAccountConfigurationOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, DescribeAccountConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/prod/accountConfiguration");
+      return DescribeAccountConfigurationOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 DescribeChannelOutcome MediaLiveClient::DescribeChannel(const DescribeChannelRequest& request) const
 {
   AWS_OPERATION_GUARD(DescribeChannel);
@@ -1258,33 +1285,6 @@ DescribeScheduleOutcome MediaLiveClient::DescribeSchedule(const DescribeSchedule
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-DescribeAccountConfigurationOutcome MediaLiveClient::DescribeAccountConfiguration(const DescribeAccountConfigurationRequest& request) const
-{
-  AWS_OPERATION_GUARD(DescribeAccountConfiguration);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, DescribeAccountConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, DescribeAccountConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, DescribeAccountConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".DescribeAccountConfiguration",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<DescribeAccountConfigurationOutcome>(
-    [&]()-> DescribeAccountConfigurationOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, DescribeAccountConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/prod/accountConfiguration");
-      return DescribeAccountConfigurationOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_GET, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 DescribeThumbnailsOutcome MediaLiveClient::DescribeThumbnails(const DescribeThumbnailsRequest& request) const
 {
   AWS_OPERATION_GUARD(DescribeThumbnails);
@@ -1719,33 +1719,6 @@ RejectInputDeviceTransferOutcome MediaLiveClient::RejectInputDeviceTransfer(cons
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
-UpdateAccountConfigurationOutcome MediaLiveClient::UpdateAccountConfiguration(const UpdateAccountConfigurationRequest& request) const
-{
-  AWS_OPERATION_GUARD(UpdateAccountConfiguration);
-  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateAccountConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
-  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateAccountConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
-  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
-  AWS_OPERATION_CHECK_PTR(meter, UpdateAccountConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
-  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateAccountConfiguration",
-    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
-    smithy::components::tracing::SpanKind::CLIENT);
-  return TracingUtils::MakeCallWithTiming<UpdateAccountConfigurationOutcome>(
-    [&]()-> UpdateAccountConfigurationOutcome {
-      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
-          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
-          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
-          *meter,
-          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateAccountConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
-      endpointResolutionOutcome.GetResult().AddPathSegments("/prod/accountConfiguration");
-      return UpdateAccountConfigurationOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
-    },
-    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
-    *meter,
-    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
-}
-
 StartChannelOutcome MediaLiveClient::StartChannel(const StartChannelRequest& request) const
 {
   AWS_OPERATION_GUARD(StartChannel);
@@ -2018,6 +1991,33 @@ TransferInputDeviceOutcome MediaLiveClient::TransferInputDevice(const TransferIn
     {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 }
 
+UpdateAccountConfigurationOutcome MediaLiveClient::UpdateAccountConfiguration(const UpdateAccountConfigurationRequest& request) const
+{
+  AWS_OPERATION_GUARD(UpdateAccountConfiguration);
+  AWS_OPERATION_CHECK_PTR(m_endpointProvider, UpdateAccountConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE);
+  AWS_OPERATION_CHECK_PTR(m_telemetryProvider, UpdateAccountConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto tracer = m_telemetryProvider->getTracer(this->GetServiceClientName(), {});
+  auto meter = m_telemetryProvider->getMeter(this->GetServiceClientName(), {});
+  AWS_OPERATION_CHECK_PTR(meter, UpdateAccountConfiguration, CoreErrors, CoreErrors::NOT_INITIALIZED);
+  auto span = tracer->CreateSpan(Aws::String(this->GetServiceClientName()) + ".UpdateAccountConfiguration",
+    {{ TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName() }, { TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName() }, { TracingUtils::SMITHY_SYSTEM_DIMENSION, TracingUtils::SMITHY_METHOD_AWS_VALUE }},
+    smithy::components::tracing::SpanKind::CLIENT);
+  return TracingUtils::MakeCallWithTiming<UpdateAccountConfigurationOutcome>(
+    [&]()-> UpdateAccountConfigurationOutcome {
+      auto endpointResolutionOutcome = TracingUtils::MakeCallWithTiming<ResolveEndpointOutcome>(
+          [&]() -> ResolveEndpointOutcome { return m_endpointProvider->ResolveEndpoint(request.GetEndpointContextParams()); },
+          TracingUtils::SMITHY_CLIENT_ENDPOINT_RESOLUTION_METRIC,
+          *meter,
+          {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+      AWS_OPERATION_CHECK_SUCCESS(endpointResolutionOutcome, UpdateAccountConfiguration, CoreErrors, CoreErrors::ENDPOINT_RESOLUTION_FAILURE, endpointResolutionOutcome.GetError().GetMessage());
+      endpointResolutionOutcome.GetResult().AddPathSegments("/prod/accountConfiguration");
+      return UpdateAccountConfigurationOutcome(MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::SIGV4_SIGNER));
+    },
+    TracingUtils::SMITHY_CLIENT_DURATION_METRIC,
+    *meter,
+    {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()}, {TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
+}
+
 UpdateChannelOutcome MediaLiveClient::UpdateChannel(const UpdateChannelRequest& request) const
 {
   AWS_OPERATION_GUARD(UpdateChannel);
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateBlueGreenDeploymentRequest.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateBlueGreenDeploymentRequest.h
index 9e7606e1eb2..8dc3030bc86 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateBlueGreenDeploymentRequest.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateBlueGreenDeploymentRequest.h
@@ -387,6 +387,84 @@ namespace Model
      */
     inline CreateBlueGreenDeploymentRequest& AddTags(Tag&& value) { m_tagsHasBeenSet = true; m_tags.push_back(std::move(value)); return *this; }
 
+
+    /**
+     * <p>Specify the DB instance class for the databases in the green environment.</p>
+     */
+    inline const Aws::String& GetTargetDBInstanceClass() const{ return m_targetDBInstanceClass; }
+
+    /**
+     * <p>Specify the DB instance class for the databases in the green environment.</p>
+     */
+    inline bool TargetDBInstanceClassHasBeenSet() const { return m_targetDBInstanceClassHasBeenSet; }
+
+    /**
+     * <p>Specify the DB instance class for the databases in the green environment.</p>
+     */
+    inline void SetTargetDBInstanceClass(const Aws::String& value) { m_targetDBInstanceClassHasBeenSet = true; m_targetDBInstanceClass = value; }
+
+    /**
+     * <p>Specify the DB instance class for the databases in the green environment.</p>
+     */
+    inline void SetTargetDBInstanceClass(Aws::String&& value) { m_targetDBInstanceClassHasBeenSet = true; m_targetDBInstanceClass = std::move(value); }
+
+    /**
+     * <p>Specify the DB instance class for the databases in the green environment.</p>
+     */
+    inline void SetTargetDBInstanceClass(const char* value) { m_targetDBInstanceClassHasBeenSet = true; m_targetDBInstanceClass.assign(value); }
+
+    /**
+     * <p>Specify the DB instance class for the databases in the green environment.</p>
+     */
+    inline CreateBlueGreenDeploymentRequest& WithTargetDBInstanceClass(const Aws::String& value) { SetTargetDBInstanceClass(value); return *this;}
+
+    /**
+     * <p>Specify the DB instance class for the databases in the green environment.</p>
+     */
+    inline CreateBlueGreenDeploymentRequest& WithTargetDBInstanceClass(Aws::String&& value) { SetTargetDBInstanceClass(std::move(value)); return *this;}
+
+    /**
+     * <p>Specify the DB instance class for the databases in the green environment.</p>
+     */
+    inline CreateBlueGreenDeploymentRequest& WithTargetDBInstanceClass(const char* value) { SetTargetDBInstanceClass(value); return *this;}
+
+
+    /**
+     * <p>Whether to upgrade the storage file system configuration on the green
+     * database. This option migrates the green DB instance from the older 32-bit file
+     * system to the preferred configuration. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem">Upgrading
+     * the storage file system for a DB instance</a>.</p>
+     */
+    inline bool GetUpgradeTargetStorageConfig() const{ return m_upgradeTargetStorageConfig; }
+
+    /**
+     * <p>Whether to upgrade the storage file system configuration on the green
+     * database. This option migrates the green DB instance from the older 32-bit file
+     * system to the preferred configuration. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem">Upgrading
+     * the storage file system for a DB instance</a>.</p>
+     */
+    inline bool UpgradeTargetStorageConfigHasBeenSet() const { return m_upgradeTargetStorageConfigHasBeenSet; }
+
+    /**
+     * <p>Whether to upgrade the storage file system configuration on the green
+     * database. This option migrates the green DB instance from the older 32-bit file
+     * system to the preferred configuration. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem">Upgrading
+     * the storage file system for a DB instance</a>.</p>
+     */
+    inline void SetUpgradeTargetStorageConfig(bool value) { m_upgradeTargetStorageConfigHasBeenSet = true; m_upgradeTargetStorageConfig = value; }
+
+    /**
+     * <p>Whether to upgrade the storage file system configuration on the green
+     * database. This option migrates the green DB instance from the older 32-bit file
+     * system to the preferred configuration. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem">Upgrading
+     * the storage file system for a DB instance</a>.</p>
+     */
+    inline CreateBlueGreenDeploymentRequest& WithUpgradeTargetStorageConfig(bool value) { SetUpgradeTargetStorageConfig(value); return *this;}
+
   private:
 
     Aws::String m_blueGreenDeploymentName;
@@ -406,6 +484,12 @@ namespace Model
 
     Aws::Vector<Tag> m_tags;
     bool m_tagsHasBeenSet = false;
+
+    Aws::String m_targetDBInstanceClass;
+    bool m_targetDBInstanceClassHasBeenSet = false;
+
+    bool m_upgradeTargetStorageConfig;
+    bool m_upgradeTargetStorageConfigHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateDBInstanceReadReplicaRequest.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateDBInstanceReadReplicaRequest.h
index 7134735db2f..14e0ca5eb32 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateDBInstanceReadReplicaRequest.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/CreateDBInstanceReadReplicaRequest.h
@@ -3402,6 +3402,35 @@ namespace Model
     inline CreateDBInstanceReadReplicaRequest& WithDedicatedLogVolume(bool value) { SetDedicatedLogVolume(value); return *this;}
 
 
+    /**
+     * <p>Whether to upgrade the storage file system configuration on the read replica.
+     * This option migrates the read replica from the old storage file system layout to
+     * the preferred layout.</p>
+     */
+    inline bool GetUpgradeStorageConfig() const{ return m_upgradeStorageConfig; }
+
+    /**
+     * <p>Whether to upgrade the storage file system configuration on the read replica.
+     * This option migrates the read replica from the old storage file system layout to
+     * the preferred layout.</p>
+     */
+    inline bool UpgradeStorageConfigHasBeenSet() const { return m_upgradeStorageConfigHasBeenSet; }
+
+    /**
+     * <p>Whether to upgrade the storage file system configuration on the read replica.
+     * This option migrates the read replica from the old storage file system layout to
+     * the preferred layout.</p>
+     */
+    inline void SetUpgradeStorageConfig(bool value) { m_upgradeStorageConfigHasBeenSet = true; m_upgradeStorageConfig = value; }
+
+    /**
+     * <p>Whether to upgrade the storage file system configuration on the read replica.
+     * This option migrates the read replica from the old storage file system layout to
+     * the preferred layout.</p>
+     */
+    inline CreateDBInstanceReadReplicaRequest& WithUpgradeStorageConfig(bool value) { SetUpgradeStorageConfig(value); return *this;}
+
+
     /**
      * If SourceRegion is specified, SDKs will generate pre-signed URLs and populate the pre-signed URL field.
      */
@@ -3573,6 +3602,9 @@ namespace Model
     bool m_dedicatedLogVolume;
     bool m_dedicatedLogVolumeHasBeenSet = false;
 
+    bool m_upgradeStorageConfig;
+    bool m_upgradeStorageConfigHasBeenSet = false;
+
     Aws::String m_sourceRegion;
     bool m_sourceRegionHasBeenSet = false;
   };
diff --git a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DBInstance.h b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DBInstance.h
index 6c971ae81e0..1e8b4e8abb8 100644
--- a/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DBInstance.h
+++ b/generated/src/aws-cpp-sdk-rds/include/aws/rds/model/DBInstance.h
@@ -3881,6 +3881,47 @@ namespace Model
      */
     inline DBInstance& WithDedicatedLogVolume(bool value) { SetDedicatedLogVolume(value); return *this;}
 
+
+    /**
+     * <p>Indicates whether an upgrade is recommended for the storage file system
+     * configuration on the DB instance. To migrate to the preferred configuration, you
+     * can either create a blue/green deployment, or create a read replica from the DB
+     * instance. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem">Upgrading
+     * the storage file system for a DB instance</a>.</p>
+     */
+    inline bool GetIsStorageConfigUpgradeAvailable() const{ return m_isStorageConfigUpgradeAvailable; }
+
+    /**
+     * <p>Indicates whether an upgrade is recommended for the storage file system
+     * configuration on the DB instance. To migrate to the preferred configuration, you
+     * can either create a blue/green deployment, or create a read replica from the DB
+     * instance. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem">Upgrading
+     * the storage file system for a DB instance</a>.</p>
+     */
+    inline bool IsStorageConfigUpgradeAvailableHasBeenSet() const { return m_isStorageConfigUpgradeAvailableHasBeenSet; }
+
+    /**
+     * <p>Indicates whether an upgrade is recommended for the storage file system
+     * configuration on the DB instance. To migrate to the preferred configuration, you
+     * can either create a blue/green deployment, or create a read replica from the DB
+     * instance. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem">Upgrading
+     * the storage file system for a DB instance</a>.</p>
+     */
+    inline void SetIsStorageConfigUpgradeAvailable(bool value) { m_isStorageConfigUpgradeAvailableHasBeenSet = true; m_isStorageConfigUpgradeAvailable = value; }
+
+    /**
+     * <p>Indicates whether an upgrade is recommended for the storage file system
+     * configuration on the DB instance. To migrate to the preferred configuration, you
+     * can either create a blue/green deployment, or create a read replica from the DB
+     * instance. For more information, see <a
+     * href="https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem">Upgrading
+     * the storage file system for a DB instance</a>.</p>
+     */
+    inline DBInstance& WithIsStorageConfigUpgradeAvailable(bool value) { SetIsStorageConfigUpgradeAvailable(value); return *this;}
+
   private:
 
     Aws::String m_dBInstanceIdentifier;
@@ -4131,6 +4172,9 @@ namespace Model
 
     bool m_dedicatedLogVolume;
     bool m_dedicatedLogVolumeHasBeenSet = false;
+
+    bool m_isStorageConfigUpgradeAvailable;
+    bool m_isStorageConfigUpgradeAvailableHasBeenSet = false;
   };
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-rds/source/RDSEndpointRules.cpp b/generated/src/aws-cpp-sdk-rds/source/RDSEndpointRules.cpp
index 68299d04f40..fb9016ddf13 100644
--- a/generated/src/aws-cpp-sdk-rds/source/RDSEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-rds/source/RDSEndpointRules.cpp
@@ -51,114 +51,114 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
+'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
 'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
 '"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
-'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','r','d','s','-','f','i','p','s','.','{',
+'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
+'d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o',
+'p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',
+',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p',
+'e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
+'[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l',
+'S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h',
+'i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p',
+'p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',',
 '{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
+'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f',
+'"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','r','u','l',
+'e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',
+':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[',
 '{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
 '"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','r','d','s','-',
-'f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R',
-'e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}',
-'"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r',
-'s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o',
-'r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',' ','a','r',
-'e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i',
-'t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','o','n','e',
-' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',
-']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
-'b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"',
-'r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"',
-'t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c',
-'o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a',
-'n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f',
-'n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u',
-'p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"',
-'t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o',
-'n','s','"',':','[','{','"','f','n','"',':','"','s','t','r','i','n','g','E','q','u','a','l','s','"',
-',','"','a','r','g','v','"',':','[','"','a','w','s','-','u','s','-','g','o','v','"',',','{','"','f',
-'n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','n','a',
-'m','e','"',']','}',']','}',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l',
-'"',':','"','h','t','t','p','s',':','/','/','r','d','s','.','{','R','e','g','i','o','n','}','.','a',
-'m','a','z','o','n','a','w','s','.','c','o','m','"',',','"','p','r','o','p','e','r','t','i','e','s',
-'"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',
-':','"','e','n','d','p','o','i','n','t','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s',
-'"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h',
-'t','t','p','s',':','/','/','r','d','s','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.',
-'{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i',
-'x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d',
-'e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t',
-'"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r',
-'r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',
-' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ',
-'s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y','p','e','"',':','"','e','r','r',
-'o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f',
-'n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',
-':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',',
-'t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
-'[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s',
-'u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',
-']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e',
-'s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d',
-'p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','r','d',
-'s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u',
-'l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"',
-'p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':',
-'{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',',',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':',
-'"','D','u','a','l','S','t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',
-' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ',
-'s','u','p','p','o','r','t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',
-':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
-':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t',
-'t','p','s',':','/','/','r','d','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i',
+'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',',','t','r','u','e',']','}',']',',',
+'"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','s','t','r','i','n','g','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',
+':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t',
+'"','}',',','"','n','a','m','e','"',']','}',',','"','a','w','s','-','u','s','-','g','o','v','"',']',
+'}',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t',
+'p','s',':','/','/','r','d','s','.','{','R','e','g','i','o','n','}','.','a','m','a','z','o','n','a',
+'w','s','.','c','o','m','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"',
+'h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p',
+'o','i','n','t','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/',
+'/','r','d','s','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i',
 't','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p',
 'r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{',
-'}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',']','}',
+'}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t',
+'y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s',
+'"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a',
+'b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d',
+'o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y',
+'p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e',
+'e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':',
+'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{',
+'"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u',
+'e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n',
+'s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',
+',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A',
+'t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t',
+'i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u',
+'a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"',
+'c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',
+':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','r','d','s','.','{','R','e','g',
+'i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a',
+'l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r',
+'t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t',
+'y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':',
+'"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',',
+'"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ','e','n','a',
+'b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d',
+'o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t','a','c','k',
+'"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',
+':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',
+',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',
+':','/','/','r','d','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o',
+'n','R','e','s','u','l','t','#','d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p',
+'e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',',
+'"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e',
+'"',':','"','t','r','e','e','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
 ',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',
 ':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ',
 'M','i','s','s','i','n','g',' ','R','e','g','i','o','n','"',',','"','t','y','p','e','"',':','"','e',
diff --git a/generated/src/aws-cpp-sdk-rds/source/model/CreateBlueGreenDeploymentRequest.cpp b/generated/src/aws-cpp-sdk-rds/source/model/CreateBlueGreenDeploymentRequest.cpp
index cad9aec286d..baf69db2ba1 100644
--- a/generated/src/aws-cpp-sdk-rds/source/model/CreateBlueGreenDeploymentRequest.cpp
+++ b/generated/src/aws-cpp-sdk-rds/source/model/CreateBlueGreenDeploymentRequest.cpp
@@ -16,7 +16,10 @@ CreateBlueGreenDeploymentRequest::CreateBlueGreenDeploymentRequest() :
     m_targetEngineVersionHasBeenSet(false),
     m_targetDBParameterGroupNameHasBeenSet(false),
     m_targetDBClusterParameterGroupNameHasBeenSet(false),
-    m_tagsHasBeenSet(false)
+    m_tagsHasBeenSet(false),
+    m_targetDBInstanceClassHasBeenSet(false),
+    m_upgradeTargetStorageConfig(false),
+    m_upgradeTargetStorageConfigHasBeenSet(false)
 {
 }
 
@@ -59,6 +62,16 @@ Aws::String CreateBlueGreenDeploymentRequest::SerializePayload() const
     }
   }
 
+  if(m_targetDBInstanceClassHasBeenSet)
+  {
+    ss << "TargetDBInstanceClass=" << StringUtils::URLEncode(m_targetDBInstanceClass.c_str()) << "&";
+  }
+
+  if(m_upgradeTargetStorageConfigHasBeenSet)
+  {
+    ss << "UpgradeTargetStorageConfig=" << std::boolalpha << m_upgradeTargetStorageConfig << "&";
+  }
+
   ss << "Version=2014-10-31";
   return ss.str();
 }
diff --git a/generated/src/aws-cpp-sdk-rds/source/model/CreateDBInstanceReadReplicaRequest.cpp b/generated/src/aws-cpp-sdk-rds/source/model/CreateDBInstanceReadReplicaRequest.cpp
index 8b27e046736..d34a5f0f780 100644
--- a/generated/src/aws-cpp-sdk-rds/source/model/CreateDBInstanceReadReplicaRequest.cpp
+++ b/generated/src/aws-cpp-sdk-rds/source/model/CreateDBInstanceReadReplicaRequest.cpp
@@ -72,6 +72,8 @@ CreateDBInstanceReadReplicaRequest::CreateDBInstanceReadReplicaRequest() :
     m_sourceDBClusterIdentifierHasBeenSet(false),
     m_dedicatedLogVolume(false),
     m_dedicatedLogVolumeHasBeenSet(false),
+    m_upgradeStorageConfig(false),
+    m_upgradeStorageConfigHasBeenSet(false),
     m_sourceRegionHasBeenSet(false)
 {
 }
@@ -323,6 +325,11 @@ Aws::String CreateDBInstanceReadReplicaRequest::SerializePayload() const
     ss << "DedicatedLogVolume=" << std::boolalpha << m_dedicatedLogVolume << "&";
   }
 
+  if(m_upgradeStorageConfigHasBeenSet)
+  {
+    ss << "UpgradeStorageConfig=" << std::boolalpha << m_upgradeStorageConfig << "&";
+  }
+
   ss << "Version=2014-10-31";
   return ss.str();
 }
diff --git a/generated/src/aws-cpp-sdk-rds/source/model/DBInstance.cpp b/generated/src/aws-cpp-sdk-rds/source/model/DBInstance.cpp
index 04b30641a52..868ffdb0254 100644
--- a/generated/src/aws-cpp-sdk-rds/source/model/DBInstance.cpp
+++ b/generated/src/aws-cpp-sdk-rds/source/model/DBInstance.cpp
@@ -128,7 +128,9 @@ DBInstance::DBInstance() :
     m_readReplicaSourceDBClusterIdentifierHasBeenSet(false),
     m_percentProgressHasBeenSet(false),
     m_dedicatedLogVolume(false),
-    m_dedicatedLogVolumeHasBeenSet(false)
+    m_dedicatedLogVolumeHasBeenSet(false),
+    m_isStorageConfigUpgradeAvailable(false),
+    m_isStorageConfigUpgradeAvailableHasBeenSet(false)
 {
 }
 
@@ -240,7 +242,9 @@ DBInstance::DBInstance(const XmlNode& xmlNode) :
     m_readReplicaSourceDBClusterIdentifierHasBeenSet(false),
     m_percentProgressHasBeenSet(false),
     m_dedicatedLogVolume(false),
-    m_dedicatedLogVolumeHasBeenSet(false)
+    m_dedicatedLogVolumeHasBeenSet(false),
+    m_isStorageConfigUpgradeAvailable(false),
+    m_isStorageConfigUpgradeAvailableHasBeenSet(false)
 {
   *this = xmlNode;
 }
@@ -827,6 +831,12 @@ DBInstance& DBInstance::operator =(const XmlNode& xmlNode)
       m_dedicatedLogVolume = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(dedicatedLogVolumeNode.GetText()).c_str()).c_str());
       m_dedicatedLogVolumeHasBeenSet = true;
     }
+    XmlNode isStorageConfigUpgradeAvailableNode = resultNode.FirstChild("IsStorageConfigUpgradeAvailable");
+    if(!isStorageConfigUpgradeAvailableNode.IsNull())
+    {
+      m_isStorageConfigUpgradeAvailable = StringUtils::ConvertToBool(StringUtils::Trim(Aws::Utils::Xml::DecodeEscapedXmlText(isStorageConfigUpgradeAvailableNode.GetText()).c_str()).c_str());
+      m_isStorageConfigUpgradeAvailableHasBeenSet = true;
+    }
   }
 
   return *this;
@@ -1333,6 +1343,11 @@ void DBInstance::OutputToStream(Aws::OStream& oStream, const char* location, uns
       oStream << location << index << locationValue << ".DedicatedLogVolume=" << std::boolalpha << m_dedicatedLogVolume << "&";
   }
 
+  if(m_isStorageConfigUpgradeAvailableHasBeenSet)
+  {
+      oStream << location << index << locationValue << ".IsStorageConfigUpgradeAvailable=" << std::boolalpha << m_isStorageConfigUpgradeAvailable << "&";
+  }
+
 }
 
 void DBInstance::OutputToStream(Aws::OStream& oStream, const char* location) const
@@ -1753,6 +1768,10 @@ void DBInstance::OutputToStream(Aws::OStream& oStream, const char* location) con
   {
       oStream << location << ".DedicatedLogVolume=" << std::boolalpha << m_dedicatedLogVolume << "&";
   }
+  if(m_isStorageConfigUpgradeAvailableHasBeenSet)
+  {
+      oStream << location << ".IsStorageConfigUpgradeAvailable=" << std::boolalpha << m_isStorageConfigUpgradeAvailable << "&";
+  }
 }
 
 } // namespace Model
diff --git a/generated/src/aws-cpp-sdk-wisdom/source/ConnectWisdomServiceEndpointRules.cpp b/generated/src/aws-cpp-sdk-wisdom/source/ConnectWisdomServiceEndpointRules.cpp
index be96eb30842..d2593aaeaab 100644
--- a/generated/src/aws-cpp-sdk-wisdom/source/ConnectWisdomServiceEndpointRules.cpp
+++ b/generated/src/aws-cpp-sdk-wisdom/source/ConnectWisdomServiceEndpointRules.cpp
@@ -51,106 +51,106 @@ static constexpr RulesBlobT RulesBlob = {{
 ',','"','t','y','p','e','"',':','"','S','t','r','i','n','g','"','}','}',',','"','r','u','l','e','s',
 '"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
 'i','s','S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','E','n',
-'d','p','o','i','n','t','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',
-',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',
-'{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r',
-'g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r',
-'u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o',
-'n','f','i','g','u','r','a','t','i','o','n',':',' ','F','I','P','S',' ','a','n','d',' ','c','u','s',
-'t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p',
-'o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e',
+'d','p','o','i','n','t','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
+'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
+'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':',
+'"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','F',
+'I','P','S',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a',
+'r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':',
+'"','e','r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{',
+'"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g',
+'v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"',
+'}',',','t','r','u','e',']','}',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i',
+'d',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',':',' ','D','u','a','l','s','t','a','c',
+'k',' ','a','n','d',' ','c','u','s','t','o','m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',
+' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','"',',','"','t','y','p','e','"',':','"','e',
+'r','r','o','r','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"',
+'e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','{','"','r','e','f','"',':','"',
+'E','n','d','p','o','i','n','t','"','}',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{',
+'}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e',
+'n','d','p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',
+',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
+'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
+'o','n','"','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t',
+'i','o','n','s','"',':','[','{','"','f','n','"',':','"','a','w','s','.','p','a','r','t','i','t','i',
+'o','n','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i','o',
+'n','"','}',']',',','"','a','s','s','i','g','n','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
+'t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u',
+'a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','F',
+'I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o','o','l','e',
 'a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':',
 '"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"',
-'e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C','o','n','f','i','g','u','r','a',
-'t','i','o','n',':',' ','D','u','a','l','s','t','a','c','k',' ','a','n','d',' ','c','u','s','t','o',
-'m',' ','e','n','d','p','o','i','n','t',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r',
-'t','e','d','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',',','{','"','c','o',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R',
+'e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']',
+'}',',','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t',
+'r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t',
+'i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l',
+'S','t','a','c','k','"',']','}',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
 'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{',
-'"','u','r','l','"',':','{','"','r','e','f','"',':','"','E','n','d','p','o','i','n','t','"','}',',',
-'"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',
-':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']','}',
-',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','i','s',
-'S','e','t','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','R','e','g','i',
-'o','n','"','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u',
-'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','a','w','s','.','p','a','r','t','i','t','i','o','n','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','R','e','g','i','o','n','"','}',']',',','"','a','s','s','i','g',
-'n','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',']',',','"','t',
-'y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o',
-'n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n',
-'E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U',
-'s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',',','{','"','f','n','"',':','"','b','o',
-'o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
-'f','"',':','"','U','s','e','D','u','a','l','S','t','a','c','k','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',',','{','"','f','n','"',':',
-'"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t',
-'r','u','e',',','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v',
-'"',':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l',
-'t','"','}',',','"','s','u','p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',
-']','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',
-':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o',
-'i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','w','i','s','d',
-'o','m','-','f','i','p','s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i',
-'o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f',
-'i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a',
-'d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n',
-'t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
-'r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D','u','a','l','S','t','a','c','k',
-' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',' ','t','h','i','s',' ','p','a',
-'r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ',
-'o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p','e','"',':','"','e','r','r','o',
-'r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n',
-'"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':',
-'[','{','"','r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',
-']',',','"','t','y','p','e','"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[',
-'{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o',
-'l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',',
-'{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{',
-'"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',',
-'"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',']','}',']',',','"','t','y','p','e',
-'"',':','"','t','r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i',
-'t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r',
-'l','"',':','"','h','t','t','p','s',':','/','/','w','i','s','d','o','m','-','f','i','p','s','.','{',
-'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
-'d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':',
-'{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"',
-'e','n','d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s',
-'"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','i','s',' ','e','n','a',
-'b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d',
-'o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F','I','P','S','"',',','"','t','y',
-'p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o',
-'n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s',
-'"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l',
-'S','t','a','c','k','"','}',',','t','r','u','e',']','}',']',',','"','t','y','p','e','"',':','"','t',
-'r','e','e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n',
-'s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',
-',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f','n','"',':','"','g','e','t','A',
-'t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','P','a','r','t',
-'i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u','p','p','o','r','t','s','D','u',
-'a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','t','y','p','e','"',':','"','t','r','e',
-'e','"',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',
+'"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','w','i','s','d','o','m','-','f','i','p',
+'s','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u',
+'l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i','x','}','"',',','"',
+'p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d','e','r','s','"',':',
+'{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t','"','}',']',',','"',
+'t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n',
+'s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P','S',' ','a','n','d',' ','D',
+'u','a','l','S','t','a','c','k',' ','a','r','e',' ','e','n','a','b','l','e','d',',',' ','b','u','t',
+' ','t','h','i','s',' ','p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ',
+'s','u','p','p','o','r','t',' ','o','n','e',' ','o','r',' ','b','o','t','h','"',',','"','t','y','p',
+'e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e',
+'"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"',
+'b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','{','"',
+'r','e','f','"',':','"','U','s','e','F','I','P','S','"','}',',','t','r','u','e',']','}',']',',','"',
+'r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[','{','"',
+'f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"','a','r','g','v',
+'"',':','[','{','"','f','n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',
+':','[','{','"','r','e','f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t',
+'"','}',',','"','s','u','p','p','o','r','t','s','F','I','P','S','"',']','}',',','t','r','u','e',']',
+'}',']',',','"','r','u','l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',
 ':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t',
-'t','p','s',':','/','/','w','i','s','d','o','m','.','{','R','e','g','i','o','n','}','.','{','P','a',
-'r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n',
-'s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',
-',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n',
-'d','p','o','i','n','t','"','}',']','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',':',
-'[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S','t','a','c','k',' ','i','s',' ',
-'e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r','t','i','t','i','o',
-'n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','D','u','a','l','S','t',
-'a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}',',','{','"',
-'c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',
-':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/','w','i','s','d','o','m','.','{',
-'R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#',
-'d','n','s','S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':',
-'{','}',',','"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"',
-'e','n','d','p','o','i','n','t','"','}',']','}',']','}',',','{','"','c','o','n','d','i','t','i','o',
+'t','p','s',':','/','/','w','i','s','d','o','m','-','f','i','p','s','.','{','R','e','g','i','o','n',
+'}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s','S','u','f',
+'f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e',
+'a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i',
+'n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o',
+'n','d','i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','F','I','P',
+'S',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ','p','a','r',
+'t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r','t',' ','F',
+'I','P','S','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']',',','"','t','y',
+'p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o','n','s','"',
+':','[','{','"','f','n','"',':','"','b','o','o','l','e','a','n','E','q','u','a','l','s','"',',','"',
+'a','r','g','v','"',':','[','{','"','r','e','f','"',':','"','U','s','e','D','u','a','l','S','t','a',
+'c','k','"','}',',','t','r','u','e',']','}',']',',','"','r','u','l','e','s','"',':','[','{','"','c',
+'o','n','d','i','t','i','o','n','s','"',':','[','{','"','f','n','"',':','"','b','o','o','l','e','a',
+'n','E','q','u','a','l','s','"',',','"','a','r','g','v','"',':','[','t','r','u','e',',','{','"','f',
+'n','"',':','"','g','e','t','A','t','t','r','"',',','"','a','r','g','v','"',':','[','{','"','r','e',
+'f','"',':','"','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','"','}',',','"','s','u',
+'p','p','o','r','t','s','D','u','a','l','S','t','a','c','k','"',']','}',']','}',']',',','"','r','u',
+'l','e','s','"',':','[','{','"','c','o','n','d','i','t','i','o','n','s','"',':','[',']',',','"','e',
+'n','d','p','o','i','n','t','"',':','{','"','u','r','l','"',':','"','h','t','t','p','s',':','/','/',
+'w','i','s','d','o','m','.','{','R','e','g','i','o','n','}','.','{','P','a','r','t','i','t','i','o',
+'n','R','e','s','u','l','t','#','d','u','a','l','S','t','a','c','k','D','n','s','S','u','f','f','i',
+'x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',','"','h','e','a','d',
+'e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d','p','o','i','n','t',
+'"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d',
+'i','t','i','o','n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','D','u','a','l','S',
+'t','a','c','k',' ','i','s',' ','e','n','a','b','l','e','d',' ','b','u','t',' ','t','h','i','s',' ',
+'p','a','r','t','i','t','i','o','n',' ','d','o','e','s',' ','n','o','t',' ','s','u','p','p','o','r',
+'t',' ','D','u','a','l','S','t','a','c','k','"',',','"','t','y','p','e','"',':','"','e','r','r','o',
+'r','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n',
+'d','i','t','i','o','n','s','"',':','[',']',',','"','e','n','d','p','o','i','n','t','"',':','{','"',
+'u','r','l','"',':','"','h','t','t','p','s',':','/','/','w','i','s','d','o','m','.','{','R','e','g',
+'i','o','n','}','.','{','P','a','r','t','i','t','i','o','n','R','e','s','u','l','t','#','d','n','s',
+'S','u','f','f','i','x','}','"',',','"','p','r','o','p','e','r','t','i','e','s','"',':','{','}',',',
+'"','h','e','a','d','e','r','s','"',':','{','}','}',',','"','t','y','p','e','"',':','"','e','n','d',
+'p','o','i','n','t','"','}',']',',','"','t','y','p','e','"',':','"','t','r','e','e','"','}',']',',',
+'"','t','y','p','e','"',':','"','t','r','e','e','"','}',',','{','"','c','o','n','d','i','t','i','o',
 'n','s','"',':','[',']',',','"','e','r','r','o','r','"',':','"','I','n','v','a','l','i','d',' ','C',
 'o','n','f','i','g','u','r','a','t','i','o','n',':',' ','M','i','s','s','i','n','g',' ','R','e','g',
 'i','o','n','"',',','"','t','y','p','e','"',':','"','e','r','r','o','r','"','}',']','}','\0'
diff --git a/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h b/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
index 3434d165f78..82f45e1c2ed 100644
--- a/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
+++ b/src/aws-cpp-sdk-core/include/aws/core/VersionConfig.h
@@ -4,7 +4,7 @@
  */
 #pragma once
 
-#define AWS_SDK_VERSION_STRING "1.11.181"
+#define AWS_SDK_VERSION_STRING "1.11.182"
 #define AWS_SDK_VERSION_MAJOR 1
 #define AWS_SDK_VERSION_MINOR 11
-#define AWS_SDK_VERSION_PATCH 181
+#define AWS_SDK_VERSION_PATCH 182
diff --git a/tools/code-generation/api-descriptions/cloud9-2017-09-23.normal.json b/tools/code-generation/api-descriptions/cloud9-2017-09-23.normal.json
index 6e6cee6be51..95dd7bffc83 100644
--- a/tools/code-generation/api-descriptions/cloud9-2017-09-23.normal.json
+++ b/tools/code-generation/api-descriptions/cloud9-2017-09-23.normal.json
@@ -330,7 +330,7 @@
         },
         "imageId":{
           "shape":"ImageId",
-          "documentation":"<p>The identifier for the Amazon Machine Image (AMI) that's used to create the EC2 instance. To choose an AMI for the instance, you must specify a valid AMI alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>The default Amazon Linux AMI is currently used if the parameter isn't explicitly assigned a value in the request. Because Amazon Linux AMI has ended standard support as of December 31, 2020, we recommend you choose Amazon Linux 2, which includes long term support through 2023.</p> <p>From December 31, 2023, the parameter for Amazon Linux will no longer be available when you specify an AMI for your instance. Amazon Linux 2 will then become the default AMI, which is used to launch your instance if no parameter is explicitly defined.</p> <p>Since Ubuntu 18.04 has ended standard support as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04: <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04: <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul> <li> <p> <b>Amazon Linux (default): <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2: <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04: <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04: <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64</code> </p> </li> </ul>"
+          "documentation":"<p>The identifier for the Amazon Machine Image (AMI) that's used to create the EC2 instance. To choose an AMI for the instance, you must specify a valid AMI alias or a valid Amazon EC2 Systems Manager (SSM) path.</p> <p>From November 20, 2023, you will be required to include the <code>imageId</code> parameter for the <code>CreateEnvironmentEC2</code> action. This change will be reflected across all direct methods of communicating with the API, such as Amazon Web Services SDK, Amazon Web Services CLI and Amazon Web Services CloudFormation. This change will only affect direct API consumers, and not Cloud9 console users.</p> <p>From January 22, 2024, Amazon Linux (AL1) will be removed from the list of available image IDs for Cloud9. This is necessary as AL1 will reach the end of maintenance support in December 2023, and as a result will no longer receive security updates. We recommend using Amazon Linux 2 as the AMI to create your environment as it is fully supported. This change will only affect direct API consumers, and not Cloud9 console users.</p> <p>Since Ubuntu 18.04 has ended standard support as of May 31, 2023, we recommend you choose Ubuntu 22.04.</p> <p> <b>AMI aliases </b> </p> <ul> <li> <p> <b>Amazon Linux (default): <code>amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2: <code>amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04: <code>ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04: <code>ubuntu-22.04-x86_64</code> </p> </li> </ul> <p> <b>SSM paths</b> </p> <ul> <li> <p> <b>Amazon Linux (default): <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-1-x86_64</code> </b> </p> </li> <li> <p>Amazon Linux 2: <code>resolve:ssm:/aws/service/cloud9/amis/amazonlinux-2-x86_64</code> </p> </li> <li> <p>Ubuntu 18.04: <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-18.04-x86_64</code> </p> </li> <li> <p>Ubuntu 22.04: <code>resolve:ssm:/aws/service/cloud9/amis/ubuntu-22.04-x86_64</code> </p> </li> </ul>"
         },
         "automaticStopTimeMinutes":{
           "shape":"AutomaticStopTimeMinutes",
diff --git a/tools/code-generation/api-descriptions/dynamodb-2012-08-10.normal.json b/tools/code-generation/api-descriptions/dynamodb-2012-08-10.normal.json
index b11b54a9c4c..eb9d7596b59 100644
--- a/tools/code-generation/api-descriptions/dynamodb-2012-08-10.normal.json
+++ b/tools/code-generation/api-descriptions/dynamodb-2012-08-10.normal.json
@@ -2785,7 +2785,7 @@
         },
         "ExportType":{
           "shape":"ExportType",
-          "documentation":"<p>Choice of whether to execute as a full export or incremental export. Valid values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If <code>INCREMENTAL_EXPORT</code> is provided, the <code>IncrementalExportSpecification</code> must also be used.</p>"
+          "documentation":"<p>The type of export that was performed. Valid values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>"
         },
         "IncrementalExportSpecification":{
           "shape":"IncrementalExportSpecification",
@@ -2839,7 +2839,7 @@
         },
         "ExportType":{
           "shape":"ExportType",
-          "documentation":"<p>Choice of whether to execute as a full export or incremental export. Valid values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If <code>INCREMENTAL_EXPORT</code> is provided, the <code>IncrementalExportSpecification</code> must also be used.</p>"
+          "documentation":"<p>The type of export that was performed. Valid values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>.</p>"
         }
       },
       "documentation":"<p>Summary information about an export task.</p>"
@@ -2890,7 +2890,7 @@
         },
         "ExportType":{
           "shape":"ExportType",
-          "documentation":"<p>Choice of whether to execute as a full export or incremental export. Valid values are <code>FULL_EXPORT</code> or <code>INCREMENTAL_EXPORT</code>. If <code>INCREMENTAL_EXPORT</code> is provided, the <code>IncrementalExportSpecification</code> must also be used.</p>"
+          "documentation":"<p>Choice of whether to execute as a full export or incremental export. Valid values are FULL_EXPORT or INCREMENTAL_EXPORT. The default value is FULL_EXPORT. If INCREMENTAL_EXPORT is provided, the IncrementalExportSpecification must also be used.</p>"
         },
         "IncrementalExportSpecification":{
           "shape":"IncrementalExportSpecification",
@@ -3500,7 +3500,7 @@
         },
         "ExportViewType":{
           "shape":"ExportViewType",
-          "documentation":"<p>Choice of whether to output the previous item image prior to the start time of the incremental export. Valid values are <code>NEW_AND_OLD_IMAGES</code> and <code>NEW_IMAGES</code>.</p>"
+          "documentation":"<p>The view type that was chosen for the export. Valid values are <code>NEW_AND_OLD_IMAGES</code> and <code>NEW_IMAGES</code>. The default value is <code>NEW_AND_OLD_IMAGES</code>.</p>"
         }
       },
       "documentation":"<p>Optional object containing the parameters specific to an incremental export.</p>"
@@ -5306,7 +5306,7 @@
         },
         "FilterExpression":{
           "shape":"ConditionExpression",
-          "documentation":"<p>A string that contains conditions that DynamoDB applies after the <code>Scan</code> operation, but before the data is returned to you. Items that do not satisfy the <code>FilterExpression</code> criteria are not returned.</p> <note> <p>A <code>FilterExpression</code> is applied after the items have already been read; the process of filtering does not consume any additional read capacity units.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#Query.FilterExpression\">Filter Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>"
+          "documentation":"<p>A string that contains conditions that DynamoDB applies after the <code>Scan</code> operation, but before the data is returned to you. Items that do not satisfy the <code>FilterExpression</code> criteria are not returned.</p> <note> <p>A <code>FilterExpression</code> is applied after the items have already been read; the process of filtering does not consume any additional read capacity units.</p> </note> <p>For more information, see <a href=\"https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Scan.html#Scan.FilterExpression\">Filter Expressions</a> in the <i>Amazon DynamoDB Developer Guide</i>.</p>"
         },
         "ExpressionAttributeNames":{
           "shape":"ExpressionAttributeNameMap",
@@ -5922,7 +5922,7 @@
           "documentation":"<p>A list of cancellation reasons.</p>"
         }
       },
-      "documentation":"<p>The entire transaction request was canceled.</p> <p>DynamoDB cancels a <code>TransactWriteItems</code> request under the following circumstances:</p> <ul> <li> <p>A condition in one of the condition expressions is not met.</p> </li> <li> <p>A table in the <code>TransactWriteItems</code> request is in a different account or region.</p> </li> <li> <p>More than one action in the <code>TransactWriteItems</code> operation targets the same item.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>An item size becomes too large (larger than 400 KB), or a local secondary index (LSI) becomes too large, or a similar validation error occurs because of changes made by the transaction.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul> <p>DynamoDB cancels a <code>TransactGetItems</code> request under the following circumstances:</p> <ul> <li> <p>There is an ongoing <code>TransactGetItems</code> operation that conflicts with a concurrent <code>PutItem</code>, <code>UpdateItem</code>, <code>DeleteItem</code> or <code>TransactWriteItems</code> request. In this case the <code>TransactGetItems</code> operation fails with a <code>TransactionCanceledException</code>.</p> </li> <li> <p>A table in the <code>TransactGetItems</code> request is in a different account or region.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul> <note> <p>If using Java, DynamoDB lists the cancellation reasons on the <code>CancellationReasons</code> property. This property is not set for other languages. Transaction cancellation reasons are ordered in the order of requested items, if an item has no error it will have <code>None</code> code and <code>Null</code> message.</p> </note> <p>Cancellation reason codes and possible error messages:</p> <ul> <li> <p>No Errors:</p> <ul> <li> <p>Code: <code>None</code> </p> </li> <li> <p>Message: <code>null</code> </p> </li> </ul> </li> <li> <p>Conditional Check Failed:</p> <ul> <li> <p>Code: <code>ConditionalCheckFailed</code> </p> </li> <li> <p>Message: The conditional request failed. </p> </li> </ul> </li> <li> <p>Item Collection Size Limit Exceeded:</p> <ul> <li> <p>Code: <code>ItemCollectionSizeLimitExceeded</code> </p> </li> <li> <p>Message: Collection size exceeded.</p> </li> </ul> </li> <li> <p>Transaction Conflict:</p> <ul> <li> <p>Code: <code>TransactionConflict</code> </p> </li> <li> <p>Message: Transaction is ongoing for the item.</p> </li> </ul> </li> <li> <p>Provisioned Throughput Exceeded:</p> <ul> <li> <p>Code: <code>ProvisionedThroughputExceeded</code> </p> </li> <li> <p>Messages:</p> <ul> <li> <p>The level of configured provisioned throughput for the table was exceeded. Consider increasing your provisioning level with the UpdateTable API.</p> <note> <p>This Message is received when provisioned throughput is exceeded is on a provisioned DynamoDB table.</p> </note> </li> <li> <p>The level of configured provisioned throughput for one or more global secondary indexes of the table was exceeded. Consider increasing your provisioning level for the under-provisioned global secondary indexes with the UpdateTable API.</p> <note> <p>This message is returned when provisioned throughput is exceeded is on a provisioned GSI.</p> </note> </li> </ul> </li> </ul> </li> <li> <p>Throttling Error:</p> <ul> <li> <p>Code: <code>ThrottlingError</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>Throughput exceeds the current capacity of your table or index. DynamoDB is automatically scaling your table or index so please try again shortly. If exceptions persist, check if you have a hot key: https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/bp-partition-key-design.html.</p> <note> <p>This message is returned when writes get throttled on an On-Demand table as DynamoDB is automatically scaling the table.</p> </note> </li> <li> <p>Throughput exceeds the current capacity for one or more global secondary indexes. DynamoDB is automatically scaling your index so please try again shortly.</p> <note> <p>This message is returned when writes get throttled on an On-Demand GSI as DynamoDB is automatically scaling the GSI.</p> </note> </li> </ul> </li> </ul> </li> <li> <p>Validation Error:</p> <ul> <li> <p>Code: <code>ValidationError</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>One or more parameter values were invalid.</p> </li> <li> <p>The update expression attempted to update the secondary index key beyond allowed size limits.</p> </li> <li> <p>The update expression attempted to update the secondary index key to unsupported type.</p> </li> <li> <p>An operand in the update expression has an incorrect data type.</p> </li> <li> <p>Item size to update has exceeded the maximum allowed size.</p> </li> <li> <p>Number overflow. Attempting to store a number with magnitude larger than supported range.</p> </li> <li> <p>Type mismatch for attribute to update.</p> </li> <li> <p>Nesting Levels have exceeded supported limits.</p> </li> <li> <p>The document path provided in the update expression is invalid for update.</p> </li> <li> <p>The provided expression refers to an attribute that does not exist in the item.</p> </li> </ul> </li> </ul> </li> </ul>",
+      "documentation":"<p>The entire transaction request was canceled.</p> <p>DynamoDB cancels a <code>TransactWriteItems</code> request under the following circumstances:</p> <ul> <li> <p>A condition in one of the condition expressions is not met.</p> </li> <li> <p>A table in the <code>TransactWriteItems</code> request is in a different account or region.</p> </li> <li> <p>More than one action in the <code>TransactWriteItems</code> operation targets the same item.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>An item size becomes too large (larger than 400 KB), or a local secondary index (LSI) becomes too large, or a similar validation error occurs because of changes made by the transaction.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> <li> <p> There is an ongoing <code>TransactWriteItems</code> operation that conflicts with a concurrent <code>TransactWriteItems</code> request. In this case the <code>TransactWriteItems</code> operation fails with a <code>TransactionCanceledException</code>. </p> </li> </ul> <p>DynamoDB cancels a <code>TransactGetItems</code> request under the following circumstances:</p> <ul> <li> <p>There is an ongoing <code>TransactGetItems</code> operation that conflicts with a concurrent <code>PutItem</code>, <code>UpdateItem</code>, <code>DeleteItem</code> or <code>TransactWriteItems</code> request. In this case the <code>TransactGetItems</code> operation fails with a <code>TransactionCanceledException</code>.</p> </li> <li> <p>A table in the <code>TransactGetItems</code> request is in a different account or region.</p> </li> <li> <p>There is insufficient provisioned capacity for the transaction to be completed.</p> </li> <li> <p>There is a user error, such as an invalid data format.</p> </li> </ul> <note> <p>If using Java, DynamoDB lists the cancellation reasons on the <code>CancellationReasons</code> property. This property is not set for other languages. Transaction cancellation reasons are ordered in the order of requested items, if an item has no error it will have <code>None</code> code and <code>Null</code> message.</p> </note> <p>Cancellation reason codes and possible error messages:</p> <ul> <li> <p>No Errors:</p> <ul> <li> <p>Code: <code>None</code> </p> </li> <li> <p>Message: <code>null</code> </p> </li> </ul> </li> <li> <p>Conditional Check Failed:</p> <ul> <li> <p>Code: <code>ConditionalCheckFailed</code> </p> </li> <li> <p>Message: The conditional request failed. </p> </li> </ul> </li> <li> <p>Item Collection Size Limit Exceeded:</p> <ul> <li> <p>Code: <code>ItemCollectionSizeLimitExceeded</code> </p> </li> <li> <p>Message: Collection size exceeded.</p> </li> </ul> </li> <li> <p>Transaction Conflict:</p> <ul> <li> <p>Code: <code>TransactionConflict</code> </p> </li> <li> <p>Message: Transaction is ongoing for the item.</p> </li> </ul> </li> <li> <p>Provisioned Throughput Exceeded:</p> <ul> <li> <p>Code: <code>ProvisionedThroughputExceeded</code> </p> </li> <li> <p>Messages:</p> <ul> <li> <p>The level of configured provisioned throughput for the table was exceeded. Consider increasing your provisioning level with the UpdateTable API.</p> <note> <p>This Message is received when provisioned throughput is exceeded is on a provisioned DynamoDB table.</p> </note> </li> <li> <p>The level of configured provisioned throughput for one or more global secondary indexes of the table was exceeded. Consider increasing your provisioning level for the under-provisioned global secondary indexes with the UpdateTable API.</p> <note> <p>This message is returned when provisioned throughput is exceeded is on a provisioned GSI.</p> </note> </li> </ul> </li> </ul> </li> <li> <p>Throttling Error:</p> <ul> <li> <p>Code: <code>ThrottlingError</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>Throughput exceeds the current capacity of your table or index. DynamoDB is automatically scaling your table or index so please try again shortly. If exceptions persist, check if you have a hot key: https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/bp-partition-key-design.html.</p> <note> <p>This message is returned when writes get throttled on an On-Demand table as DynamoDB is automatically scaling the table.</p> </note> </li> <li> <p>Throughput exceeds the current capacity for one or more global secondary indexes. DynamoDB is automatically scaling your index so please try again shortly.</p> <note> <p>This message is returned when writes get throttled on an On-Demand GSI as DynamoDB is automatically scaling the GSI.</p> </note> </li> </ul> </li> </ul> </li> <li> <p>Validation Error:</p> <ul> <li> <p>Code: <code>ValidationError</code> </p> </li> <li> <p>Messages: </p> <ul> <li> <p>One or more parameter values were invalid.</p> </li> <li> <p>The update expression attempted to update the secondary index key beyond allowed size limits.</p> </li> <li> <p>The update expression attempted to update the secondary index key to unsupported type.</p> </li> <li> <p>An operand in the update expression has an incorrect data type.</p> </li> <li> <p>Item size to update has exceeded the maximum allowed size.</p> </li> <li> <p>Number overflow. Attempting to store a number with magnitude larger than supported range.</p> </li> <li> <p>Type mismatch for attribute to update.</p> </li> <li> <p>Nesting Levels have exceeded supported limits.</p> </li> <li> <p>The document path provided in the update expression is invalid for update.</p> </li> <li> <p>The provided expression refers to an attribute that does not exist in the item.</p> </li> </ul> </li> </ul> </li> </ul>",
       "exception":true
     },
     "TransactionConflictException":{
diff --git a/tools/code-generation/api-descriptions/kendra-2019-02-03.normal.json b/tools/code-generation/api-descriptions/kendra-2019-02-03.normal.json
index b8fc0e0f169..855e90763c0 100644
--- a/tools/code-generation/api-descriptions/kendra-2019-02-03.normal.json
+++ b/tools/code-generation/api-descriptions/kendra-2019-02-03.normal.json
@@ -926,7 +926,7 @@
         {"shape":"ServiceQuotaExceededException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Searches an index given an input query.</p> <p>You can configure boosting or relevance tuning at the query level to override boosting at the index level, filter based on document fields/attributes and faceted search, and filter based on the user or their group access to documents. You can also include certain fields in the response that might provide useful additional information.</p> <p>A query response contains three types of results.</p> <ul> <li> <p>Relevant suggested answers. The answers can be either a text excerpt or table excerpt. The answer can be highlighted in the excerpt.</p> </li> <li> <p>Matching FAQs or questions-answer from your FAQ file.</p> </li> <li> <p>Relevant documents. This result type includes an excerpt of the document with the document title. The searched terms can be highlighted in the excerpt.</p> </li> </ul> <p>You can specify that the query return only one type of result using the <code>QueryResultTypeFilter</code> parameter. Each query returns the 100 most relevant results. If you filter result type to only question-answers, a maximum of four results are returned. If you filter result type to only answers, a maximum of three results are returned.</p>"
+      "documentation":"<p>Searches an index given an input query.</p> <note> <p>If you are working with large language models (LLMs) or implementing retrieval augmented generation (RAG) systems, you can use Amazon Kendra's <a href=\"https://docs.aws.amazon.com/kendra/latest/APIReference/API_Retrieve.html\">Retrieve</a> API, which can return longer semantically relevant passages. We recommend using the <code>Retrieve</code> API instead of filing a service limit increase to increase the <code>Query</code> API document excerpt length.</p> </note> <p>You can configure boosting or relevance tuning at the query level to override boosting at the index level, filter based on document fields/attributes and faceted search, and filter based on the user or their group access to documents. You can also include certain fields in the response that might provide useful additional information.</p> <p>A query response contains three types of results.</p> <ul> <li> <p>Relevant suggested answers. The answers can be either a text excerpt or table excerpt. The answer can be highlighted in the excerpt.</p> </li> <li> <p>Matching FAQs or questions-answer from your FAQ file.</p> </li> <li> <p>Relevant documents. This result type includes an excerpt of the document with the document title. The searched terms can be highlighted in the excerpt.</p> </li> </ul> <p>You can specify that the query return only one type of result using the <code>QueryResultTypeFilter</code> parameter. Each query returns the 100 most relevant results. If you filter result type to only question-answers, a maximum of four results are returned. If you filter result type to only answers, a maximum of three results are returned.</p>"
     },
     "Retrieve":{
       "name":"Retrieve",
@@ -945,7 +945,7 @@
         {"shape":"ServiceQuotaExceededException"},
         {"shape":"InternalServerException"}
       ],
-      "documentation":"<p>Retrieves relevant passages or text excerpts given an input query.</p> <p>This API is similar to the <a href=\"https://docs.aws.amazon.com/kendra/latest/APIReference/API_Query.html\">Query</a> API. However, by default, the <code>Query</code> API only returns excerpt passages of up to 100 token words. With the <code>Retrieve</code> API, you can retrieve longer passages of up to 200 token words and up to 100 semantically relevant passages. This doesn't include question-answer or FAQ type responses from your index. The passages are text excerpts that can be semantically extracted from multiple documents and multiple parts of the same document. If in extreme cases your documents produce zero passages using the <code>Retrieve</code> API, you can alternatively use the <code>Query</code> API and its types of responses.</p> <p>You can also do the following:</p> <ul> <li> <p>Override boosting at the index level</p> </li> <li> <p>Filter based on document fields or attributes</p> </li> <li> <p>Filter based on the user or their group access to documents</p> </li> </ul> <p>You can also include certain fields in the response that might provide useful additional information.</p> <p>The <code>Retrieve</code> API shares the number of <a href=\"https://docs.aws.amazon.com/kendra/latest/APIReference/API_CapacityUnitsConfiguration.html\">query capacity units</a> that you set for your index. For more information on what's included in a single capacity unit and the default base capacity for an index, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/adjusting-capacity.html\">Adjusting capacity</a>.</p>"
+      "documentation":"<p>Retrieves relevant passages or text excerpts given an input query.</p> <p>This API is similar to the <a href=\"https://docs.aws.amazon.com/kendra/latest/APIReference/API_Query.html\">Query</a> API. However, by default, the <code>Query</code> API only returns excerpt passages of up to 100 token words. With the <code>Retrieve</code> API, you can retrieve longer passages of up to 200 token words and up to 100 semantically relevant passages. This doesn't include question-answer or FAQ type responses from your index. The passages are text excerpts that can be semantically extracted from multiple documents and multiple parts of the same document. If in extreme cases your documents produce zero passages using the <code>Retrieve</code> API, you can alternatively use the <code>Query</code> API and its types of responses.</p> <p>You can also do the following:</p> <ul> <li> <p>Override boosting at the index level</p> </li> <li> <p>Filter based on document fields or attributes</p> </li> <li> <p>Filter based on the user or their group access to documents</p> </li> <li> <p>View the confidence score bucket for a retrieved passage result. The confidence bucket provides a relative ranking that indicates how confident Amazon Kendra is that the response is relevant to the query.</p> <note> <p>Confidence score buckets are currently available only for English.</p> </note> </li> </ul> <p>You can also include certain fields in the response that might provide useful additional information.</p> <p>The <code>Retrieve</code> API shares the number of <a href=\"https://docs.aws.amazon.com/kendra/latest/APIReference/API_CapacityUnitsConfiguration.html\">query capacity units</a> that you set for your index. For more information on what's included in a single capacity unit and the default base capacity for an index, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/adjusting-capacity.html\">Adjusting capacity</a>.</p>"
     },
     "StartDataSourceSyncJob":{
       "name":"StartDataSourceSyncJob",
@@ -1911,6 +1911,48 @@
       "max":100,
       "min":1
     },
+    "CollapseConfiguration":{
+      "type":"structure",
+      "required":["DocumentAttributeKey"],
+      "members":{
+        "DocumentAttributeKey":{
+          "shape":"DocumentAttributeKey",
+          "documentation":"<p>The document attribute used to group search results. You can use any attribute that has the <code>Sortable</code> flag set to true. You can also sort by any of the following built-in attributes:\"_category\",\"_created_at\", \"_last_updated_at\", \"_version\", \"_view_count\".</p>"
+        },
+        "SortingConfigurations":{
+          "shape":"SortingConfigurationList",
+          "documentation":"<p>A prioritized list of document attributes/fields that determine the primary document among those in a collapsed group.</p>"
+        },
+        "MissingAttributeKeyStrategy":{
+          "shape":"MissingAttributeKeyStrategy",
+          "documentation":"<p>Specifies the behavior for documents without a value for the collapse attribute.</p> <p>Amazon Kendra offers three customization options:</p> <ul> <li> <p>Choose to <code>COLLAPSE</code> all documents with null or missing values in one group. This is the default configuration.</p> </li> <li> <p>Choose to <code>IGNORE</code> documents with null or missing values. Ignored documents will not appear in query results.</p> </li> <li> <p>Choose to <code>EXPAND</code> each document with a null or missing value into a group of its own.</p> </li> </ul>"
+        },
+        "Expand":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifies whether to expand the collapsed results.</p>"
+        },
+        "ExpandConfiguration":{
+          "shape":"ExpandConfiguration",
+          "documentation":"<p>Provides configuration information to customize expansion options for a collapsed group.</p>"
+        }
+      },
+      "documentation":"<p>Specifies how to group results by document attribute value, and how to display them collapsed/expanded under a designated primary document for each group.</p>"
+    },
+    "CollapsedResultDetail":{
+      "type":"structure",
+      "required":["DocumentAttribute"],
+      "members":{
+        "DocumentAttribute":{
+          "shape":"DocumentAttribute",
+          "documentation":"<p>The value of the document attribute that results are collapsed on.</p>"
+        },
+        "ExpandedResults":{
+          "shape":"ExpandedResultList",
+          "documentation":"<p>A list of results in the collapsed group.</p>"
+        }
+      },
+      "documentation":"<p>Provides details about a collapsed group of search results.</p>"
+    },
     "ColumnConfiguration":{
       "type":"structure",
       "required":[
@@ -2520,7 +2562,7 @@
         },
         "RoleArn":{
           "shape":"RoleArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of an IAM role with permission to access <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required APIs. The role also must include permission to access IAM Identity Center (successor to Single Sign-On) that stores your user and group information. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html\">IAM access roles for Amazon Kendra</a>.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of an IAM role with permission to access <code>Query</code> API, <code>GetQuerySuggestions</code> API, and other required APIs. The role also must include permission to access IAM Identity Center that stores your user and group information. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html\">IAM access roles for Amazon Kendra</a>.</p>"
         },
         "Configuration":{
           "shape":"ExperienceConfiguration",
@@ -2700,7 +2742,7 @@
         },
         "UserGroupResolutionConfiguration":{
           "shape":"UserGroupResolutionConfiguration",
-          "documentation":"<p>Gets users and groups from IAM Identity Center (successor to Single Sign-On) identity source. To configure this, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html\">UserGroupResolutionConfiguration</a>.</p>"
+          "documentation":"<p>Gets users and groups from IAM Identity Center identity source. To configure this, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html\">UserGroupResolutionConfiguration</a>.</p>"
         }
       }
     },
@@ -3789,7 +3831,7 @@
         },
         "UserGroupResolutionConfiguration":{
           "shape":"UserGroupResolutionConfiguration",
-          "documentation":"<p>Whether you have enabled the configuration for fetching access levels of groups and users from an IAM Identity Center (successor to Single Sign-On) identity source.</p>"
+          "documentation":"<p>Whether you have enabled the configuration for fetching access levels of groups and users from an IAM Identity Center identity source.</p>"
         }
       }
     },
@@ -4559,6 +4601,48 @@
       "max":100,
       "min":0
     },
+    "ExpandConfiguration":{
+      "type":"structure",
+      "members":{
+        "MaxResultItemsToExpand":{
+          "shape":"Integer",
+          "documentation":"<p>The number of collapsed search result groups to expand. If you set this value to 10, for example, only the first 10 out of 100 result groups will have expand functionality. </p>"
+        },
+        "MaxExpandedResultsPerItem":{
+          "shape":"Integer",
+          "documentation":"<p>The number of expanded results to show per collapsed primary document. For instance, if you set this value to 3, then at most 3 results per collapsed group will be displayed.</p>"
+        }
+      },
+      "documentation":"<p>Specifies the configuration information needed to customize how collapsed search result groups expand.</p>"
+    },
+    "ExpandedResultItem":{
+      "type":"structure",
+      "members":{
+        "Id":{
+          "shape":"ResultId",
+          "documentation":"<p>The identifier for the expanded result.</p>"
+        },
+        "DocumentId":{
+          "shape":"DocumentId",
+          "documentation":"<p>The idenitifier of the document.</p>"
+        },
+        "DocumentTitle":{"shape":"TextWithHighlights"},
+        "DocumentExcerpt":{"shape":"TextWithHighlights"},
+        "DocumentURI":{
+          "shape":"Url",
+          "documentation":"<p>The URI of the original location of the document.</p>"
+        },
+        "DocumentAttributes":{
+          "shape":"DocumentAttributeList",
+          "documentation":"<p>An array of document attributes assigned to a document in the search results. For example, the document author (\"_author\") or the source URI (\"_source_uri\") of the document.</p>"
+        }
+      },
+      "documentation":"<p> A single expanded result in a collapsed group of search results.</p> <p>An expanded result item contains information about an expanded result document within a collapsed group of search results. This includes the original location of the document, a list of attributes assigned to the document, and relevant text from the document that satisfies the query. </p>"
+    },
+    "ExpandedResultList":{
+      "type":"list",
+      "member":{"shape":"ExpandedResultItem"}
+    },
     "ExperienceConfiguration":{
       "type":"structure",
       "members":{
@@ -6434,6 +6518,14 @@
       "max":10000,
       "min":1
     },
+    "MissingAttributeKeyStrategy":{
+      "type":"string",
+      "enum":[
+        "IGNORE",
+        "COLLAPSE",
+        "EXPAND"
+      ]
+    },
     "Mode":{
       "type":"string",
       "enum":[
@@ -6787,6 +6879,10 @@
           "shape":"SortingConfiguration",
           "documentation":"<p>Provides information that determines how the results of the query are sorted. You can set the field that Amazon Kendra should sort the results on, and specify whether the results should be sorted in ascending or descending order. In the case of ties in sorting the results, the results are sorted by relevance.</p> <p>If you don't provide sorting configuration, the results are sorted by the relevance that Amazon Kendra determines for the result.</p>"
         },
+        "SortingConfigurations":{
+          "shape":"SortingConfigurationList",
+          "documentation":"<p>Provides configuration information to determine how the results of a query are sorted.</p> <p>You can set upto 3 fields that Amazon Kendra should sort the results on, and specify whether the results should be sorted in ascending or descending order. The sort field quota can be increased.</p> <p>If you don't provide a sorting configuration, the results are sorted by the relevance that Amazon Kendra determines for the result. In the case of ties in sorting the results, the results are sorted by relevance. </p>"
+        },
         "UserContext":{
           "shape":"UserContext",
           "documentation":"<p>The user context token or user and group information.</p>"
@@ -6798,6 +6894,10 @@
         "SpellCorrectionConfiguration":{
           "shape":"SpellCorrectionConfiguration",
           "documentation":"<p>Enables suggested spell corrections for queries.</p>"
+        },
+        "CollapseConfiguration":{
+          "shape":"CollapseConfiguration",
+          "documentation":"<p>Provides configuration to determine how to group results by document attribute value, and how to display them (collapsed or expanded) under a designated primary document for each group.</p>"
         }
       }
     },
@@ -6891,6 +6991,10 @@
         "TableExcerpt":{
           "shape":"TableExcerpt",
           "documentation":"<p>An excerpt from a table within a document.</p>"
+        },
+        "CollapsedResultDetail":{
+          "shape":"CollapsedResultDetail",
+          "documentation":"<p>Provides details about a collapsed group of search results.</p>"
         }
       },
       "documentation":"<p>A single query result.</p> <p>A query result contains information about a document returned by the query. This includes the original location of the document, a list of attributes assigned to the document, and relevant text from the document that satisfies the query.</p>"
@@ -8047,6 +8151,11 @@
       },
       "documentation":"<p>Specifies the document attribute to use to sort the response to a Amazon Kendra query. You can specify a single attribute for sorting. The attribute must have the <code>Sortable</code> flag set to <code>true</code>, otherwise Amazon Kendra returns an exception.</p> <p>You can sort attributes of the following types.</p> <ul> <li> <p>Date value</p> </li> <li> <p>Long value</p> </li> <li> <p>String value</p> </li> </ul> <p>You can't sort attributes of the following type.</p> <ul> <li> <p>String list value</p> </li> </ul>"
     },
+    "SortingConfigurationList":{
+      "type":"list",
+      "member":{"shape":"SortingConfiguration"},
+      "min":1
+    },
     "SourceDocument":{
       "type":"structure",
       "members":{
@@ -8829,7 +8938,7 @@
         },
         "UserGroupResolutionConfiguration":{
           "shape":"UserGroupResolutionConfiguration",
-          "documentation":"<p>Enables fetching access levels of groups and users from an IAM Identity Center (successor to Single Sign-On) identity source. To configure this, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html\">UserGroupResolutionConfiguration</a>.</p>"
+          "documentation":"<p>Enables fetching access levels of groups and users from an IAM Identity Center identity source. To configure this, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/API_UserGroupResolutionConfiguration.html\">UserGroupResolutionConfiguration</a>.</p>"
         }
       }
     },
@@ -8991,10 +9100,10 @@
       "members":{
         "UserGroupResolutionMode":{
           "shape":"UserGroupResolutionMode",
-          "documentation":"<p>The identity store provider (mode) you want to use to get users and groups. IAM Identity Center (successor to Single Sign-On) is currently the only available mode. Your users and groups must exist in an IAM Identity Center identity source in order to use this mode.</p>"
+          "documentation":"<p>The identity store provider (mode) you want to use to get users and groups. IAM Identity Center is currently the only available mode. Your users and groups must exist in an IAM Identity Center identity source in order to use this mode.</p>"
         }
       },
-      "documentation":"<p>Provides the configuration information to get users and groups from an IAM Identity Center (successor to Single Sign-On) identity source. This is useful for user context filtering, where search results are filtered based on the user or their group access to documents. You can also use the <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/API_PutPrincipalMapping.html\">PutPrincipalMapping</a> API to map users to their groups so that you only need to provide the user ID when you issue the query.</p> <p>To set up an IAM Identity Center identity source in the console to use with Amazon Kendra, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/getting-started-aws-sso.html\">Getting started with an IAM Identity Center identity source</a>. You must also grant the required permissions to use IAM Identity Center with Amazon Kendra. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html#iam-roles-aws-sso\">IAM roles for IAM Identity Center</a>.</p> <p>Amazon Kendra currently does not support using <code>UserGroupResolutionConfiguration</code> with an Amazon Web Services organization member account for your IAM Identity Center identify source. You must create your index in the management account for the organization in order to use <code>UserGroupResolutionConfiguration</code>.</p>"
+      "documentation":"<p>Provides the configuration information to get users and groups from an IAM Identity Center identity source. This is useful for user context filtering, where search results are filtered based on the user or their group access to documents. You can also use the <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/API_PutPrincipalMapping.html\">PutPrincipalMapping</a> API to map users to their groups so that you only need to provide the user ID when you issue the query.</p> <p>To set up an IAM Identity Center identity source in the console to use with Amazon Kendra, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/getting-started-aws-sso.html\">Getting started with an IAM Identity Center identity source</a>. You must also grant the required permissions to use IAM Identity Center with Amazon Kendra. For more information, see <a href=\"https://docs.aws.amazon.com/kendra/latest/dg/iam-roles.html#iam-roles-aws-sso\">IAM roles for IAM Identity Center</a>.</p> <p>Amazon Kendra currently does not support using <code>UserGroupResolutionConfiguration</code> with an Amazon Web Services organization member account for your IAM Identity Center identify source. You must create your index in the management account for the organization in order to use <code>UserGroupResolutionConfiguration</code>.</p>"
     },
     "UserGroupResolutionMode":{
       "type":"string",
diff --git a/tools/code-generation/api-descriptions/rds-2014-10-31.normal.json b/tools/code-generation/api-descriptions/rds-2014-10-31.normal.json
index adb8ac1543a..5c22e3d636d 100644
--- a/tools/code-generation/api-descriptions/rds-2014-10-31.normal.json
+++ b/tools/code-generation/api-descriptions/rds-2014-10-31.normal.json
@@ -3625,6 +3625,14 @@
         "Tags":{
           "shape":"TagList",
           "documentation":"<p>Tags to assign to the blue/green deployment.</p>"
+        },
+        "TargetDBInstanceClass":{
+          "shape":"TargetDBInstanceClass",
+          "documentation":"<p>Specify the DB instance class for the databases in the green environment.</p>"
+        },
+        "UpgradeTargetStorageConfig":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Whether to upgrade the storage file system configuration on the green database. This option migrates the green DB instance from the older 32-bit file system to the preferred configuration. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem\">Upgrading the storage file system for a DB instance</a>.</p>"
         }
       }
     },
@@ -4431,6 +4439,10 @@
         "DedicatedLogVolume":{
           "shape":"BooleanOptional",
           "documentation":"<p>Indicates whether the DB instance has a dedicated log volume (DLV) enabled.</p>"
+        },
+        "UpgradeStorageConfig":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Whether to upgrade the storage file system configuration on the read replica. This option migrates the read replica from the old storage file system layout to the preferred layout.</p>"
         }
       }
     },
@@ -6423,6 +6435,10 @@
         "DedicatedLogVolume":{
           "shape":"Boolean",
           "documentation":"<p>Indicates whether the DB instance has a dedicated log volume (DLV) enabled.</p>"
+        },
+        "IsStorageConfigUpgradeAvailable":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Indicates whether an upgrade is recommended for the storage file system configuration on the DB instance. To migrate to the preferred configuration, you can either create a blue/green deployment, or create a read replica from the DB instance. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem\">Upgrading the storage file system for a DB instance</a>.</p>"
         }
       },
       "documentation":"<p>Contains the details of an Amazon RDS DB instance.</p> <p>This data type is used as a response element in the operations <code>CreateDBInstance</code>, <code>CreateDBInstanceReadReplica</code>, <code>DeleteDBInstance</code>, <code>DescribeDBInstances</code>, <code>ModifyDBInstance</code>, <code>PromoteReadReplica</code>, <code>RebootDBInstance</code>, <code>RestoreDBInstanceFromDBSnapshot</code>, <code>RestoreDBInstanceFromS3</code>, <code>RestoreDBInstanceToPointInTime</code>, <code>StartDBInstance</code>, and <code>StopDBInstance</code>.</p>",
@@ -14762,6 +14778,12 @@
       "min":1,
       "pattern":"[A-Za-z](?!.*--)[0-9A-Za-z-]*[^-]|^default(?!.*--)(?!.*\\.\\.)[0-9A-Za-z-.]*[^-]"
     },
+    "TargetDBInstanceClass":{
+      "type":"string",
+      "max":20,
+      "min":5,
+      "pattern":"db\\.[0-9a-z]{2,6}\\.[0-9a-z]{4,9}"
+    },
     "TargetDBParameterGroupName":{
       "type":"string",
       "max":255,
diff --git a/tools/code-generation/api-descriptions/wisdom-2020-10-19.normal.json b/tools/code-generation/api-descriptions/wisdom-2020-10-19.normal.json
index 1f3cd3e59dd..4c9999ebcf1 100644
--- a/tools/code-generation/api-descriptions/wisdom-2020-10-19.normal.json
+++ b/tools/code-generation/api-descriptions/wisdom-2020-10-19.normal.json
@@ -2132,7 +2132,9 @@
     },
     "RecommendationIdList":{
       "type":"list",
-      "member":{"shape":"String"}
+      "member":{"shape":"String"},
+      "max":25,
+      "min":0
     },
     "RecommendationList":{
       "type":"list",
diff --git a/tools/code-generation/endpoints/cloud9-2017-09-23.endpoint-rule-set.json b/tools/code-generation/endpoints/cloud9-2017-09-23.endpoint-rule-set.json
index 26763c88c97..fa3d7dc32ce 100644
--- a/tools/code-generation/endpoints/cloud9-2017-09-23.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/cloud9-2017-09-23.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/dynamodb-2011-12-05.endpoint-rule-set.json b/tools/code-generation/endpoints/dynamodb-2011-12-05.endpoint-rule-set.json
index 5fa72ade6df..5e7f294eea5 100644
--- a/tools/code-generation/endpoints/dynamodb-2011-12-05.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/dynamodb-2011-12-05.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -353,9 +351,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/dynamodb-2012-08-10.endpoint-rule-set.json b/tools/code-generation/endpoints/dynamodb-2012-08-10.endpoint-rule-set.json
index 5fa72ade6df..5e7f294eea5 100644
--- a/tools/code-generation/endpoints/dynamodb-2012-08-10.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/dynamodb-2012-08-10.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -353,9 +351,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/kendra-2019-02-03.endpoint-rule-set.json b/tools/code-generation/endpoints/kendra-2019-02-03.endpoint-rule-set.json
index 6caf5607266..02f854fd29b 100644
--- a/tools/code-generation/endpoints/kendra-2019-02-03.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/kendra-2019-02-03.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/rds-2013-01-10.endpoint-rule-set.json b/tools/code-generation/endpoints/rds-2013-01-10.endpoint-rule-set.json
index 00bd15c3610..1dfb5f08259 100644
--- a/tools/code-generation/endpoints/rds-2013-01-10.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/rds-2013-01-10.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -326,9 +324,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/rds-2013-02-12.endpoint-rule-set.json b/tools/code-generation/endpoints/rds-2013-02-12.endpoint-rule-set.json
index 00bd15c3610..1dfb5f08259 100644
--- a/tools/code-generation/endpoints/rds-2013-02-12.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/rds-2013-02-12.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -326,9 +324,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/rds-2013-09-09.endpoint-rule-set.json b/tools/code-generation/endpoints/rds-2013-09-09.endpoint-rule-set.json
index 00bd15c3610..1dfb5f08259 100644
--- a/tools/code-generation/endpoints/rds-2013-09-09.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/rds-2013-09-09.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -326,9 +324,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/rds-2014-09-01.endpoint-rule-set.json b/tools/code-generation/endpoints/rds-2014-09-01.endpoint-rule-set.json
index 00bd15c3610..1dfb5f08259 100644
--- a/tools/code-generation/endpoints/rds-2014-09-01.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/rds-2014-09-01.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -326,9 +324,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/rds-2014-10-31.endpoint-rule-set.json b/tools/code-generation/endpoints/rds-2014-10-31.endpoint-rule-set.json
index 00bd15c3610..1dfb5f08259 100644
--- a/tools/code-generation/endpoints/rds-2014-10-31.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/rds-2014-10-31.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -326,9 +324,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],
diff --git a/tools/code-generation/endpoints/wisdom-2020-10-19.endpoint-rule-set.json b/tools/code-generation/endpoints/wisdom-2020-10-19.endpoint-rule-set.json
index 7bbf62b4649..47191e6df0b 100644
--- a/tools/code-generation/endpoints/wisdom-2020-10-19.endpoint-rule-set.json
+++ b/tools/code-generation/endpoints/wisdom-2020-10-19.endpoint-rule-set.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,11 +212,11 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -231,14 +227,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -252,7 +250,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -272,7 +269,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -283,14 +279,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -301,9 +299,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],